Ported DoctrineCacheBundle to master

Author: wouterj

bundles/phpcr_odm.rst

@@ -179,6 +179,9 @@ command.
     option. For Doctrine PHPCR commands, this parameter is not needed as you
     configured the connection to use.
 
+To use the cache, install and configure the `DoctrineCacheBundle`_. Then
+uncomment the cache meta and nodes settings.
+
 PHPCR Session with Midgard2
 """""""""""""""""""""""""""
 
@@ -860,3 +863,4 @@ Dumping nodes under ``/cms/simple`` including their properties:
 .. _`Doctrine data-fixtures`: https://github.com/doctrine/data-fixtures
 .. _`documentation of the DoctrineFixturesBundle`: http://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html
 .. _`SQL2 queries`: http://www.h2database.com/jcr/grammar.html
+.. _`DoctrineCacheBundle`: https://github.com/doctrine/DoctrineCacheBundle/

cookbook/editions/cmf_sandbox.rst

@@ -213,12 +213,12 @@ After this, your should follow the steps in `Preparing the PHPCR repository`_.
 Doctrine caching
 ................
 
-Optionally, to improve performance and enable the meta data, you can install
-LiipDoctrineCacheBundle by typing the following command:
+Optionally, to improve performance, you can install DoctrineCacheBundle by
+typing the following command:
 
 .. code-block:: bash
 
-    $ php composer.phar require liip/doctrine-cache-bundle:dev-master
+    $ php composer.phar require doctrine/cache-bundle:1.0.*
 
 And adding the following entry to your ``app/AppKernel.php``::
 
@@ -229,33 +229,32 @@ And adding the following entry to your ``app/AppKernel.php``::
     {
       $bundles = array(
           // ...
-          new Liip\DoctrineCacheBundle\LiipDoctrineCacheBundle(),
+          new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(),
           // ...
       );
     }
 
 Finally, uncomment the caches settings in the ``phpcr.yml`` as well as the
-``liip_doctrine_cache`` settings in ``config.yml``.
+``doctrine_cache`` settings in ``config.yml``.
 
 .. code-block:: yaml
 
     # app/config/phpcr.yml
     caches:
-        meta: liip_doctrine_cache.ns.meta
-        nodes: liip_doctrine_cache.ns.nodes
+        meta: doctrine_cache.providers.phpcr_meta
+        nodes: doctrine_cache.providers.phpcr_nodes
 
 .. code-block:: yaml
 
     # app/config/config.yml
 
     # ...
 
-    # jackalope doctrine caching
-    liip_doctrine_cache:
-        namespaces:
-            meta:
+    doctrine_cache:
+        providers:
+            phpcr_meta:
                 type: file_system
-            nodes:
+            phpcr_nodes:
                 type: file_system
 
 Midgard2 PHPCR Provider