geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r592559 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Date Tue, 06 Nov 2007 21:30:37 GMT
Author: jbohn
Date: Tue Nov  6 13:30:36 2007
New Revision: 592559

URL: http://svn.apache.org/viewvc?rev=592559&view=rev
Log:
Get the build working again.  This may or maynot be the right fix for the openejb changes
so please feel free to make updates as necessary.  At least this gets us past the build error
for now.

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

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java?rev=592559&r1=592558&r2=592559&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
Tue Nov  6 13:30:36 2007
@@ -49,8 +49,10 @@
 import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefDocument;
 import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefType;
+import org.apache.openejb.Injection;
 import org.apache.openejb.OpenEJBException;
 import org.apache.openejb.assembler.classic.EjbJarInfo;
+import org.apache.openejb.assembler.classic.InjectionBuilder;
 import org.apache.openejb.assembler.classic.JndiEncBuilder;
 import org.apache.openejb.assembler.classic.JndiEncInfo;
 import org.apache.openejb.config.JndiEncInfoBuilder;
@@ -147,7 +149,14 @@
             } else {
                 jndiEncInfo = jndiEncInfoBuilder.build(consumer, "GeronimoEnc", module.getTargetPath());
             }
-            JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(jndiEncInfo, module.getName());
+//            JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(jndiEncInfo, module.getName());
+            // determind the injections
+            InjectionBuilder injectionBuilder = new InjectionBuilder(getClass().getClassLoader());
+            List<Injection> injections = injectionBuilder.buildInjections(jndiEncInfo);
+
+            // build the enc
+            JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(jndiEncInfo, injections, module.getName(),
getClass().getClassLoader());
+
             map = jndiEncBuilder.buildMap();
         } catch (OpenEJBException e) {
             throw new DeploymentException(e);



Mime
View raw message