diff --git a/autoload.php.dist b/autoload.php.dist
index 1f19ccaace..69748887a8 100644
--- a/autoload.php.dist
+++ b/autoload.php.dist
@@ -7,7 +7,8 @@ use Symfony\Component\HttpFoundation\UniversalClassLoader;
$loader = new UniversalClassLoader();
$loader->registerNamespaces(array(
'Symfony' => __DIR__.'/src',
- 'Doctrine\\ODM\\MongoDB' => __DIR__.'/vendor/doctrine-mongodb/lib',
+ 'Doctrine\\MongoDB' => __DIR__.'/vendor/doctrine-mongodb/lib',
+ 'Doctrine\\ODM\\MongoDB' => __DIR__.'/vendor/doctrine-mongodb-odm/lib',
'Doctrine\\Common\\DataFixtures' => __DIR__.'/vendor/doctrine-data-fixtures/lib',
'Doctrine\\Common' => __DIR__.'/vendor/doctrine-common/lib',
'Doctrine\\DBAL\\Migrations' => __DIR__.'/vendor/doctrine-migrations/lib',
@@ -19,4 +20,4 @@ $loader->registerPrefixes(array(
'Swift_' => __DIR__.'/vendor/swiftmailer/lib/classes',
'Twig_' => __DIR__.'/vendor/twig/lib',
));
-$loader->register();
+$loader->register();
\ No newline at end of file
diff --git a/install_vendors.sh b/install_vendors.sh
index 64a3426c30..057a7dd16f 100755
--- a/install_vendors.sh
+++ b/install_vendors.sh
@@ -25,7 +25,10 @@ git clone git://github.com/doctrine/common.git doctrine-common
git clone git://github.com/doctrine/migrations.git doctrine-migrations
# Doctrine MongoDB
-git clone git://github.com/doctrine/mongodb-odm.git doctrine-mongodb
+git clone git://github.com/doctrine/mongodb.git doctrine-mongodb
+
+# Doctrine MongoDB
+git clone git://github.com/doctrine/mongodb-odm.git doctrine-mongodb-odm
# Swiftmailer
git clone git://github.com/swiftmailer/swiftmailer.git swiftmailer
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
index cec93aa7d6..4dedd46473 100755
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
@@ -9,7 +9,7 @@
default
default
array
- Doctrine\ODM\MongoDB\Mongo
+ Doctrine\MongoDB\Connection
Doctrine\ODM\MongoDB\Configuration
Doctrine\ODM\MongoDB\DocumentManager
Symfony\Bundle\DoctrineMongoDBBundle\Logger\DoctrineMongoDBLogger
@@ -92,4 +92,4 @@
-
+
\ No newline at end of file
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/ContainerTest.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/ContainerTest.php
index 2d565d2973..1de604f4f6 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/ContainerTest.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/ContainerTest.php
@@ -47,7 +47,7 @@ class ContainerTest extends TestCase
$this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $container->get('doctrine.odm.mongodb.cache.array'));
$this->assertInstanceOf('Symfony\Bundle\DoctrineMongoDBBundle\Logger\DoctrineMongoDBLogger', $container->get('doctrine.odm.mongodb.logger'));
$this->assertInstanceOf('Symfony\Bundle\DoctrineMongoDBBundle\DataCollector\DoctrineMongoDBDataCollector', $container->get('doctrine.odm.mongodb.data_collector'));
- $this->assertInstanceOf('Doctrine\ODM\MongoDB\Mongo', $container->get('doctrine.odm.mongodb.default_connection'));
+ $this->assertInstanceOf('Doctrine\MongoDB\Connection', $container->get('doctrine.odm.mongodb.default_connection'));
$this->assertInstanceOf('Doctrine\ODM\MongoDB\Configuration', $container->get('doctrine.odm.mongodb.default_configuration'));
$this->assertInstanceOf('Doctrine\ODM\MongoDB\Mapping\Driver\DriverChain', $container->get('doctrine.odm.mongodb.metadata'));
$this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $container->get('doctrine.odm.mongodb.default_metadata_cache'));
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
index ab6189a7ae..f6a2bca070 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/AbstractMongoDBExtensionTest.php
@@ -29,7 +29,7 @@ abstract class AbstractMongoDBExtensionTest extends TestCase
$loader->mongodbLoad(array(), $container);
- $this->assertEquals('Doctrine\ODM\MongoDB\Mongo', $container->getParameter('doctrine.odm.mongodb.connection_class'));
+ $this->assertEquals('Doctrine\MongoDB\Connection', $container->getParameter('doctrine.odm.mongodb.connection_class'));
$this->assertEquals('Doctrine\ODM\MongoDB\Configuration', $container->getParameter('doctrine.odm.mongodb.configuration_class'));
$this->assertEquals('Doctrine\ODM\MongoDB\DocumentManager', $container->getParameter('doctrine.odm.mongodb.document_manager_class'));
$this->assertEquals('Proxies', $container->getParameter('doctrine.odm.mongodb.proxy_namespace'));
diff --git a/update_vendors.sh b/update_vendors.sh
index 8811598622..8261876a3b 100755
--- a/update_vendors.sh
+++ b/update_vendors.sh
@@ -20,6 +20,9 @@ cd $CURRENT/doctrine-migrations && git pull
# Doctrine MongoDB
cd $CURRENT/doctrine-mongodb && git pull
+# Doctrine MongoDB ODM
+cd $CURRENT/doctrine-mongodb-odm && git pull
+
# Swiftmailer
cd $CURRENT/swiftmailer && git pull