[jboss-cvs] JBoss Messaging SVN: r1760 - in branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging: jms/clustering tools tools/jmx/rmi
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Dec 10 20:05:16 EST 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-12-10 20:05:12 -0500 (Sun, 10 Dec 2006)
New Revision: 1760
Modified:
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/SimpleClusteringTest.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java
Log:
cleaned up server management interfaces by getting rid of unused 'sendNotification' flag on start()/stop()
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java 2006-12-11 00:57:43 UTC (rev 1759)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java 2006-12-11 01:05:12 UTC (rev 1760)
@@ -47,7 +47,7 @@
}
finally
{
- ServerManagement.stop(0, false);
+ ServerManagement.stop(0);
}
}
@@ -80,8 +80,8 @@
}
finally
{
- ServerManagement.stop(1, false);
- ServerManagement.stop(0, false);
+ ServerManagement.stop(1);
+ ServerManagement.stop(0);
}
}
@@ -137,9 +137,9 @@
}
finally
{
- ServerManagement.stop(3, false);
- ServerManagement.stop(1, false);
- ServerManagement.stop(0, false);
+ ServerManagement.stop(3);
+ ServerManagement.stop(1);
+ ServerManagement.stop(0);
}
}
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/SimpleClusteringTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/SimpleClusteringTest.java 2006-12-11 00:57:43 UTC (rev 1759)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/SimpleClusteringTest.java 2006-12-11 01:05:12 UTC (rev 1760)
@@ -56,7 +56,7 @@
// TODO - verify that the cluster formed correctly assertion
- ServerManagement.stop(3, false);
+ ServerManagement.stop(3);
}
/**
@@ -72,13 +72,13 @@
// We get the first node to programatically leave the cluster
- ServerManagement.stop(0, false);
+ ServerManagement.stop(0);
// TODO - verify that the cluster formed correctly assertion
// We get the last node to programatically leave the cluster
- ServerManagement.stop(2, false);
+ ServerManagement.stop(2);
}
@@ -91,7 +91,7 @@
// We get the first node to programatically leave the cluster
- ServerManagement.stop(0, false);
+ ServerManagement.stop(0);
// TODO - verify that the cluster formed correctly assertion
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2006-12-11 00:57:43 UTC (rev 1759)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2006-12-11 01:05:12 UTC (rev 1760)
@@ -166,16 +166,13 @@
public static synchronized void stop() throws Exception
{
- insureStarted();
-
- servers[0].stop();
+ stop(0);
}
- public static synchronized void stop(int index, boolean sendNotification) throws Exception
+ public static synchronized void stop(int index) throws Exception
{
insureStarted(index);
-
- servers[index].stop(sendNotification);
+ servers[index].stop();
}
public static synchronized void destroy() throws Exception
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2006-12-11 00:57:43 UTC (rev 1759)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2006-12-11 01:05:12 UTC (rev 1760)
@@ -147,11 +147,6 @@
public synchronized void stop() throws Exception
{
- stop(true);
- }
-
- public synchronized void stop(boolean sendNotification) throws Exception
- {
if (!isStarted())
{
return;
@@ -161,7 +156,7 @@
{
setEnvironmentServerIndex(serverIndex);
- stopServerPeer(sendNotification);
+ stopServerPeer();
log.debug("stopping service container");
@@ -392,11 +387,6 @@
public void stopServerPeer() throws Exception
{
- stopServerPeer(true);
- }
-
- public void stopServerPeer(boolean sendNotification) throws Exception
- {
try
{
// if we don't find a ServerPeer instance registered under the serverPeerObjectName
@@ -458,9 +448,6 @@
try
{
- //Huh?? Where's the method on the server peer???
- //sc.invoke(serverPeerObjectName, "stop", new Object[]{new Boolean(sendNotification)}, new String[]{"boolean"});
-
sc.invoke(serverPeerObjectName, "stop", new Object[0], new String[0]);
sc.invoke(serverPeerObjectName, "destroy", new Object[0], new String[0]);
sc.unregisterService(serverPeerObjectName);
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2006-12-11 00:57:43 UTC (rev 1759)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2006-12-11 01:05:12 UTC (rev 1760)
@@ -334,16 +334,9 @@
server.startServerPeer(serverPeerID, defaultQueueJNDIContext, defaultTopicJNDIContext, clustered);
}
- public void stop(boolean sendNotification) throws Exception
- {
- server.stop(sendNotification);
- namingDelegate.reset();
- }
-
public void stop() throws Exception
{
server.stop();
-
namingDelegate.reset();
}
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java 2006-12-11 00:57:43 UTC (rev 1759)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java 2006-12-11 01:05:12 UTC (rev 1760)
@@ -43,7 +43,6 @@
public interface Server extends Remote
{
void start(String containerConfig) throws Exception;
- void stop(boolean sendNotification) throws Exception;
void stop() throws Exception;
void destroy() throws Exception;
More information about the jboss-cvs-commits
mailing list