geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r987975 - in /geronimo/server/trunk/plugins/openejb: geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container/ geronimo-openejb/src/main/java/org/apache/geronimo/openejb/
Date Mon, 23 Aug 2010 02:02:55 GMT
Author: gawor
Date: Mon Aug 23 02:02:54 2010
New Revision: 987975

URL: http://svn.apache.org/viewvc?rev=987975&view=rev
Log:
sync with openejb api updates

Modified:
    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
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java

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=987975&r1=987974&r2=987975&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
Mon Aug 23 02:02:54 2010
@@ -66,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(), null, null),
null),
+        deploymentInfo = new CoreDeploymentInfo(deploymentId, null, new ModuleContext(deploymentId,
new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null, null,
false), 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=987975&r1=987974&r2=987975&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
Mon Aug 23 02:02:54 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(), null, null),
null),
+        deploymentInfo = new CoreDeploymentInfo(deploymentId, null, new ModuleContext(deploymentId,
new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader(), null, null,
false), null),
             SFSB.class,
             null,
             null,

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java?rev=987975&r1=987974&r2=987975&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoEjbInfo.java
Mon Aug 23 02:02:54 2010
@@ -44,7 +44,7 @@ public class GeronimoEjbInfo implements 
     
     public AppInfo createAppInfo() {
         AppInfo appInfo = new AppInfo();
-        appInfo.jarPath = ejbJarInfo.jarPath;
+        appInfo.path = ejbJarInfo.path;
         appInfo.ejbJars.add(ejbJarInfo);
         merge(appInfo.appJndiEnc, appJndiEnc);
         merge(appInfo.globalJndiEnc, globalJndiEnc);

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=987975&r1=987974&r2=987975&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java
Mon Aug 23 02:02:54 2010
@@ -435,7 +435,7 @@ public class OpenEjbSystemGBean implemen
     }
 
     public void removeApplication(AppInfo appInfo, ClassLoader classLoader) throws UndeployException,
NoSuchApplicationException {
-        assembler.destroyApplication(appInfo.jarPath);
+        assembler.destroyApplication(appInfo.path);
     }
     
     public DeploymentInfo getDeploymentInfo(String deploymentId) {



Mime
View raw message