You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2006/11/02 19:43:38 UTC

svn commit: r470469 - in /incubator/openejb/trunk/openejb2/modules: openejb-builder/src/main/java/org/apache/openejb/deployment/ openejb-corba-builder/src/main/java/org/apache/openejb/deployment/

Author: dain
Date: Thu Nov  2 10:43:34 2006
New Revision: 470469

URL: http://svn.apache.org/viewvc?view=rev&rev=470469
Log:
GERONIMO-2540 Naming builders do not see classes located in a war in an ear

Modified:
    incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbLocalRefBuilder.java
    incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbRemoteRefBuilder.java
    incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/OpenEjbCorbaRefBuilder.java

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbLocalRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbLocalRefBuilder.java?view=diff&rev=470469&r1=470468&r2=470469
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbLocalRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbLocalRefBuilder.java Thu Nov  2 10:43:34 2006
@@ -63,7 +63,7 @@
         XmlObject[] ejbLocalRefsUntyped = convert(specDD.selectChildren(ejbLocalRefQNameSet), J2EE_CONVERTER, EjbLocalRefType.type);
         XmlObject[] gerEjbLocalRefsUntyped = plan == null? NO_REFS: plan.selectChildren(GER_EJB_LOCAL_REF_QNAME_SET);
         Map ejbLocalRefMap = mapEjbLocalRefs(gerEjbLocalRefsUntyped);
-        ClassLoader cl = localConfiguration.getConfigurationClassLoader();
+        ClassLoader cl = module.getEarContext().getClassLoader();
 
         for (int i = 0; i < ejbLocalRefsUntyped.length; i++) {
             EjbLocalRefType ejbLocalRef = (EjbLocalRefType) ejbLocalRefsUntyped[i];

Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbRemoteRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbRemoteRefBuilder.java?view=diff&rev=470469&r1=470468&r2=470469
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbRemoteRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbRemoteRefBuilder.java Thu Nov  2 10:43:34 2006
@@ -68,7 +68,7 @@
         XmlObject[] ejbRefsUntyped = getEjbRefs(specDD);
         XmlObject[] gerEjbRefsUntyped = plan == null? NO_REFS: plan.selectChildren(GER_EJB_REF_QNAME_SET);
         Map ejbRefMap = mapEjbRefs(gerEjbRefsUntyped);
-        ClassLoader cl = localConfiguration.getConfigurationClassLoader();
+        ClassLoader cl = module.getEarContext().getClassLoader();
 
         for (int i = 0; i < ejbRefsUntyped.length; i++) {
             EjbRefType ejbRef = (EjbRefType) ejbRefsUntyped[i];

Modified: incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/OpenEjbCorbaRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/OpenEjbCorbaRefBuilder.java?view=diff&rev=470469&r1=470468&r2=470469
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/OpenEjbCorbaRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/src/main/java/org/apache/openejb/deployment/OpenEjbCorbaRefBuilder.java Thu Nov  2 10:43:34 2006
@@ -82,7 +82,7 @@
         XmlObject[] ejbRefsUntyped = getEjbRefs(specDD);
         XmlObject[] gerEjbRefsUntyped = plan == null ? NO_REFS : plan.selectChildren(GER_EJB_REF_QNAME_SET);
         Map ejbRefMap = mapEjbRefs(gerEjbRefsUntyped);
-        ClassLoader cl = localConfiguration.getConfigurationClassLoader();
+        ClassLoader cl = module.getEarContext().getClassLoader();
 
         for (int i = 0; i < ejbRefsUntyped.length; i++) {
             EjbRefType ejbRef = (EjbRefType) ejbRefsUntyped[i];