[jboss-cvs] JBossAS SVN: r65053 - in trunk/ejb3/src/test/org/jboss/ejb3/test: clusteredsession/unit and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-09-04 12:57:00 -0400 (Tue, 04 Sep 2007)
New Revision: 65053

Modified:
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java
Log:
[EJBTHREE-1044] Replace clustering test case usage of RMIAdaptor

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java	2007-09-04 16:47:32 UTC (rev 65052)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/unit/EntityQueryRedeployUnitTestCase.java	2007-09-04 16:57:00 UTC (rev 65053)
@@ -21,8 +21,9 @@
  */
 package org.jboss.ejb3.test.clusteredentity.unit;
 
+import javax.management.MBeanServerConnection;
+
 import org.jboss.ejb3.test.common.unit.DBSetup;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -58,7 +59,7 @@
    
    private void redeploy() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       undeploy(adaptors[1], getEarName() + ".ear");
       
       sleep(2000);

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java	2007-09-04 16:47:32 UTC (rev 65052)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ForeignPartitionLocalInterceptorUnitTestCase.java	2007-09-04 16:57:00 UTC (rev 65053)
@@ -22,10 +22,9 @@
 
 package org.jboss.ejb3.test.clusteredsession.unit;
 
+import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-
 import junit.framework.Test;
 
 /**
@@ -98,7 +97,7 @@
 
    private void cleanDeployments() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       if (deployed0)
       {
@@ -115,7 +114,7 @@
    
    private void deployJars() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       deploy(adaptors[0], "clusteredsession-local.jar");
       deployed0 = true;

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java	2007-09-04 16:47:32 UTC (rev 65052)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/InvokeLocalTestBase.java	2007-09-04 16:57:00 UTC (rev 65053)
@@ -25,12 +25,12 @@
 import java.rmi.dgc.VMID;
 import java.util.Properties;
 
+import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
 import org.jboss.ejb3.test.clusteredsession.VMTester;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
 import org.jboss.test.JBossClusteredTestCase;
 
 /**
@@ -54,7 +54,7 @@
    {
       super.setUp();
       
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       setPartitionName(adaptors[0], "DefaultPartition");
       setPartitionName(adaptors[1], getPartitionName());
    }
@@ -65,7 +65,7 @@
    {
       super.tearDown();
       
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       clearPartitionName(adaptors[0]);
       clearPartitionName(adaptors[1]);
    }
@@ -114,14 +114,14 @@
    
    protected abstract String getPartitionName();
    
-   private void setPartitionName(RMIAdaptor adaptor, String partitionName) throws Exception
+   private void setPartitionName(MBeanServerConnection adaptor, String partitionName) throws Exception
    {
       Object[] args = { PARTITION_NAME_PROPERTY, partitionName };
       String[] sig = { String.class.getName(), String.class.getName() };
       adaptor.invoke(new ObjectName(PROPERTIES_SERVICE), "set", args, sig);
    }
    
-   private void clearPartitionName(RMIAdaptor adaptor) throws Exception
+   private void clearPartitionName(MBeanServerConnection adaptor) throws Exception
    {
       setPartitionName(adaptor, "DefaultPartition");
       Object[] args = { PARTITION_NAME_PROPERTY };

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java	2007-09-04 16:47:32 UTC (rev 65052)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/ProxyTargetsUnitTestCase.java	2007-09-04 16:57:00 UTC (rev 65053)
@@ -25,6 +25,7 @@
 import java.rmi.dgc.VMID;
 import java.util.Properties;
 
+import javax.management.MBeanServerConnection;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
@@ -35,7 +36,6 @@
 import org.jboss.ejb3.test.clusteredsession.StatefulRemote;
 import org.jboss.ha.framework.interfaces.ClusteringTargetsRepository;
 import org.jboss.ha.framework.interfaces.FamilyClusterInfo;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
 import org.jboss.test.JBossClusteredTestCase;
 
 /**
@@ -82,7 +82,7 @@
    {
       super.setUp();
       
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       if (!deployed0)
       {
          deploy(adaptors[0], deployment);
@@ -173,7 +173,7 @@
    
    private void undeploy() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       undeploy(adaptors[1], deployment);
       getLog().debug("Undeployed " + deployment + " on server1");
@@ -184,7 +184,7 @@
    
    private void deploy() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       deploy(adaptors[1], deployment);
       getLog().debug("Deployed " + deployment + " on server1");

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java	2007-09-04 16:47:32 UTC (rev 65052)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/unit/RedeployUnitTestCase.java	2007-09-04 16:57:00 UTC (rev 65053)
@@ -25,6 +25,7 @@
 import java.rmi.dgc.VMID;
 import java.util.Properties;
 
+import javax.management.MBeanServerConnection;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
@@ -34,7 +35,6 @@
 import org.jboss.ejb3.test.clusteredsession.NodeAnswer;
 import org.jboss.ejb3.test.clusteredsession.StatefulRemote;
 import org.jboss.ejb3.test.stateful.nested.base.VMTracker;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
 import org.jboss.test.JBossClusteredTestCase;
 
 /**
@@ -72,7 +72,7 @@
    {
       super.setUp();
       
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       if (!deployed0)
       {
          deploy(adaptors[0], deployment);
@@ -182,7 +182,7 @@
    
    private void redeploy() throws Exception
    {
-      RMIAdaptor[] adaptors = getAdaptors();
+      MBeanServerConnection[] adaptors = getAdaptors();
       
       undeploy(adaptors[1], deployment);
       getLog().debug("Undeployed " + deployment + " on server1");