[jboss-cvs] JBossAS SVN: r65056 - in branches/Branch_4_2/testsuite/src/main/org/jboss/test: cluster/jmx/test and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 4 14:22:33 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-09-04 14:22:33 -0400 (Tue, 04 Sep 2007)
New Revision: 65056
Modified:
branches/Branch_4_2/testsuite/src/main/org/jboss/test/JBossClusteredTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/JBossTestClusteredServices.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/jmx/test/HAInvokerUnitTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/BadStateTransferTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/JBAS4406UnitTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/FieldBasedTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/SessionTestUtil.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/UndeployTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/StatefulPassivationExpirationUnitTestCase.java
branches/Branch_4_2/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java
Log:
[JBAS-4663] Replace JBossClusteredTestCase usage of RMIAdaptor
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/JBossClusteredTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/JBossClusteredTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/JBossClusteredTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -23,7 +23,7 @@
import java.util.StringTokenizer;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import javax.management.MBeanServerConnection;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -61,7 +61,7 @@
}
- public RMIAdaptor[] getAdaptors() throws Exception
+ public MBeanServerConnection[] getAdaptors() throws Exception
{
return clusterServices.getAdaptors();
}
@@ -84,17 +84,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: branches/Branch_4_2/testsuite/src/main/org/jboss/test/JBossTestClusteredServices.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/JBossTestClusteredServices.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/JBossTestClusteredServices.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -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.
*
@@ -58,17 +57,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;
}
@@ -149,7 +148,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)
{
@@ -166,7 +165,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)
{
@@ -192,7 +191,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;
@@ -217,13 +216,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);
}
@@ -273,7 +272,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: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/jmx/test/HAInvokerUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/jmx/test/HAInvokerUnitTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/jmx/test/HAInvokerUnitTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -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.jmx.ha.HAServiceRemote;
@@ -103,7 +103,7 @@
protected void configureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
String warName = getDeploymentName();
if (!deployed0_)
{
@@ -123,7 +123,7 @@
protected void reconfigureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
if (!deployed1_)
{
deploy(adaptors[1], getDeploymentName());
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/BadStateTransferTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/BadStateTransferTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/BadStateTransferTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -22,11 +22,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.partition.BadHAPartitionStateException;
@@ -56,7 +56,7 @@
public void testFailedStateProvider() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
ObjectName partition = new ObjectName("jboss:service=BadProviderPartition");
@@ -81,7 +81,7 @@
public void testBadStateIntegration() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
ObjectName partition = new ObjectName("jboss:service=BadStatePartition");
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/JBAS4406UnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/JBAS4406UnitTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/JBAS4406UnitTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -23,11 +23,11 @@
import java.util.Set;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
/**
@@ -59,7 +59,7 @@
{
getLog().debug("testMBeanRegistration");
- RMIAdaptor[] adaptors = this.getAdaptors();
+ MBeanServerConnection[] adaptors = this.getAdaptors();
Set channelMBean = getChannelMBeans(adaptors[0]);
assertNotNull("Channel mbean registered", channelMBean);
@@ -95,7 +95,7 @@
getLog().debug("ok");
}
- protected void stopPartition(RMIAdaptor adaptor) throws Exception
+ protected void stopPartition(MBeanServerConnection adaptor) throws Exception
{
ObjectName partition = new ObjectName("jboss:service=JBAS4406Partition");
@@ -106,13 +106,13 @@
sleep(2000);
}
- protected Set getChannelMBeans(RMIAdaptor adaptor) throws Exception
+ protected Set getChannelMBeans(MBeanServerConnection adaptor) throws Exception
{
ObjectName on = new ObjectName("jboss.jgroups:type=channel,cluster=JBAS4406Partition");
return adaptor.queryNames(on, null);
}
- protected Set getProtocolMBeans(RMIAdaptor adaptor) throws Exception
+ protected Set getProtocolMBeans(MBeanServerConnection adaptor) throws Exception
{
ObjectName on = new ObjectName("jboss.jgroups:*,type=protocol,cluster=JBAS4406Partition");
return adaptor.queryNames(on, null);
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -24,13 +24,13 @@
import java.util.Properties;
import java.util.Set;
+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.testbean.interfaces.StatefulSessionHome;
import org.jboss.test.testbeancluster.interfaces.NodeAnswer;
@@ -65,7 +65,7 @@
{
getLog().debug("testStatefulBeanFailover");
- RMIAdaptor[] adaptors = this.getAdaptors();
+ MBeanServerConnection[] adaptors = this.getAdaptors();
Set channelMBean = getChannelMBeans(adaptors[0]);
assertNotNull("Channel mbean registered", channelMBean);
@@ -141,7 +141,7 @@
}
- protected void restartPartition(RMIAdaptor adaptor) throws Exception
+ protected void restartPartition(MBeanServerConnection adaptor) throws Exception
{
ObjectName partition = new ObjectName("jboss:service=DefaultPartition");
@@ -156,13 +156,13 @@
sleep(2000);
}
- protected Set getChannelMBeans(RMIAdaptor adaptor) throws Exception
+ protected Set getChannelMBeans(MBeanServerConnection adaptor) throws Exception
{
ObjectName on = new ObjectName("jboss.jgroups:type=channel,cluster=DefaultPartition");
return adaptor.queryNames(on, null);
}
- protected Set getProtocolMBeans(RMIAdaptor adaptor) throws Exception
+ protected Set getProtocolMBeans(MBeanServerConnection adaptor) throws Exception
{
ObjectName on = new ObjectName("jboss.jgroups:*,type=protocol,cluster=DefaultPartition");
return adaptor.queryNames(on, null);
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DRMTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -32,6 +32,7 @@
import java.util.Vector;
import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
import javax.management.MBeanServerFactory;
import javax.management.MBeanServerInvocationHandler;
import javax.management.Notification;
@@ -49,7 +50,6 @@
import org.jboss.ha.framework.interfaces.DistributedReplicantManager.ReplicantListener;
import org.jboss.ha.framework.server.DistributedReplicantManagerImpl;
import org.jboss.ha.framework.server.HAPartitionImpl;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.jmx.adaptor.rmi.RMIAdaptorExt;
import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
import org.jgroups.Channel;
@@ -536,7 +536,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: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/DistributedStateTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -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;
@@ -33,7 +35,6 @@
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.cluster.ds.IDistributedState;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.jmx.adaptor.rmi.RMIAdaptorExt;
import org.jboss.jmx.adaptor.rmi.RMINotificationListener;
@@ -73,7 +74,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: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/FieldBasedTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/FieldBasedTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/FieldBasedTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -21,10 +21,11 @@
*/
package org.jboss.test.cluster.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;
/**
@@ -84,7 +85,7 @@
sessionID = stripJvmRoute(sessionID);
String sessionFqn = "/JSESSION/localhost" + warName_ + sessionID;
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
// Get the session version from the cache
Object origVersion = SessionTestUtil.getSessionVersion(adaptors[0], sessionFqn);
@@ -149,7 +150,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);
@@ -225,7 +226,7 @@
// Modify the data, as that's the JSP that adds the language collection
makeGet(client, baseURL0_ + modifyUrl);
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
// Get the session version from the cache
Object origVersion = SessionTestUtil.getSessionVersion(adaptors[0], sessionFqn);
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -21,11 +21,11 @@
*/
package org.jboss.test.cluster.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: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/SessionTestUtil.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/SessionTestUtil.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/SessionTestUtil.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -24,11 +24,11 @@
import java.util.Iterator;
import java.util.Set;
+import javax.management.MBeanServerConnection;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import org.jboss.cache.Fqn;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
/**
* Utilities for session testing.
@@ -58,13 +58,13 @@
}
}
- public static Object getSessionVersion(RMIAdaptor adaptor, String sessionFqn) throws Exception
+ public static Object getSessionVersion(MBeanServerConnection adaptor, String sessionFqn) throws Exception
{
return adaptor.invoke(CACHE_OBJECT_NAME, "get", new Object[]
{sessionFqn, VERSION_KEY}, TYPES);
}
- public static Object getBuddySessionVersion(RMIAdaptor adaptor, String sessionFqn) throws Exception
+ public static Object getBuddySessionVersion(MBeanServerConnection adaptor, String sessionFqn) throws Exception
{
Object replVersion = null;
// Check in the buddy backup tree
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/SimpleTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -21,9 +21,10 @@
*/
package org.jboss.test.cluster.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;
/**
@@ -154,7 +155,7 @@
sleepThread(45000);
// Confirm 2nd session is gone from the distributed cache on node 0
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
assertEquals("Session gone from distributed cache for " + sessionFqn,
null,
SessionTestUtil.getSessionVersion(adaptors[0], sessionFqn));
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/StateTransferTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -25,6 +25,7 @@
import java.util.Iterator;
import java.util.Set;
+import javax.management.MBeanServerConnection;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
@@ -32,7 +33,6 @@
import org.apache.commons.httpclient.HttpClient;
import org.jboss.cache.Fqn;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossClusteredTestCase;
/**
@@ -71,8 +71,8 @@
protected String getUrlBase_;
private ObjectName warObjectName;
- private RMIAdaptor adaptor0_;
- private RMIAdaptor adaptor1_;
+ private MBeanServerConnection adaptor0_;
+ private MBeanServerConnection adaptor1_;
private String warFqn_;
/**
@@ -112,7 +112,7 @@
"j2eeType=WebModule,name=//localhost/" + getWarName();
warObjectName = new ObjectName(oname);
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
adaptor0_ = adaptors[0];
adaptor1_ = adaptors[1];
@@ -196,7 +196,7 @@
getLog().debug("Server0 has no cached sessions");
}
- private Set getSessionIds(RMIAdaptor adaptor) throws Exception
+ private Set getSessionIds(MBeanServerConnection adaptor) throws Exception
{
Set result = new HashSet();
Set s = (Set) adaptor.invoke(CACHE_OBJECT_NAME,
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/UndeployTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/UndeployTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/UndeployTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -21,10 +21,11 @@
*/
package org.jboss.test.cluster.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;
/**
@@ -121,7 +122,7 @@
protected void configureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
String warName = getWarName();
if (!deployed0_)
{
@@ -141,7 +142,7 @@
protected void reconfigureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
deploy(adaptors[1], getWarName());
deployed1_ = true;
Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -29,6 +29,7 @@
import java.util.Properties;
import java.util.Random;
+import javax.management.MBeanServerConnection;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -37,7 +38,6 @@
import junit.framework.TestSuite;
import org.apache.log4j.Logger;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.proxy.ejb.RetryInterceptor;
import org.jboss.test.JBossClusteredTestCase;
import org.jboss.test.testbean.interfaces.AComplexPK;
@@ -414,7 +414,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);
@@ -589,7 +589,7 @@
protected void configureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
if (!isDeployed0())
{
@@ -609,7 +609,7 @@
protected void reconfigureCluster() throws Exception
{
- RMIAdaptor[] adaptors = getAdaptors();
+ MBeanServerConnection[] adaptors = getAdaptors();
deploy(adaptors[1], "test-retry.ear");
setDeployed1(true);
@@ -661,7 +661,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: branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/StatefulPassivationExpirationUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/StatefulPassivationExpirationUnitTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/StatefulPassivationExpirationUnitTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -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.testbeancluster.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: branches/Branch_4_2/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java 2007-09-04 17:41:14 UTC (rev 65055)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/web/test/ClusteredSingleSignOnUnitTestCase.java 2007-09-04 18:22:33 UTC (rev 65056)
@@ -23,6 +23,7 @@
import java.util.Set;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import junit.framework.Test;
@@ -31,7 +32,6 @@
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;
@@ -48,7 +48,7 @@
private static boolean deployed0 = true;
private static boolean deployed1 = true;
- private RMIAdaptor[] adaptors = null;
+ private MBeanServerConnection[] adaptors = null;
public ClusteredSingleSignOnUnitTestCase(String name)
{
@@ -290,7 +290,7 @@
assertEquals("node1 cache has no SSOs", 0, ssoIds.size());
}
- private Set getSSOIds(RMIAdaptor adaptor) throws Exception
+ private Set getSSOIds(MBeanServerConnection adaptor) throws Exception
{
Fqn ssoRoot = new Fqn(new Object[] {"SSO"});
ObjectName oname = new ObjectName("jboss.cache:service=TomcatClusteringCache");
More information about the jboss-cvs-commits
mailing list