From 8fbf19694f253e8bacdd677362ee58967506bbb3 Mon Sep 17 00:00:00 2001
From: "Jonathan H. Wage" <jonwage@gmail.com>
Date: Sat, 2 Oct 2010 16:43:30 -0500
Subject: [PATCH] Adding orm: and mongodb: annotation aliases to avoid
 conflicts. Recommended is to use the aliases instead of relying on the
 default namespace for annotations.

/** @orm:Entity */
/** @mongodb:Document */
---
 src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml   | 5 +++++
 .../DoctrineMongoDBBundle/Resources/config/mongodb.xml       | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
index f86804b490..a8227fd750 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
+++ b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
@@ -45,6 +45,11 @@
         <service id="doctrine.orm.metadata_driver.annotation" class="Doctrine\ORM\Mapping\Driver\AnnotationDriver">
             <argument type="service" id="doctrine.orm.metadata_driver.annotation.reader" />
             <argument>%doctrine.orm.metadata_driver.entity_dirs%</argument>
+            <call method="setDefaultAnnotationNamespace"><argument>%doctrine.orm.metadata.annotation_default_namespace%</argument></call>
+            <call method="setAnnotationNamespaceAlias">
+              <argument>Doctrine\ORM\Mapping\</argument>
+              <argument>orm</argument>
+            </call>
         </service>
 
         <service id="doctrine.orm.metadata_driver.annotation.reader" class="Doctrine\Common\Annotations\AnnotationReader">
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
index fa41a2ce50..c2f718b54e 100755
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/mongodb.xml
@@ -57,6 +57,10 @@
     <service id="doctrine.odm.mongodb.metadata.annotation_reader" class="%doctrine.odm.mongodb.metadata.annotation_reader_class%">
       <argument type="service" id="doctrine.odm.mongodb.cache" />
       <call method="setDefaultAnnotationNamespace"><argument>%doctrine.odm.mongodb.metadata.annotation_default_namespace%</argument></call>
+      <call method="setAnnotationNamespaceAlias">
+        <argument>Doctrine\ODM\MongoDB\Mapping\</argument>
+        <argument>mongodb</argument>
+      </call>
     </service>
     <service id="doctrine.odm.mongodb.metadata.xml" class="%doctrine.odm.mongodb.metadata.xml_class%"><argument>%doctrine.odm.mongodb.xml_mapping_dirs%</argument></service>
     <service id="doctrine.odm.mongodb.metadata.yml" class="%doctrine.odm.mongodb.metadata.yml_class%"><argument>%doctrine.odm.mongodb.yml_mapping_dirs%</argument></service>