geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r979773 - in /geronimo/server/trunk/plugins/openejb: geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/
Date Tue, 27 Jul 2010 17:02:49 GMT
Author: gawor
Date: Tue Jul 27 17:02:39 2010
New Revision: 979773

URL: http://svn.apache.org/viewvc?rev=979773&view=rev
Log:
fix compilation problems - updated openejb api

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbRefBuilder.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.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=979773&r1=979772&r2=979773&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 Jul 27 17:02:39 2010
@@ -117,21 +117,22 @@ public class EjbRefBuilder extends Abstr
                 ejbJars = earData.getEjbJars();
             }
 
-
             AppInfo appInfo = new AppInfo();
             appInfo.ejbJars.addAll(ejbJars);
 
             JndiEncInfoBuilder jndiEncInfoBuilder = new JndiEncInfoBuilder(appInfo);
-            JndiEncInfo jndiEncInfo;
-            if (module.isStandAlone()) {
-                jndiEncInfo = jndiEncInfoBuilder.build(specDD, "GeronimoEnc", null);
-            } else {
-                jndiEncInfo = jndiEncInfoBuilder.build(specDD, "GeronimoEnc", module.getTargetPath());
-            }
+            String moduleId = (module.isStandAlone()) ? null : module.getTargetPath();
+            JndiEncInfo moduleJndiEnc = new JndiEncInfo();
+            JndiEncInfo compJndiEnc = new JndiEncInfo();       
 
+            jndiEncInfoBuilder.build(specDD, "GeronimoEnc", moduleId, moduleJndiEnc, compJndiEnc);
+            
             JndiEncInfo ejbEncInfo = new JndiEncInfo();
-            ejbEncInfo.ejbReferences.addAll(jndiEncInfo.ejbReferences);
-            ejbEncInfo.ejbLocalReferences.addAll(jndiEncInfo.ejbLocalReferences);
+            ejbEncInfo.ejbReferences.addAll(moduleJndiEnc.ejbReferences);
+            ejbEncInfo.ejbLocalReferences.addAll(moduleJndiEnc.ejbLocalReferences);
+            
+            ejbEncInfo.ejbReferences.addAll(compJndiEnc.ejbReferences);
+            ejbEncInfo.ejbLocalReferences.addAll(compJndiEnc.ejbLocalReferences);
 
             JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(ejbEncInfo, null, module.getName(),
getClass().getClassLoader());
 
@@ -147,7 +148,7 @@ public class EjbRefBuilder extends Abstr
             // work with names prefixed with java:comp/
             if (name.startsWith("env/") ||
                     name.startsWith("java:global/") ||
-                    name.startsWith("java:application/") ||
+                    name.startsWith("java:app/") ||
                     name.startsWith("java:module/") ||
                     name.startsWith("java:comp/")) {
                 if (uri != null) {

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java?rev=979773&r1=979772&r2=979773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ClusteredStatefulContainerTest.java
Tue Jul 27 17:02:39 2010
@@ -24,6 +24,7 @@ import java.util.Collections;
 import com.agical.rmock.extension.junit.RMockTestCase;
 import org.apache.geronimo.clustering.wadi.WADISessionManager;
 import org.apache.geronimo.openejb.cluster.infra.NetworkConnectorTracker;
+import org.apache.openejb.assembler.classic.JndiEncBuilder;
 import org.apache.openejb.core.AppContext;
 import org.apache.openejb.core.CoreDeploymentInfo;
 import org.apache.openejb.core.ModuleContext;
@@ -65,7 +66,7 @@ public class ClusteredStatefulContainerT
         container = (ClusteredStatefulContainer) intercept(ClusteredStatefulContainer.class,
new Object[] {"id",
                 securityService});
         deploymentId = "deploymentId";
-        deploymentInfo = new CoreDeploymentInfo(deploymentId, null, new ModuleContext(deploymentId,
new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader())),
+        deploymentInfo = new CoreDeploymentInfo(deploymentId, null, new ModuleContext(deploymentId,
new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null, null),
null),
             SFSB.class,
             null,
             null,

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java?rev=979773&r1=979772&r2=979773&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/WadiCacheTest.java
Tue Jul 27 17:02:39 2010
@@ -70,7 +70,7 @@ public class WadiCacheTest extends RMock
         });
 
         deploymentId = "deploymentId";
-        deploymentInfo = new CoreDeploymentInfo(deploymentId, null, new ModuleContext(deploymentId,
new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader())),
+        deploymentInfo = new CoreDeploymentInfo(deploymentId, null, new ModuleContext(deploymentId,
new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null, null),
null),
             SFSB.class,
             null,
             null,



Mime
View raw message