You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/09/14 22:57:38 UTC
svn commit: r1170848 -
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java
Author: dblevins
Date: Wed Sep 14 20:57:38 2011
New Revision: 1170848
URL: http://svn.apache.org/viewvc?rev=1170848&view=rev
Log:
OPENEJB-1664: Merge EJB and WebApp JNDI namespaces for EJBs in .WARs compliance
Also be sure to merge the namespaces of each EJB to each EJB
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java?rev=1170848&r1=1170847&r2=1170848&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/MergeWebappJndiContext.java Wed Sep 14 20:57:38 2011
@@ -71,6 +71,25 @@ public class MergeWebappJndiContext impl
merge(bean.getPersistenceUnitRefMap(), webApp.getPersistenceUnitRefMap());
}
+ for (EnterpriseBean a : ejbJar.getEnterpriseBeans()) {
+
+ // Merge the bean namespaces together too
+ for (EnterpriseBean b : ejbJar.getEnterpriseBeans()) {
+ if (a == b) continue;
+
+ merge(a.getEnvEntryMap(), b.getEnvEntryMap());
+ merge(a.getEjbRefMap(), b.getEjbRefMap());
+ merge(a.getEjbLocalRefMap(), b.getEjbLocalRefMap());
+ merge(a.getServiceRefMap(), b.getServiceRefMap());
+ merge(a.getResourceRefMap(), b.getResourceRefMap());
+ merge(a.getResourceEnvRefMap(), b.getResourceEnvRefMap());
+ merge(a.getMessageDestinationRefMap(), b.getMessageDestinationRefMap());
+ merge(a.getPersistenceContextRefMap(), b.getPersistenceContextRefMap());
+ merge(a.getPersistenceUnitRefMap(), b.getPersistenceUnitRefMap());
+
+ }
+ }
+
removePrivateReferences(webApp);
}