Merge pull request #134 from symfony-cmf/routing-cleanup

adjust to routing cleanup

Author: lsmith77

DependencyInjection/CmfCoreExtension.php

@@ -121,6 +121,10 @@ public function prepend(ContainerBuilder $container)
                         );
                         break;
                     case 'cmf_routing':
+                        $routePaths = array($persistenceConfig['basepath'].'/routes');
+                        if (isset($extensions['cmf_simple_cms'])) {
+                            $routePaths[] = $persistenceConfig['basepath'].'/simple';
+                        }
                         $prependConfig = array(
                             'dynamic' => array(
                                 'enabled' => true,
@@ -129,7 +133,7 @@ public function prepend(ContainerBuilder $container)
                                         'enabled' => $persistenceConfig['enabled'],
                                         'use_sonata_admin' => $persistenceConfig['use_sonata_admin'],
                                         'content_basepath' => $persistenceConfig['basepath'].'/content',
-                                        'route_basepath' => $persistenceConfig['basepath'].'/routes',
+                                        'route_basepaths' => $routePaths,
                                         'manager_name' => $persistenceConfig['manager_name'],
                                     )
                                 )