more refactoring fixes

Author: lsmith77

DataFixtures/Phpcr/AbstractLoadPageData.php

@@ -34,13 +34,12 @@ protected function createPageInstance($className)
 
     protected function getBasePath()
     {
-        return $this->container->getParameter('cmf_simple_cms.basepath');
+        return $this->container->getParameter('cmf_simple_cms.persistence.phpcr.basepath');
     }
 
     protected function getDefaultClass()
     {
-        return $this->container->getParameter('cmf_simple_cms.locales')
-            ? $this->defaultClass['multilangpage'] : $this->defaultClass['page'];
+        return $this->defaultClass['page'];
     }
 
     public function load(ObjectManager $dm)

Doctrine/Phpcr/MultilangRedirectRoute.php

@@ -1,14 +1,10 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Document;
+namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr;
 
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\RedirectRoute;
 
-use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
-
 /**
- * @PHPCRODM\Document
- *
  * provides multi language support when using MultilangRouteProvider
  */
 class MultilangRedirectRoute extends RedirectRoute

Doctrine/Phpcr/MultilangRoute.php

@@ -1,11 +1,9 @@
 <?php
 
-namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Document;
+namespace Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr;
 
 use Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route;
 
-use Doctrine\ODM\PHPCR\Mapping\Annotations as PHPCRODM;
-
 /**
  * Provides multi language support when using MultilangRouteProvider
  */

Resources/config/doctrine-phpcr/MultilangRedirectRoute.phpcr.xml

@@ -0,0 +1,11 @@
+<doctrine-mapping
+    xmlns="http://doctrine-project.org/schemas/phpcr-odm/phpcr-mapping"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://doctrine-project.org/schemas/phpcr-odm/phpcr-mapping
+    https://github.com/doctrine/phpcr-odm/raw/master/doctrine-phpcr-odm-mapping.xsd"
+    >
+
+    <document name="Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\MultilangRedirectRoute"/>
+
+</doctrine-mapping>
+

Resources/config/doctrine-phpcr/MultilangRoute.phpcr.xml

@@ -0,0 +1,11 @@
+<doctrine-mapping
+    xmlns="http://doctrine-project.org/schemas/phpcr-odm/phpcr-mapping"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://doctrine-project.org/schemas/phpcr-odm/phpcr-mapping
+    https://github.com/doctrine/phpcr-odm/raw/master/doctrine-phpcr-odm-mapping.xsd"
+    >
+
+    <document name="Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\MultilangRoute"/>
+
+</doctrine-mapping>
+