svn commit: r958100 - in /geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/src/test/java/org/apache/geronimo/openejb/cluster/stateful/container: ClusteredStatefulContainerTest.java WadiCacheTest.java

[dj...@apache.org]

Author: djencks
Date: Fri Jun 25 20:15:26 2010
New Revision: 958100

URL: http://svn.apache.org/viewvc?rev=958100&view=rev
Log:
fix compilation error introcduced by some openejb restructuring

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

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=958100&r1=958099&r2=958100&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 Fri Jun 25 20:15:26 2010
@@ -21,16 +21,18 @@ package org.apache.geronimo.openejb.clus
 import java.net.URI;
 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.core.AppContext;
+import org.apache.openejb.core.BeanContext;
 import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.DeploymentContext;
+import org.apache.openejb.core.ModuleContext;
+import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.spi.SecurityService;
 import org.codehaus.wadi.servicespace.ServiceRegistry;
 import org.codehaus.wadi.servicespace.ServiceSpace;
 
-import com.agical.rmock.extension.junit.RMockTestCase;
-
 /**
  * @version $Rev$ $Date$
  */
@@ -64,7 +66,7 @@ public class ClusteredStatefulContainerT
         container = (ClusteredStatefulContainer) intercept(ClusteredStatefulContainer.class, new Object[] {"id",
                 securityService});
         deploymentId = "deploymentId";
-        deploymentInfo = new CoreDeploymentInfo(new DeploymentContext(deploymentId, null, null),
+        deploymentInfo = new CoreDeploymentInfo(new BeanContext(deploymentId, null, new ModuleContext(deploymentId, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader()))),
             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=958100&r1=958099&r2=958100&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 Fri Jun 25 20:15:26 2010
@@ -23,9 +23,9 @@ import java.rmi.dgc.VMID;
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-
 import com.agical.rmock.core.Action;
 import com.agical.rmock.core.MethodHandle;
 import com.agical.rmock.core.describe.ExpressionDescriber;
@@ -35,11 +35,14 @@ import org.apache.geronimo.clustering.Se
 import org.apache.geronimo.clustering.SessionListener;
 import org.apache.geronimo.clustering.wadi.WADISessionManager;
 import org.apache.geronimo.openejb.cluster.stateful.container.ClusteredStatefulContainerTest.SFSB;
+import org.apache.openejb.core.AppContext;
+import org.apache.openejb.core.BeanContext;
 import org.apache.openejb.core.CoreDeploymentInfo;
-import org.apache.openejb.core.DeploymentContext;
+import org.apache.openejb.core.ModuleContext;
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.core.stateful.Cache.CacheListener;
 import org.apache.openejb.core.stateful.Instance;
+import org.apache.openejb.loader.SystemInstance;
 
 /**
  * @version $Rev$ $Date$
@@ -68,7 +71,7 @@ public class WadiCacheTest extends RMock
         });
 
         deploymentId = "deploymentId";
-        deploymentInfo = new CoreDeploymentInfo(new DeploymentContext(deploymentId, null, null),
+        deploymentInfo = new CoreDeploymentInfo(new BeanContext(deploymentId, null, new ModuleContext(deploymentId, new AppContext(deploymentId, SystemInstance.get(), getClass().getClassLoader()))),
             SFSB.class,
             null,
             null,