svn commit: r603448 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java

[dblevins]

Author: dblevins
Date: Tue Dec 11 19:36:58 2007
New Revision: 603448

URL: http://svn.apache.org/viewvc?rev=603448&view=rev
Log:
Don't process EntityManager/Factory refs marked with jndi:

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=603448&r1=603447&r2=603448&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 Tue Dec 11 19:36:58 2007
@@ -180,16 +180,21 @@
 
         for (PersistenceRef ref : component.getPersistenceUnitRef()) {
 
-            resolvePersistenceRef(persistenceUnits, ref, moduleURI, 
componentName, validation);
+            processPersistenceRef(persistenceUnits, ref, moduleURI, 
componentName, validation);
         }
 
         for (PersistenceRef ref : component.getPersistenceContextRef()) {
 
-            resolvePersistenceRef(persistenceUnits, ref, moduleURI, 
componentName, validation);
+            processPersistenceRef(persistenceUnits, ref, moduleURI, 
componentName, validation);
         }
     }
 
-    private PersistenceUnit 
resolvePersistenceRef(LinkResolver<PersistenceUnit> persistenceUnits, 
PersistenceRef ref, URI moduleURI, String componentName, ValidationContext 
validation) {
+    private PersistenceUnit 
processPersistenceRef(LinkResolver<PersistenceUnit> persistenceUnits, 
PersistenceRef ref, URI moduleURI, String componentName, ValidationContext 
validation) {
+
+        if (ref.getMappedName().startsWith("jndi:")){
+            return null;
+        }
+
         PersistenceUnit unit = 
persistenceUnits.resolveLink(ref.getPersistenceUnitName(), moduleURI);
 
         // Explicitly check if we messed up the "if there's only one,
@@ -200,7 +205,7 @@
             for (PersistenceUnit persistenceUnit : persistenceUnits.values()) {
                 if (!persistenceUnit.getName().equals("cmp")){
                     // Found it
-                    unit = persistenceUnit;                                    
                                                                             
+                    unit = persistenceUnit;
                     break;
                 }
             }