pagorad

marfillaster · Aug 5, 2011 · dd74c72 · dd74c72
1 parent 62d3378
commit dd74c72
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ vendor/
 .buildpath
 .project
 .settings
+app/config/parameters.ini
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -17,20 +17,38 @@ public function registerBundles()
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
+            new Symfony\Bundle\DoctrinePHPCRBundle\DoctrinePHPCRBundle(),
+            new Marfs\CRMBundle\MarfsCRMBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
-            $bundles[] = new Acme\DemoBundle\AcmeDemoBundle();
+            //$bundles[] = new Acme\DemoBundle\AcmeDemoBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+            $bundles[] = new JMS\DebuggingBundle\JMSDebuggingBundle($this);
         }
 
         return $bundles;
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
+        if (file_exists(__DIR__.'/config/parameters.ini')) {
+            $loader->load(__DIR__.'/config/parameters.ini');
+        } else {
+            $loader->load(__DIR__.'/config/pagoda.parameters.ini');
+        }
+
         $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
     }
+
+    protected function getContainerBaseClass()
+    {
+    	if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+    		return '\JMS\DebuggingBundle\DependencyInjection\TraceableContainer';
+    	}
+
+    	return parent::getContainerBaseClass();
+    }
 }
diff --git a/app/autoload.php b/app/autoload.php
@@ -14,6 +14,10 @@
     'Monolog'          => __DIR__.'/../vendor/monolog/src',
     'Assetic'          => __DIR__.'/../vendor/assetic/src',
     'Metadata'         => __DIR__.'/../vendor/metadata/src',
+    'PHPCR'            => __DIR__.'/../vendor/phpcr/src',
+    'Jackalope'        => __DIR__.'/../vendor/jackalope/src',
+    'Doctrine\\ODM\\PHPCR' => __DIR__.'/../vendor/phpcr-odm/lib',
+    'JMS' => __DIR__.'/../vendor/bundles',
 ));
 $loader->registerPrefixes(array(
     'Twig_Extensions_' => __DIR__.'/../vendor/twig-extensions/lib',

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -1,7 +1,8 @@
 imports:
-    - { resource: parameters.ini }
     - { resource: security.yml }
 
+
+
 framework:
     #esi:             ~
     #translator:      { fallback: en }
@@ -41,12 +42,27 @@ doctrine:
         dbname:   %database_name%
         user:     %database_user%
         password: %database_password%
+        unix_socket: %database_socket%
         charset:  UTF8
 
     orm:
         auto_generate_proxy_classes: %kernel.debug%
         auto_mapping: true
 
+doctrine_phpcr:
+        # configure the PHPCR session
+    session:
+        backend:
+            url: http://localhost:8080/server/
+            type: jackrabbit
+        workspace: default
+        username: '' 
+        password: ''
+        # enable the ODM layer
+    odm:
+        auto_mapping: true
+
+
 # Swiftmailer Configuration
 swiftmailer:
     transport: %mailer_transport%

diff --git a/app/config/parameters.ini.dst b/app/config/parameters.ini.dst
@@ -5,9 +5,10 @@
     database_driver   = pdo_mysql
     database_host     = localhost
     database_port     =
-    database_name     = symfony
-    database_user     = root
-    database_password =
+    database_name     = %database.name% 
+    database_user     = %database.user%
+    database_password = %database.password%
+    database_socket   = %database.socket%
 
     mailer_transport  = smtp
     mailer_host       = localhost

diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -1,3 +1,8 @@
+MarfsCRMBundle:
+    resource: "@MarfsCRMBundle/Controller/"
+    type:     annotation
+    prefix:   /
+
 # Internal routing configuration to handle ESI
 #_internal:
 #   resource: "@FrameworkBundle/Resources/config/routing/internal.xml"

diff --git a/app/config/routing_dev.yml b/app/config/routing_dev.yml
@@ -1,15 +1,15 @@
-_welcome:
-    pattern:  /
-    defaults: { _controller: AcmeDemoBundle:Welcome:index }
-
-_demo_secured:
-    resource: "@AcmeDemoBundle/Controller/SecuredController.php"
-    type:     annotation
-
-_demo:
-    resource: "@AcmeDemoBundle/Controller/DemoController.php"
-    type:     annotation
-    prefix:   /demo
+#_welcome:
+#    pattern:  /
+#    defaults: { _controller: AcmeDemoBundle:Welcome:index }
+#
+#_demo_secured:
+#    resource: "@AcmeDemoBundle/Controller/SecuredController.php"
+#    type:     annotation
+#
+#_demo:
+#    resource: "@AcmeDemoBundle/Controller/DemoController.php"
+#    type:     annotation
+#    prefix:   /demo
 
 _assetic:
     resource: .

diff --git a/deps b/deps
@@ -64,9 +64,13 @@
 [jackalope]
     git=git://github.com/jackalope/jackalope.git
 
-[phpcd-odm]
-    git=git://github.com/doctrine/phpcd-odm.git
+[phpcr-odm]
+    git=git://github.com/doctrine/phpcr-odm.git
 
 [DoctrinePHPCRBundle]
     git=git://github.com/symfony-cmf/DoctrinePHPCRBundle.git
     target=/bundles/Symfony/Bundle/DoctrinePHPCRBundle
+
+[JMSDebuggingBundle]
+    git=https://github.com/schmittjoh/JMSDebuggingBundle.git
+    target=/bundles/JMS/DebuggingBundle