[jboss-cvs] JBoss Messaging SVN: r3445 - in branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging: jms and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 7 08:46:56 EST 2007
Author: ataylor
Date: 2007-12-07 08:46:56 -0500 (Fri, 07 Dec 2007)
New Revision: 3445
Modified:
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPostOfficeTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ClientInRestrictedSecurityEnvironmentTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/GracefulClient.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MemLeakTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageCleanupTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/QueueTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XATest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
Log:
fixed global search and replace
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPostOfficeTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPostOfficeTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPostOfficeTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -611,7 +611,7 @@
* c) verify all nodes get queue
* d) unbind - verify unbound from all nodes
* e) close down all nodes
- * f) startServerPeer all nodes
+ * f) start all nodes
* g) verify queue is not known
* */
@@ -876,10 +876,10 @@
public void testBindUnbindAll3() throws Throwable
{
- /* a) startServerPeer one node
+ /* a) start one node
* b) queue is not known to cluster
* c) bind all
- * d) startServerPeer other nodes
+ * d) start other nodes
* d) verify other nodes pick it up
*/
@@ -972,7 +972,7 @@
public void testBindUnbindAll4() throws Throwable
{
- /* a) startServerPeer one node
+ /* a) start one node
* b) queue is not known to cluster
* c) bind all
* d) shutdown all nodes
@@ -1074,11 +1074,11 @@
public void testBindUnbindAll5() throws Throwable
{
/*
- * a) startServerPeer one node
+ * a) start one node
* b) queue is not known
* c) bind all
* d) shutdown node
- * e) startServerPeer other nodes
+ * e) start other nodes
* f) verify queue is not known
* g) restart first node, verify queue is now known
* */
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/postoffice/PostOfficeTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -158,7 +158,7 @@
office2.stop();
- //Throw away office and startServerPeer another
+ //Throw away office and start another
office3 = createNonClusteredPostOffice();
//Make sure not there
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -73,7 +73,7 @@
try
{
- //localServer.startServerPeer("all", true);
+ //localServer.start("all", true);
deployQueue("Queue", null);
// lookup the connection factory and the queue which we'll send to the client VM via a
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ClientInRestrictedSecurityEnvironmentTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ClientInRestrictedSecurityEnvironmentTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ClientInRestrictedSecurityEnvironmentTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -88,7 +88,7 @@
// MessageProducer p = s.createProducer(queue);
// MessageConsumer c = s.createConsumer(queue);
//
-// conn.startServerPeer();
+// conn.start();
//
// p.send(s.createTextMessage("payload"));
//
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -283,7 +283,7 @@
MessageProducer prod = sessSend.createProducer(queue1);
- conn.startServerPeer();
+ conn.start();
for (int i = 0; i < numMessages; i++)
{
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -227,7 +227,7 @@
{
connection = cf.createConnection();
- //we startServerPeer the connection
+ //we startthe connection
connection.start();
// an attempt to set the client ID now should throw a IllegalStateException
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/GracefulClient.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/GracefulClient.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/GracefulClient.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -86,7 +86,7 @@
// }
// }
// }
-// }, "Spinner").startServerPeer();
+// }, "Spinner").start();
}
// Attributes -----------------------------------------------------------------------------------
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MemLeakTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MemLeakTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MemLeakTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -84,24 +84,6 @@
// TestCase overrides -------------------------------------------
- /*public void setUp() throws Exception
- {
- super.setUp();
-
- log.info("Setting up");
-
- log.info("starting sc");
- ServerManagement.startServerPeer("all");
- log.info("started serviceconatiner");
-
- log.debug("setup done");
- }*/
-
- /*public void tearDown() throws Exception {
- super.tearDown();
- ServerManagement.stopServerPeer();
-
- }*/
/** @todo I can't execute this test if executed with testExpressionParginMessages. That's why I renamed it. */
public void renamedtestNonTxSendReceiveNP() throws Exception
@@ -321,7 +303,7 @@
//
// log.info("Sent " + i);
//
-// conn.startServerPeer();
+// conn.start();
//
// MessageConsumer cons = sess.createConsumer(queue);
//
@@ -378,7 +360,7 @@
//
// }
//
-// conn.startServerPeer();
+// conn.start();
//
// MessageConsumer cons = sess.createConsumer(queue);
//
@@ -463,7 +445,7 @@
//
// sess.commit();
//
-// conn.startServerPeer();
+// conn.start();
//
// MessageConsumer cons = sess.createConsumer(queue);
//
@@ -560,7 +542,7 @@
//
// sess.commit();
//
-// conn.startServerPeer();
+// conn.start();
//
// MessageConsumer cons = sess.createConsumer(queue);
//
@@ -641,7 +623,7 @@
//
// }
//
-// conn.startServerPeer();
+// conn.start();
//
// MessageConsumer cons = sess.createConsumer(queue);
//
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageCleanupTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageCleanupTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageCleanupTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -238,7 +238,7 @@
sess.createConsumer(topic);
- //Don't startServerPeer the connection
+ //Don't start the connection
for (int i = 0; i < 150; i++)
{
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/QueueTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/QueueTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/QueueTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -176,7 +176,7 @@
Session s2 = conn2.createSession(true, Session.AUTO_ACKNOWLEDGE);
- // Create a consumer, startServerPeer the session, close the consumer..
+ // Create a consumer, start the session, close the consumer..
// This shouldn't cause any message to be lost
MessageConsumer c2 = s2.createConsumer(queue1);
conn2.start();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -73,13 +73,13 @@
{
super.setUp();
- // Now startServerPeer another remote server
- //ServerManagement.startServerPeer(1, "all", false);
+ // Now start another remote server
+ //ServerManagement.start(1, "all", false);
ResourceManagerFactory.instance.clear();
// We need a local transaction and recovery manager
- // We must startServerPeer this after the remote servers have been created or it
+ // We must start this after the remote servers have been created or it
// won't
// have deleted the database and the recovery manager may attempt to
// recover transactions
@@ -237,7 +237,7 @@
// Now restart the server
- //ServerManagement.startServerPeer(1, "all", false);
+ //ServerManagement.start(1, "all", false);
deployQueue("OtherQueue", 1);
@@ -394,7 +394,7 @@
// Now restart the server
- //ServerManagement.startServerPeer(1, "all", false);
+ //ServerManagement.start(1, "all", false);
deployQueue("OtherQueue");
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XATest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XATest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/XATest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -145,7 +145,7 @@
// Public --------------------------------------------------------
/* If there is no global tx present the send must behave as non transacted.
- * See http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577&postdays=0&postorder=asc&startServerPeer=0
+ * See http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577&postdays=0&postorder=asc&start=0
* http://jira.jboss.com/jira/browse/JBMESSAGING-410
* http://jira.jboss.com/jira/browse/JBMESSAGING-721
* http://jira.jboss.org/jira/browse/JBMESSAGING-946
@@ -213,7 +213,7 @@
*
* We are testing the exceptional case here without a global tx here
*
- * See http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577&postdays=0&postorder=asc&startServerPeer=0
+ * See http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577&postdays=0&postorder=asc&start=0
* http://jira.jboss.com/jira/browse/JBMESSAGING-410
* http://jira.jboss.com/jira/browse/JBMESSAGING-721
* http://jira.jboss.org/jira/browse/JBMESSAGING-946
@@ -320,7 +320,7 @@
*
* We are testing the standard case without a global tx here
*
- * See http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577&postdays=0&postorder=asc&startServerPeer=0
+ * See http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577&postdays=0&postorder=asc&start=0
* http://jira.jboss.com/jira/browse/JBMESSAGING-410
* http://jira.jboss.com/jira/browse/JBMESSAGING-721
* http://jira.jboss.org/jira/browse/JBMESSAGING-946
@@ -396,7 +396,7 @@
*
* We are testing the case with a global tx here
*
- * See http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577&postdays=0&postorder=asc&startServerPeer=0
+ * See http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577&postdays=0&postorder=asc&start=0
* http://jira.jboss.com/jira/browse/JBMESSAGING-410
* http://jira.jboss.com/jira/browse/JBMESSAGING-721
* http://jira.jboss.org/jira/browse/JBMESSAGING-946
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/bridge/BridgeMBeanTest.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -135,7 +135,7 @@
//Start it
log.info("Starting bridge");
- ServerManagement.getServer(0).invoke(on, "startServerPeer", new Object[0], new String[0]);
+ ServerManagement.getServer(0).invoke(on, "start", new Object[0], new String[0]);
log.info("Started bridge");
//Now should receive the messages
@@ -413,7 +413,7 @@
ServerManagement.setAttribute(on, "MaxRetries", "-1");
}
- ServerManagement.getServer(0).invoke(on, "startServerPeer", new Object[0], new String[0]);
+ ServerManagement.getServer(0).invoke(on, "start", new Object[0], new String[0]);
//Should not be able to change attributes when bridge is started - need to stopServerPeer first
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -90,13 +90,6 @@
return "true".equals(System.getProperty("test.clustered"));
}
- /**
- * May return null if the server is not initialized.
- */
- public synchronized static Server getServer()
- {
- return getServer(0);
- }
/**
* May return null if the corresponding server is not initialized.
@@ -106,10 +99,6 @@
return servers.get(i);
}
- public static synchronized Server create() throws Exception
- {
- return create(0);
- }
/**
* Makes sure that a "hollow" TestServer (either local or remote, depending on the nature of the
@@ -132,21 +121,6 @@
}
- /**
- * Will clear the database at startup.
- */
- /*public static void start(String config) throws Exception
- {
- start(0, config, true);
- }*/
-
- /**
- * Will clear the database at startup.
- */
- /*public static void start(int i, String config) throws Exception
- {
- start(i, config, true);
- }*/
public static void start(int i, String config, boolean clearDatabase) throws Exception
{
start(i, config, null, clearDatabase);
@@ -536,13 +510,13 @@
public static ObjectName deploy(String mbeanConfiguration) throws Exception
{
- insureStarted();
+
return servers.get(0).deploy(mbeanConfiguration);
}
public static void undeploy(ObjectName on) throws Exception
{
- insureStarted();
+
servers.get(0).undeploy(on);
}
@@ -554,7 +528,7 @@
public static Object getAttribute(int serverIndex, ObjectName on, String attribute)
throws Exception
{
- insureStarted(serverIndex);
+
return servers.get(serverIndex).getAttribute(on, attribute);
}
@@ -562,22 +536,22 @@
public static void setAttribute(ObjectName on, String name, String valueAsString)
throws Exception
{
- insureStarted();
+
servers.get(0).setAttribute(on, name, valueAsString);
}
public static Object invoke(ObjectName on, String operationName,
Object[] params, String[] signature) throws Exception
{
- insureStarted();
+
return servers.get(0).invoke(on, operationName, params, signature);
}
public static void addNotificationListener(int serverIndex, ObjectName on,
NotificationListener listener) throws Exception
{
- insureStarted(serverIndex);
+
if (isLocal())
{
// add the listener directly to the server
@@ -602,8 +576,8 @@
public static void removeNotificationListener(int serverIndex, ObjectName on,
NotificationListener listener) throws Exception
{
- insureStarted(serverIndex);
+
if (isLocal())
{
// remove the listener directly
@@ -637,7 +611,7 @@
*/
public static Server poisonTheServer(int serverIndex, int type) throws Exception
{
- insureStarted(serverIndex);
+
Server poisoned = servers.get(serverIndex);
//We set the server to null so it can be recreated again, but ONLY for those poisons that cause the server to get killed
@@ -655,7 +629,7 @@
public static UserTransaction getUserTransaction() throws Exception
{
- insureStarted();
+
return servers.get(0).getUserTransaction();
}
@@ -713,26 +687,26 @@
String defaultTopicJNDIContext,
ServiceAttributeOverrides attrOverrids) throws Exception
{
- insureStarted();
+
servers.get(0).startServerPeer(serverPeerID, defaultQueueJNDIContext,
defaultTopicJNDIContext, attrOverrids, false);
}
public static void stopServerPeer() throws Exception
{
- insureStarted();
+
servers.get(0).stopServerPeer();
}
public static boolean isServerPeerStarted() throws Exception
{
- insureStarted();
+
return servers.get(0).isServerPeerStarted();
}
public static ObjectName getServerPeerObjectName() throws Exception
{
- insureStarted();
+
return servers.get(0).getServerPeerObjectName();
}
@@ -742,7 +716,7 @@
*/
public static Set getConnectorSubsystems() throws Exception
{
- insureStarted();
+
return servers.get(0).getConnectorSubsystems();
}
@@ -753,7 +727,7 @@
public static void addServerInvocationHandler(String subsystem,
ServerInvocationHandler handler) throws Exception
{
- insureStarted();
+
servers.get(0).addServerInvocationHandler(subsystem, handler);
}
@@ -764,27 +738,27 @@
public static void removeServerInvocationHandler(String subsystem)
throws Exception
{
- insureStarted();
+
servers.get(0).removeServerInvocationHandler(subsystem);
}
public static MessageStore getMessageStore() throws Exception
{
- insureStarted();
+
return servers.get(0).getMessageStore();
}
public static DestinationManager getDestinationManager()
throws Exception
{
- insureStarted();
+
return servers.get(0).getDestinationManager();
}
public static PersistenceManager getPersistenceManager()
throws Exception
{
- insureStarted();
+
return servers.get(0).getPersistenceManager();
}
@@ -797,264 +771,21 @@
public static void configureSecurityForDestination(int serverID, String destName, String config)
throws Exception
{
- insureStarted(serverID);
//servers.get(0).configureSecurityForDestination(destName, config);
}
public static void setDefaultSecurityConfig(String config) throws Exception
{
- insureStarted();
+
servers.get(0).setDefaultSecurityConfig(config);
}
public static String getDefaultSecurityConfig() throws Exception
{
- insureStarted();
+
return servers.get(0).getDefaultSecurityConfig();
}
- /**
- * Simulates a topic deployment (copying the topic descriptor in the deploy directory).
- */
- /*public static void deployTopic(String name, int serverIndex) throws Exception
- {
- insureStarted(serverIndex);
- servers.get(serverIndex).deployTopic(name, null, true);
- }
-*/
- /**
- * Simulates a topic deployment (copying the topic descriptor in the deploy directory).
- */
- /*public static void deployTopic(String name) throws Exception
- {
- deployTopic(name, null);
- }*/
-
- /**
- * Simulates a topic deployment (copying the topic descriptor in the deploy directory).
- */
- /*public static void deployTopic(String name, String jndiName) throws Exception
- {
- insureStarted();
- getJmsServer(0).deployTopic(name, jndiName);
- //servers[0].getServer().deployTopic(name, jndiName, false);
- }*/
-
- /**
- * Simulates a topic deployment (copying the topic descriptor in the deploy directory).
- */
- /*public static void deployTopic(String name, int fullSize, int pageSize, int downCacheSize)
- throws Exception
- {
- deployTopic(name, null, fullSize, pageSize, downCacheSize);
- }*/
-
- /**
- * Simulates a topic deployment (copying the topic descriptor in the deploy directory).
- */
- /*public static void deployTopic(String name, String jndiName, int fullSize, int pageSize,
- int downCacheSize) throws Exception
- {
- insureStarted();
- servers.get(0).deployTopic(name, jndiName, fullSize, pageSize, downCacheSize, false);
- }*/
-
- /*public static void deployTopic(String name, String jndiName, int fullSize, int pageSize,
- int downCacheSize, int serverIndex, boolean clustered) throws Exception
- {
- insureStarted();
- servers.get(0).deployTopic(name, jndiName, fullSize, pageSize, downCacheSize, clustered);
- }*/
-
- /**
- * Simulates a topic un-deployment (deleting the topic descriptor from the deploy directory).
- */
- /*public static void undeployTopic(String name) throws Exception
- {
- undeployDestination(false, name);
- }*/
-
- /**
- * Simulates a topic un-deployment (deleting the topic descriptor from the deploy directory).
- */
- /*public static void undeployTopic(String name, int serverIndex) throws Exception
- {
- undeployDestination(false, name, serverIndex);
- }*/
-
- /**
- * Creates a topic programatically.
- */
- /*public static void createTopic(String name, String jndiName) throws Exception
- {
- insureStarted();
- servers.get(0).deployTopicProgrammatically(name, jndiName);
- }*/
-
- /**
- * Destroys a programatically created topic.
- */
- /*public static boolean destroyTopic(String name) throws Exception
- {
- return servers.get(0).undeployDestinationProgrammatically(false, name);
- }*/
-
- /**
- * Simulates a queue deployment (copying the queue descriptor in the deploy directory).
- */
- /*public static void deployQueue(String name, int serverIndex) throws Exception
- {
- insureStarted(serverIndex);
- *//*servers[serverIndex].getServer().deployQueue(name, null, true);*//*
- getJmsServer(serverIndex).deployQueue(name, null);
- }*/
-
- /**
- * Simulates a queue deployment (copying the queue descriptor in the deploy directory).
- */
- /*public static void deployQueue(String name) throws Exception
- {
- deployQueue(name, null);
- }*/
-
- /**
- * Simulates a queue deployment (copying the queue descriptor in the deploy directory).
- */
- /*public static void deployQueue(String name, String jndiName) throws Exception
- {
- insureStarted();
- servers.get(0).deployQueue(name, jndiName, false);
- }*/
-
- /**
- * Simulates a queue deployment (copying the queue descriptor in the deploy directory).
- */
- /*public static void deployQueue(String name, int fullSize, int pageSize, int downCacheSize)
- throws Exception
- {
- deployQueue(name, null, fullSize, pageSize, downCacheSize);
- }*/
-
- /**
- * Simulates a queue deployment (copying the queue descriptor in the deploy directory).
- */
- /*public static void deployQueue(String name, String jndiName, int fullSize, int pageSize,
- int downCacheSize) throws Exception
- {
- insureStarted();
- servers.get(0).deployQueue(name, jndiName, fullSize, pageSize, downCacheSize, false);
- }*/
-
- /**
- * Simulates a queue deployment (copying the queue descriptor in the deploy directory).
- */
- /*public static void deployQueue(String name, String jndiName, int fullSize, int pageSize,
- int downCacheSize, int serverIndex, boolean clustered)
- throws Exception
- {
- insureStarted();
- servers.get(0).
- deployQueue(name, jndiName, fullSize, pageSize, downCacheSize, clustered);
- }*/
-
- /**
- * Simulates a queue un-deployment (deleting the queue descriptor from the deploy directory).
- */
- /*public static void undeployQueue(String name) throws Exception
- {
- undeployDestination(true, name);
- }*/
-
- /**
- * Simulates a queue un-deployment (deleting the queue descriptor from the deploy directory).
- */
- /*public static void undeployQueue(String name, int serverIndex) throws Exception
- {
- undeployDestination(true, name, serverIndex);
- }*/
-
- /**
- * Creates a queue programatically.
- */
- /*public static void createQueue(String name, String jndiName) throws Exception
- {
- insureStarted();
- servers.get(0).deployQueueProgrammatically(name, jndiName);
- }*/
-
- /**
- * Destroys a programatically created queue.
- */
- /*public static boolean destroyQueue(String name) throws Exception
- {
- return servers.get(0).undeployDestinationProgrammatically(true, name);
- }*/
-
- /**
- * Simulates a destination un-deployment (deleting the destination descriptor from the deploy
- * directory).
- */
- /*private static void undeployDestination(boolean isQueue, String name) throws Exception
- {
- insureStarted();
- servers.get(0).undeployDestination(isQueue, name);
- }*/
-
- /**
- * Simulates a destination un-deployment (deleting the destination descriptor from the deploy
- * directory).
- */
- /*private static void undeployDestination(boolean isQueue, String name, int serverIndex)
- throws Exception
- {
- insureStarted(serverIndex);
- servers.get(serverIndex).undeployDestination(isQueue, name);
- }*/
-
- /*public static void deployConnectionFactory(String objectName,
- String[] jndiBindings,
- int prefetchSize,
- int defaultTempQueueFullSize,
- int defaultTempQueuePageSize,
- int defaultTempQueueDownCacheSize)
- throws Exception
- {
- servers.get(0).deployConnectionFactory(objectName,
- jndiBindings,
- prefetchSize,
- defaultTempQueueFullSize,
- defaultTempQueuePageSize,
- defaultTempQueueDownCacheSize);
- }*/
-
- /*public static void deployConnectionFactory(String objectName,
- String[] jndiBindings,
- boolean supportsFailover, boolean supportsLoadBalancing)
- throws Exception
- {
- servers.get(0).deployConnectionFactory(objectName,
- jndiBindings,supportsFailover, supportsLoadBalancing);
- }*/
-
- /*public static void deployConnectionFactory(String objectName,
- String[] jndiBindings,
- int prefetchSize)
- throws Exception
- {
- servers.get(0).deployConnectionFactory(objectName, jndiBindings, prefetchSize);
- }*/
-
- /*public static void deployConnectionFactory(String objectName,
- String[] jndiBindings)
- throws Exception
- {
- servers.get(0).deployConnectionFactory(objectName, jndiBindings);
- }*/
-
- /*public static void undeployConnectionFactory(ObjectName objectName) throws Exception
- {
- //servers.get(0).undeployConnectionFactory(objectName);
- }*/
public static Hashtable getJNDIEnvironment()
{
return getJNDIEnvironment(0);
@@ -1135,24 +866,7 @@
// Private -------------------------------------------------------
- private static void insureStarted() throws Exception
- {
- insureStarted(0);
- }
- private static void insureStarted(int i) throws Exception
- {
- /*if (servers[i] == null)
- {
- throw new Exception("Server " + i + " has not been created!");
- }
-
- if (!servers[i].getServer().isStarted())
- {
- throw new Exception("Server " + i + " has not been started!");
- }*/
- }
-
private static JmsServer getJmsServer(int id)
{
try
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2007-12-07 12:13:13 UTC (rev 3444)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2007-12-07 13:46:56 UTC (rev 3445)
@@ -127,47 +127,13 @@
}
ConfigurationHelper.addServerConfig(getServerID(), configuration);
- Properties props = new Properties();
JBMPropertyKernelConfig propertyKernelConfig = new JBMPropertyKernelConfig(System.getProperties());
propertyKernelConfig.setServerID(getServerID());
bootstrap = new JBMBootstrapServer(containerConfig, propertyKernelConfig);
System.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, ""+getServerID());
bootstrap.run();
started = true;
- //runner = new Thread(this, "server" + getServerID());
- //runner.startServerPeer();
- //this.wait();
- /*log.debug("starting service container");
-
- try
- {
- setEnvironmentServerIndex(serverIndex);
-
- sc = new ServiceContainer(containerConfig, null, serverIndex);
- sc.startServerPeer(clearDatabase, attrOverrides);
-
- if (sc.getDatabaseName().equals("hsqldb") && sc.isClustered())
- {
- throw new IllegalStateException("The test server cannot be started in clustered mode with hsqldb as a database - must use a shared database");
- }
-
- if ("none".equals(containerConfig))
- {
- return;
- }
-
- if (startMessagingServer)
- {
- startServerPeer(serverIndex, null, null, attrOverrides, sc.isClustered());
- }
-
- log.info("Server " + serverIndex + " started");
- }
- finally
- {
- clearEnvironmentServerIndex();
- }*/
}
protected void deleteAllData() throws Exception
More information about the jboss-cvs-commits
mailing list