Merge pull request #28 from symfony-cmf/drop_symfony_cmf_prefix

[WIP] Removed symfony_cmf prefix

Author: lsmith77

app/AppKernel.php

@@ -23,12 +23,12 @@ public function registerBundles()
             new JMS\SerializerBundle\JMSSerializerBundle($this),
 
             // enable cmf bundles
-            new Symfony\Cmf\Bundle\RoutingBundle\SymfonyCmfRoutingBundle(),
-            new Symfony\Cmf\Bundle\CoreBundle\SymfonyCmfCoreBundle(),
-            new Symfony\Cmf\Bundle\MenuBundle\SymfonyCmfMenuBundle(),
-            new Symfony\Cmf\Bundle\ContentBundle\SymfonyCmfContentBundle(),
-            new Symfony\Cmf\Bundle\SimpleCmsBundle\SymfonyCmfSimpleCmsBundle(),
-            new Symfony\Cmf\Bundle\CreateBundle\SymfonyCmfCreateBundle(),
+            new Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(),
+            new Symfony\Cmf\Bundle\CoreBundle\CmfCoreBundle(),
+            new Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle(),
+            new Symfony\Cmf\Bundle\ContentBundle\CmfContentBundle(),
+            new Symfony\Cmf\Bundle\SimpleCmsBundle\CmfSimpleCmsBundle(),
+            new Symfony\Cmf\Bundle\CreateBundle\CmfCreateBundle(),
 
             // and the sandbox bundle
             new Acme\MainBundle\AcmeMainBundle(),

app/Resources/SymfonyCmfSimpleCmsBundle/views/Page/index.html.twig renamed to app/Resources/CmfSimpleCmsBundle/views/Page/index.html.twig

@@ -20,7 +20,7 @@ twig:
 assetic:
     debug:          %kernel.debug%
     use_controller: false
-    #bundles:        [SymfonyCmfSimpleCmsBundle, SymfonyCmfCreateBundle]
+    #bundles:        [CmfSimpleCmsBundle, CmfCreateBundle]
     #java: /usr/bin/java
     filters:
         cssrewrite: ~
@@ -69,28 +69,28 @@ liip_doctrine_cache:
         nodes:
             type: file_system
 
-symfony_cmf_routing:
+cmf_routing:
     dynamic:
         enabled: true
 
-symfony_cmf_simple_cms:
+cmf_simple_cms:
     routing:
         templates_by_class:
-            Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page:  SymfonyCmfSimpleCmsBundle:Page:index.html.twig
+            Symfony\Cmf\Bundle\SimpleCmsBundle\Document\Page:  CmfSimpleCmsBundle:Page:index.html.twig
         controllers_by_class:
-            Symfony\Cmf\Bundle\RoutingBundle\Document\RedirectRoute:  symfony_cmf_routing.redirect_controller:redirectAction
+            Symfony\Cmf\Bundle\RoutingBundle\Document\RedirectRoute:  cmf_routing.redirect_controller:redirectAction
     multilang:
         locales: %locales%
     use_sonata_admin: false
 
 knp_menu:
     twig: true
 
-symfony_cmf_menu:
+cmf_menu:
     use_sonata_admin: false
     menu_basepath: /cms
 
-symfony_cmf_create:
+cmf_create:
     phpcr_odm: true
 
 lunetics_locale:

app/config/config.yml

@@ -18,7 +18,7 @@ static:
         _locale: en|de
 
 cmf_create_rest:
-    resource: "@SymfonyCmfCreateBundle/Resources/config/routing/rest.xml"
+    resource: "@CmfCreateBundle/Resources/config/routing/rest.xml"
 
 cmf_create_image:
-    resource: "@SymfonyCmfCreateBundle/Resources/config/routing/image.xml"
+    resource: "@CmfCreateBundle/Resources/config/routing/image.xml"

app/config/routing.yml

@@ -12,9 +12,9 @@
         "symfony/monolog-bundle": "2.2.*",
         "symfony/assetic-bundle": "2.1.*",
         "sensio/distribution-bundle": "2.2.*",
-        "symfony-cmf/symfony-cmf": "1.0.0-alpha1",
-        "symfony-cmf/simple-cms-bundle": "1.0.0-alpha2",
-        "symfony-cmf/create-bundle": "1.0.0-alpha1",
+        "symfony-cmf/symfony-cmf": "1.0.0-alpha2",
+        "symfony-cmf/simple-cms-bundle": "1.0.0-alpha3",
+        "symfony-cmf/create-bundle": "1.0.0-alpha2",
         "jackalope/jackalope-doctrine-dbal":"1.0.0-alpha1",
         "doctrine/doctrine-bundle": "1.2.*",
         "doctrine/doctrine-fixtures-bundle": "dev-master",