[jboss-cvs] JBossAS SVN: r65051 - in trunk/testsuite/src/main/org/jboss/test: cluster/defaultcfg/ejb2/test and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 4 12:44:25 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-09-04 12:44:25 -0400 (Tue, 04 Sep 2007)
New Revision: 65051
Modified:
trunk/testsuite/src/main/org/jboss/test/JBossClusteredTestCase.java
trunk/testsuite/src/main/org/jboss/test/JBossTestClusteredServices.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/ejb2/test/RetryInterceptorUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonElectionPolicyTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/RPCTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SimpleTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/ejb2/test/StatefulPassivationExpirationUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/DRMTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/DistributedStateTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/HAPartitionStateTransferTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/FieldBasedTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/StateTransferTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/ScopedTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/UndeployTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
trunk/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java
Log:
[JBAS-4663] Replace JBossClusteredTestCase usage of RMIAdaptor
Modified: trunk/testsuite/src/main/org/jboss/test/JBossClusteredTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/JBossClusteredTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/JBossClusteredTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -21,7 +21,7 @@
*/
package org.jboss.test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import javax.management.MBeanServerConnection;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -73,7 +73,7 @@
}
- public RMIAdaptor[] getAdaptors() throws Exception
+ public MBeanServerConnection[] getAdaptors() throws Exception
{
return clusterServices.getAdaptors();
}
@@ -96,17 +96,17 @@
return clusterServices.getHttpURLs();
}
- protected void deploy(RMIAdaptor server, String name) throws Exception
+ protected void deploy(MBeanServerConnection server, String name) throws Exception
{
clusterServices.deploy(server, name);
}
- protected void redeploy(RMIAdaptor server, String name) throws Exception
+ protected void redeploy(MBeanServerConnection server, String name) throws Exception
{
clusterServices.redeploy(server, name);
}
- protected void undeploy(RMIAdaptor server, String name) throws Exception
+ protected void undeploy(MBeanServerConnection server, String name) throws Exception
{
clusterServices.undeploy(server, name);
}
Modified: trunk/testsuite/src/main/org/jboss/test/JBossTestClusteredServices.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/JBossTestClusteredServices.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/JBossTestClusteredServices.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -25,11 +25,10 @@
import java.util.ArrayList;
import java.util.Hashtable;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.naming.InitialContext;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-
/**
* Derived implementation of JBossTestServices for cluster testing.
*
@@ -74,17 +73,17 @@
return servers.size();
}
- RMIAdaptor[] getAdaptors() throws Exception
+ MBeanServerConnection[] getAdaptors() throws Exception
{
// init();
- RMIAdaptor[] tmp = new RMIAdaptor[adaptors.size()];
+ MBeanServerConnection[] tmp = new MBeanServerConnection[adaptors.size()];
adaptors.toArray(tmp);
return tmp;
}
- RMIAdaptor getAdaptor(int index) throws Exception
+ MBeanServerConnection getAdaptor(int index) throws Exception
{
// init();
- RMIAdaptor adaptor = (RMIAdaptor) adaptors.get(index);
+ MBeanServerConnection adaptor = (MBeanServerConnection) adaptors.get(index);
return adaptor;
}
@@ -165,7 +164,7 @@
* @param name filename/url of package to deploy.
* @exception Exception Description of Exception
*/
- public void deploy(RMIAdaptor server, String name) throws Exception
+ public void deploy(MBeanServerConnection server, String name) throws Exception
{
if (Boolean.getBoolean("jbosstest.nodeploy") == true)
{
@@ -182,7 +181,7 @@
new String[]{"java.net.URL"});
}
- public void redeploy(RMIAdaptor server, String name) throws Exception
+ public void redeploy(MBeanServerConnection server, String name) throws Exception
{
if (Boolean.getBoolean("jbosstest.nodeploy") == true)
{
@@ -208,7 +207,7 @@
* @param name filename/url of package to undeploy.
* @exception Exception Description of Exception
*/
- public void undeploy(RMIAdaptor server, String name) throws Exception
+ public void undeploy(MBeanServerConnection server, String name) throws Exception
{
if (Boolean.getBoolean("jbosstest.nodeploy") == true)
return;
@@ -233,13 +232,13 @@
String[] sig)
throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
Object result = null;
for (int i = 0; i < adaptors.length; i++)
{
- RMIAdaptor adaptor = adaptors[i];
- log.debug("Using RMIAdaptor: "+adaptor);
+ MBeanServerConnection adaptor = adaptors[i];
+ log.debug("Using MBeanServerConnection: "+adaptor);
result = invoke(adaptor, name, method, args, sig);
}
@@ -291,7 +290,7 @@
env.put("java.naming.provider.url", urlValue);
// Lookup the adaptor
InitialContext tmpCtx = new InitialContext(env);
- RMIAdaptor adaptor = (RMIAdaptor) tmpCtx.lookup(adaptorName);
+ MBeanServerConnection adaptor = (MBeanServerConnection) tmpCtx.lookup(adaptorName);
adaptors.add(adaptor);
// See if there is a jbosstest.cluster.nodeN.hajndi.url
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/ejb2/test/RetryInterceptorUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/ejb2/test/RetryInterceptorUnitTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/ejb2/test/RetryInterceptorUnitTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -29,13 +29,13 @@
import java.util.Properties;
import java.util.Random;
+import javax.management.MBeanServerConnection;
import javax.naming.Context;
import javax.naming.InitialContext;
import junit.framework.AssertionFailedError;
import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.logging.Logger;
import org.jboss.proxy.ejb.RetryInterceptor;
import org.jboss.test.JBossClusteredTestCase;
@@ -413,7 +413,7 @@
assertEquals("StatelessSession: Server0 has no calls", 0, slsb.getCallCount());
// Undeploy the ear
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
undeploy(adaptors[0], "test-retry.ear");
setDeployed0(false);
@@ -587,7 +587,7 @@
protected void configureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
if (!isDeployed0())
{
@@ -607,7 +607,7 @@
protected void reconfigureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
deploy(adaptors[1], "test-retry.ear");
setDeployed1(true);
@@ -659,7 +659,7 @@
if (System.getProperty("JBossCluster-DoFail") != null)
System.setProperty("JBossCluster-DoFail", "false");
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
if (isDeployed0())
{
undeploy(adaptors[0], "test-retry.ear");
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -31,6 +31,7 @@
import java.util.HashSet;
import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
import javax.management.MBeanServerFactory;
import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
@@ -49,7 +50,6 @@
import org.jboss.ha.framework.server.DistributedReplicantManagerImpl;
import org.jboss.ha.framework.server.DistributedStateImpl;
import org.jboss.ha.framework.server.JChannelFactory;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.jmx.adaptor.rmi.RMIAdaptorExt;
import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
import org.jboss.logging.Logger;
@@ -518,7 +518,7 @@
{
log.debug("+++ testStateReplication");
log.info("java.rmi.server.hostname="+System.getProperty("java.rmi.server.hostname"));
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
String[] servers = super.getServers();
RMIAdaptorExt server0 = (RMIAdaptorExt) adaptors[0];
log.info("server0: "+server0);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -23,11 +23,11 @@
import java.util.Properties;
+import javax.management.MBeanServerConnection;
import javax.naming.Context;
import javax.naming.InitialContext;
import org.jboss.invocation.ServiceUnavailableException;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.invokerha.HAServiceRemote;
@@ -124,7 +124,7 @@
protected void configureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
String warName = getDeploymentName();
if (!deployed0_)
{
@@ -144,7 +144,7 @@
protected void reconfigureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
if (!deployed1_)
{
deploy(adaptors[1], getDeploymentName());
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonElectionPolicyTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonElectionPolicyTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonElectionPolicyTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -21,11 +21,11 @@
*/
package org.jboss.test.cluster.defaultcfg.test;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
/**
@@ -53,7 +53,7 @@
public void testElectionPolicy() throws Exception
{
// Get MBeanServerConnections
- RMIAdaptor[] adaptors = this.getAdaptors();
+ MBeanServerConnection[] adaptors = this.getAdaptors();
int size = adaptors.length;
assertTrue(size == 2); // cluster size must be 2 for 3rd policy test
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -24,13 +24,13 @@
import java.util.Properties;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.naming.Context;
import javax.naming.InitialContext;
import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.ejb2.basic.interfaces.NodeAnswer;
import org.jboss.test.cluster.ejb2.basic.interfaces.StatefulSession;
@@ -65,7 +65,7 @@
{
getLog().debug("testStatefulBeanFailover");
- RMIAdaptor[] adaptors = this.getAdaptors();
+ MBeanServerConnection[] adaptors = this.getAdaptors();
String[] urls = getNamingURLs();
Properties env = new Properties();
@@ -125,7 +125,7 @@
}
- protected void restartPartition(RMIAdaptor adaptor) throws Exception
+ protected void restartPartition(MBeanServerConnection adaptor) throws Exception
{
ObjectName partition = new ObjectName("jboss:service=RestartPartition");
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/RPCTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/RPCTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/RPCTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -22,12 +22,12 @@
package org.jboss.test.cluster.defaultcfg.test;
import java.util.ArrayList;
+
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptorExt;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.hapartition.rpc.Person;
import org.jboss.test.cluster.hapartition.rpc.PersonQuery;
@@ -60,8 +60,8 @@
{
log.debug("+++ testMethodOnCluster");
- RMIAdaptor[] adaptors = getAdaptors();
- RMIAdaptorExt server0 = (RMIAdaptorExt) adaptors[0];
+ MBeanServerConnection[] adaptors = getAdaptors();
+ MBeanServerConnection server0 = adaptors[0];
ObjectName rpcService = new ObjectName(RPC_SERVICE);
Object obj0 = server0.invoke(rpcService, "runRetrieveAll", null, null);
@@ -89,8 +89,8 @@
{
log.debug("+++ testParmMethodOnCluster");
- RMIAdaptor[] adaptors = getAdaptors();
- RMIAdaptorExt server1 = (RMIAdaptorExt) adaptors[1];
+ MBeanServerConnection[] adaptors = getAdaptors();
+ MBeanServerConnection server1 = adaptors[1];
ObjectName rpcService = new ObjectName(RPC_SERVICE);
// try using a custom class as parameter
@@ -127,9 +127,9 @@
{
log.debug("+++ testAsynchMethodOnCluster");
- RMIAdaptor[] adaptors = getAdaptors();
- RMIAdaptorExt server0 = (RMIAdaptorExt) adaptors[0];
- RMIAdaptorExt server1 = (RMIAdaptorExt) adaptors[1];
+ MBeanServerConnection[] adaptors = getAdaptors();
+ MBeanServerConnection server0 = adaptors[0];
+ MBeanServerConnection server1 = adaptors[1];
ObjectName rpcService = new ObjectName(RPC_SERVICE);
// this will set the 'notified' attribute to true for all Person objects in RPCUser
@@ -161,8 +161,8 @@
{
log.debug("+++ testMethodOnCoordinatorNode");
- RMIAdaptor[] adaptors = getAdaptors();
- RMIAdaptorExt server0 = (RMIAdaptorExt) adaptors[0];
+ MBeanServerConnection[] adaptors = getAdaptors();
+ MBeanServerConnection server0 = adaptors[0];
ObjectName rpcService = new ObjectName(RPC_SERVICE);
Object obj0 = server0.invoke(rpcService, "runRetrieveFromCoordinator", null, null);
@@ -187,8 +187,8 @@
{
log.debug("+++ testMethodOnOneNode");
- RMIAdaptor[] adaptors = getAdaptors();
- RMIAdaptorExt server0 = (RMIAdaptorExt) adaptors[0];
+ MBeanServerConnection[] adaptors = getAdaptors();
+ MBeanServerConnection server0 = adaptors[0];
ObjectName rpcService = new ObjectName(RPC_ONENODE_SERVICE);
Object obj0 = server0.invoke(rpcService, "runRetrieveAll", null, null);
@@ -212,8 +212,8 @@
{
log.debug("+++ testClassLoaderParmMethodOnOneNode");
- RMIAdaptor[] adaptors = getAdaptors();
- RMIAdaptorExt server1 = (RMIAdaptorExt) adaptors[1];
+ MBeanServerConnection[] adaptors = getAdaptors();
+ MBeanServerConnection server1 = adaptors[1];
ObjectName rpcService = new ObjectName(RPC_ONENODE_CLASSLOADER_SERVICE);
// try using a custom class as parameter
@@ -250,8 +250,8 @@
{
log.debug("+++ testClassLoaderParmMethodOnCluster");
- RMIAdaptor[] adaptors = getAdaptors();
- RMIAdaptorExt server1 = (RMIAdaptorExt) adaptors[1];
+ MBeanServerConnection[] adaptors = getAdaptors();
+ MBeanServerConnection server1 = adaptors[1];
ObjectName rpcService = new ObjectName(RPC_CLASSLOADER_SERVICE);
// try using a custom class as parameter
@@ -288,8 +288,8 @@
{
log.debug("+++ testClassLoaderMethodOnCluster");
- RMIAdaptor[] adaptors = getAdaptors();
- RMIAdaptorExt server0 = (RMIAdaptorExt) adaptors[0];
+ MBeanServerConnection[] adaptors = getAdaptors();
+ MBeanServerConnection server0 = adaptors[0];
ObjectName rpcService = new ObjectName(RPC_CLASSLOADER_SERVICE);
Object obj0 = server0.invoke(rpcService, "runRetrieveAll", null, null);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SimpleTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SimpleTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SimpleTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -21,9 +21,10 @@
*/
package org.jboss.test.cluster.defaultcfg.web.test;
+import javax.management.MBeanServerConnection;
+
import junit.framework.Test;
import org.apache.commons.httpclient.HttpClient;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.testutil.SessionTestUtil;
import org.jboss.test.cluster.testutil.WebTestBase;
@@ -156,7 +157,7 @@
sleepThread(45000);
// Confirm 2nd session is gone from the distributed cache on node 0
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
assertNull("Session gone from distributed cache",
SessionTestUtil.getSessionVersion(adaptors[0], sessionFqn));
assertNull("Session gone from distributed cache",
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/ejb2/test/StatefulPassivationExpirationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/ejb2/test/StatefulPassivationExpirationUnitTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/ejb2/test/StatefulPassivationExpirationUnitTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -25,13 +25,13 @@
import java.util.Date;
import java.util.Properties;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.naming.Context;
import javax.naming.InitialContext;
import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.cluster.ejb2.basic.interfaces.NodeAnswer;
import org.jboss.test.cluster.ejb2.basic.interfaces.StatefulSession;
import org.jboss.test.testbean.interfaces.StatefulSessionHome;
@@ -199,7 +199,7 @@
// Confirm that the bean cache is empty
String oNameS = "jboss.j2ee:jndiName=ExpiredStatefulSession,plugin=cache,service=EJB";
ObjectName oName = new ObjectName(oNameS);
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
Long cacheCount = (Long) adaptors[0].getAttribute(oName, "CacheSize");
assertEquals("CacheSize is zero", 0, cacheCount.longValue());
// Checking the passivated count is invalid, as it doesn't get reduced
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/DRMTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/DRMTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/DRMTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -27,13 +27,13 @@
import java.util.List;
import java.util.Vector;
+import javax.management.MBeanServerConnection;
import javax.management.MBeanServerInvocationHandler;
import javax.management.Notification;
import javax.management.ObjectName;
import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.jmx.adaptor.rmi.RMIAdaptorExt;
import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
import org.jboss.logging.Logger;
@@ -82,7 +82,7 @@
{
log.debug("+++ testStateReplication");
log.info("java.rmi.server.hostname="+System.getProperty("java.rmi.server.hostname"));
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
String[] servers = super.getServers();
RMIAdaptorExt server0 = (RMIAdaptorExt) adaptors[0];
log.info("server0: "+server0);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/DistributedStateTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/DistributedStateTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/DistributedStateTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -25,6 +25,8 @@
import java.rmi.server.UnicastRemoteObject;
import java.util.Collection;
import java.util.Vector;
+
+import javax.management.MBeanServerConnection;
import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
import javax.management.Notification;
@@ -35,7 +37,6 @@
import org.jboss.test.cluster.hapartition.ds.DistributedStateUser;
import org.jboss.test.cluster.hapartition.ds.IDistributedState;
import org.jboss.test.cluster.hapartition.ds.IDistributedState.NotifyData;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.jmx.adaptor.rmi.RMIAdaptorExt;
import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
@@ -96,7 +97,7 @@
{
log.debug("+++ testStateReplication");
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
RMIAdaptorExt server0 = (RMIAdaptorExt) adaptors[0];
log.info("server0: "+server0);
ObjectName clusterService = new ObjectName("jboss:service=DefaultPartition");
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/HAPartitionStateTransferTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/HAPartitionStateTransferTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/test/HAPartitionStateTransferTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -23,11 +23,11 @@
import java.util.Vector;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.hapartition.state.BadHAPartitionStateException;
import org.jboss.test.cluster.hapartition.state.CustomStateHAPartitionStateTransfer;
@@ -65,7 +65,7 @@
public void testFailedStateProvider() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
ObjectName recorder = new ObjectName("jboss:service=BadProviderPartitionRecorder");
@@ -91,7 +91,7 @@
public void testBadStateIntegration() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
ObjectName recorder = new ObjectName("jboss:service=BadStatePartitionRecorder");
@@ -117,7 +117,7 @@
public void testNoStateTransfer() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
ObjectName partition = new ObjectName("jboss:service=NoStatePartitionRecorder");
@@ -129,7 +129,7 @@
public void testGoodStateTransfer() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
ObjectName partition = new ObjectName("jboss:service=GoodStatePartitionRecorder");
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/FieldBasedTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/FieldBasedTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/FieldBasedTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -21,11 +21,12 @@
*/
package org.jboss.test.cluster.multicfg.web.field.test;
+import javax.management.MBeanServerConnection;
+
import junit.framework.Test;
import org.apache.commons.httpclient.HttpClient;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.multicfg.web.test.ScopedTestCase;
import org.jboss.test.cluster.testutil.SessionTestUtil;
@@ -89,7 +90,7 @@
sessionID = stripJvmRoute(sessionID);
String sessionFqn = "/JSESSION/localhost" + warName_ + sessionID;
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
// Get the session from the cache
Object origVersion = SessionTestUtil.getSessionVersion(adaptors[0], sessionFqn);
@@ -154,7 +155,7 @@
setCookieDomainToThisServer(client, servers_[0]);
makeGet(client, baseURL0_ + removeUrl);
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
// Get the session from the cache
Object origVersion = SessionTestUtil.getSessionVersion(adaptors[0], sessionFqn);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/StateTransferTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/StateTransferTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/field/test/StateTransferTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -24,6 +24,7 @@
import java.util.Set;
+import javax.management.MBeanServerConnection;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -31,7 +32,6 @@
import org.apache.commons.httpclient.HttpClient;
import org.jboss.cache.Fqn;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.testutil.SessionTestUtil;
import org.jboss.test.cluster.testutil.WebTestBase;
@@ -73,8 +73,8 @@
protected String getUrlBase_;
private ObjectName warObjectName;
- private RMIAdaptor adaptor0_;
- private RMIAdaptor adaptor1_;
+ private MBeanServerConnection adaptor0_;
+ private MBeanServerConnection adaptor1_;
private String warFqn_;
/**
@@ -114,7 +114,7 @@
"j2eeType=WebModule,name=//localhost/" + getWarName();
warObjectName = new ObjectName(oname);
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
adaptor0_ = adaptors[0];
adaptor1_ = adaptors[1];
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/ScopedTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/ScopedTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/ScopedTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.net.HttpURLConnection;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import junit.framework.Test;
@@ -35,7 +36,6 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.jboss.cache.Fqn;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.testutil.WebTestBase;
@@ -143,7 +143,7 @@
"j2eeType=WebModule,name=//localhost/" + getWarName();
warObjectName = new ObjectName(oname);
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
Object[] names = {"JSESSION", "localhost", getWarName() };
Fqn fqn = new Fqn(names);
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/UndeployTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/UndeployTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/multicfg/web/test/UndeployTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -1,9 +1,10 @@
package org.jboss.test.cluster.multicfg.web.test;
+import javax.management.MBeanServerConnection;
+
import junit.framework.Test;
import org.apache.commons.httpclient.HttpClient;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.testutil.WebTestBase;
@@ -101,7 +102,7 @@
protected void configureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
String warName = getWarName();
if (!deployed0_)
{
@@ -121,7 +122,7 @@
protected void reconfigureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
deploy(adaptors[1], getWarName());
deployed1_ = true;
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -26,6 +26,8 @@
import java.util.List;
import java.util.Set;
+import javax.management.MBeanServerConnection;
+
import org.apache.catalina.core.StandardContext;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheSPI;
@@ -38,7 +40,6 @@
import org.jboss.cache.loader.FileCacheLoaderConfig;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheFactory;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.cluster.web.CacheHelper;
import org.jboss.test.cluster.web.MockContainer;
import org.jboss.web.tomcat.service.session.JBossCacheManager;
@@ -119,7 +120,7 @@
return config;
}
- public static Object getSessionVersion(RMIAdaptor adaptor, String sessionFqn) throws Exception
+ public static Object getSessionVersion(MBeanServerConnection adaptor, String sessionFqn) throws Exception
{
return adaptor.invoke(CacheHelper.OBJECT_NAME,
"getSessionVersion",
@@ -127,7 +128,7 @@
TYPES);
}
- public static Object getBuddySessionVersion(RMIAdaptor adaptor, String sessionFqn) throws Exception
+ public static Object getBuddySessionVersion(MBeanServerConnection adaptor, String sessionFqn) throws Exception
{
return adaptor.invoke(CacheHelper.OBJECT_NAME,
@@ -136,7 +137,7 @@
TYPES);
}
- public static boolean exists(RMIAdaptor adaptor, String fqn) throws Exception
+ public static boolean exists(MBeanServerConnection adaptor, String fqn) throws Exception
{
Boolean b = (Boolean) adaptor.invoke(CacheHelper.OBJECT_NAME,
"exists",
@@ -145,7 +146,7 @@
return b.booleanValue();
}
- public static Set getSessionIds(RMIAdaptor adaptor, String warFqn) throws Exception
+ public static Set getSessionIds(MBeanServerConnection adaptor, String warFqn) throws Exception
{
return (Set) adaptor.invoke(CacheHelper.OBJECT_NAME,
"getSessionIds",
@@ -153,14 +154,14 @@
TYPES);
}
- public static void leaveHelperOnServer(RMIAdaptor adaptor) throws Exception
+ public static void leaveHelperOnServer(MBeanServerConnection adaptor) throws Exception
{
adaptor.invoke(CacheHelper.OBJECT_NAME,
"setLeaveInstalledAfterShutdown",
new Object[0], new String[0]);
}
- public static void uninstallHelper(RMIAdaptor adaptor) throws Exception
+ public static void uninstallHelper(MBeanServerConnection adaptor) throws Exception
{
adaptor.invoke(CacheHelper.OBJECT_NAME,
"uninstall",
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java 2007-09-04 15:51:18 UTC (rev 65050)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java 2007-09-04 16:44:25 UTC (rev 65051)
@@ -23,15 +23,13 @@
import java.util.Set;
-import javax.management.ObjectName;
+import javax.management.MBeanServerConnection;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpState;
-import org.jboss.cache.Fqn;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.web.CacheHelper;
@@ -49,7 +47,7 @@
private static boolean deployed0 = true;
private static boolean deployed1 = true;
- private RMIAdaptor[] adaptors = null;
+ private MBeanServerConnection[] adaptors = null;
public ClusteredSingleSignOnUnitTestCase(String name)
{
@@ -274,7 +272,7 @@
assertEquals("node1 cache has no SSOs", 0, ssoIds.size());
}
- private Set getSSOIds(RMIAdaptor adaptor) throws Exception
+ private Set getSSOIds(MBeanServerConnection adaptor) throws Exception
{
return (Set) adaptor.invoke(CacheHelper.OBJECT_NAME, "getChildrenNames",
new Object[0], new String[0]);
More information about the jboss-cvs-commits
mailing list