svn commit: r534194 - /geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java

[da...@apache.org]

Author: dain
Date: Tue May  1 11:46:48 2007
New Revision: 534194

URL: http://svn.apache.org/viewvc?view=rev&rev=534194
Log:
Do not reprocess ejb-refs for EJB modules

Modified:
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?view=diff&rev=534194&r1=534193&r2=534194
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java Tue May  1 11:46:48 2007
@@ -38,6 +38,7 @@
 import org.apache.geronimo.j2ee.deployment.annotation.EJBAnnotationHelper;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.naming.deployment.AbstractNamingBuilder;
 import org.apache.geronimo.openejb.ClientEjbReference;
@@ -99,6 +100,11 @@
     }
 
     public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException {
+        // skip ejb modules... they have alreayd been processed
+        if (module.getType() == ConfigurationModuleType.EJB) {
+            return;
+        }
+
         // map the refs declared in the vendor plan, so we can match them to the spec references
         Map<String, GerEjbRefType> refMap = mapEjbRefs(plan);
         Map<String, GerEjbLocalRefType> localRefMap = mapEjbLocalRefs(plan);