[jboss-cvs] JBoss Messaging SVN: r3441 - in branches/Branch_MC_Integration_New: src/main/org/jboss/jms/client/container and 24 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 7 03:35:24 EST 2007
Author: ataylor
Date: 2007-12-07 03:35:24 -0500 (Fri, 07 Dec 2007)
New Revision: 3441
Modified:
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/client/FailoverCommandCenter.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/client/container/SessionAspect.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/delegate/ConnectionDelegate.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Configuration.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/ServerPeer.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/ServerPeerStatistics.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/Bridge.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/BridgeService.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
branches/Branch_MC_Integration_New/src/main/org/jboss/jms/tx/MessagingXAResource.java
branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/FailoverWaiter.java
branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java
branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/MessagingTestCase.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/RoundRobinDistributorTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/manual/FailoverTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/ManyConnectionsStressTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/RelayStressTest.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/Example.java
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/ServiceContainer.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/util/JNDIUtilTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/InvokerReferenceCountTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/SocketTransportCausalityTest.java
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemService.java
Log:
fixed search and replace
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/client/FailoverCommandCenter.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/client/FailoverCommandCenter.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/client/FailoverCommandCenter.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -146,11 +146,11 @@
log.trace("Synchronized state");
//Now restart the connection if appropriate
- //Note! we mus startServerPeer the connection while the valve is still closed
+ //Note! we mus start the connection while the valve is still closed
//Otherwise If a consumer closing is waiting on failover to complete
//Then on failover complete the valve will be opened and closing retried on a
//different thread
- //but the next line will re-startServerPeer the connection so there is a race between the two
+ //but the next line will re-startthe connection so there is a race between the two
//If the restart hits after closing then messages can get delivered after consumer
//is closed
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/client/container/SessionAspect.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/client/container/SessionAspect.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -575,7 +575,7 @@
}
finally
{
- // startServerPeer new local tx
+ // startnew local tx
Object xid = rm.createLocalTx();
state.setCurrentTxId(xid);
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/delegate/ConnectionDelegate.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/delegate/ConnectionDelegate.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/delegate/ConnectionDelegate.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -54,7 +54,7 @@
boolean unregisterFailoverListener(FailoverListener failoverListener);
- //Special startServerPeer method that doesn't get intercepted to allow connection to be restarted
+ //Special start method that doesn't get intercepted to allow connection to be restarted
//after failover when the valve is still held
void startAfterFailover() throws JMSException;
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Configuration.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Configuration.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/Configuration.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -121,7 +121,7 @@
_defaultExpiryQueue = getString(e, "default-expiry-queue", _defaultExpiryQueue);
_defaultRedeliveryDelay = getLong(e, "default-redelivery-delay", _defaultRedeliveryDelay);
_messageCounterSamplePeriod = getLong(e, "message-counter-sample-period", _messageCounterSamplePeriod);
- _failoverStartTimeout = getLong(e, "failover-startServerPeer-timeout", _failoverStartTimeout);
+ _failoverStartTimeout = getLong(e, "failover-start-timeout", _failoverStartTimeout);
_failoverCompleteTimeout = getLong(e, "failover-complete-timeout", _failoverCompleteTimeout);
_defaultMessageCounterHistoryDayLimit = getInteger(e, "default-message-counter-history-day-limit", _defaultMessageCounterHistoryDayLimit);
_clusterPullConnectionFactoryName = getString(e, "cluster-pull-connection-factory-name", _clusterPullConnectionFactoryName);
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/ServerPeer.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/ServerPeer.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -240,7 +240,7 @@
txRepository.start();
clusterConnectionManager.start();
- // Note we do not startServerPeer the message counter manager by default. This must be done
+ // Note we do not start the message counter manager by default. This must be done
// explicitly by the user by calling enableMessageCounters(). This is because message
// counter history takes up growing memory to store the stats and could theoretically
// eventually cause the server to run out of RAM
@@ -250,8 +250,8 @@
JMSWireFormat wf = new JMSWireFormat();
MarshalFactory.addMarshaller("jms", wf, wf);
- //Now everything is started we can tell the invocation handler to startServerPeer handling invocations
- //We do this right at the end otherwise it can startServerPeer handling invocations before we are properly started
+ //Now everything is started we can tell the invocation handler to start handling invocations
+ //We do this right at the end otherwise it can start handling invocations before we are properly started
JMSServerInvocationHandler.setClosed(false);
if (configuration.isClustered())
@@ -330,7 +330,7 @@
memoryManager.stop();
memoryManager = null;
securityStore.stop();
- //securityStore = null; - if securitySTore is set to null, The ServerPeer won't survive a restart of the service (stopServerPeer/startServerPeer)
+ //securityStore = null; - if securitySTore is set to null, The ServerPeer won't survive a restart of the service (stopServerPeer/start)
txRepository.stop();
txRepository = null;
messageCounterManager.stop();
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/ServerPeerStatistics.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/ServerPeerStatistics.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/ServerPeerStatistics.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -369,7 +369,7 @@
}
else
{
- // startServerPeer new destination data
+ // startnew destination data
if (strDestLast != null)
{
// store last destination data string
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/Bridge.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/Bridge.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/Bridge.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -267,7 +267,7 @@
{
if (started)
{
- log.warn("Attempt to startServerPeer, but is already started");
+ log.warn("Attempt to start, but is already started");
return;
}
@@ -298,7 +298,7 @@
if (ok)
{
- //startServerPeer the source connection
+ //start the source connection
sourceConn.start();
@@ -323,7 +323,7 @@
}
else
{
- log.warn("Failed to startServerPeer bridge");
+ log.warn("Failed to start bridge");
handleFailureOnStartup();
}
}
@@ -865,7 +865,7 @@
* -------------------------------------
* If the source and target destinations are on a different servers (different resource managers) then:
*
- * If desired QoS is QOS_ONCE_AND_ONLY_ONCE, then we startServerPeer a JTA transaction and enlist the consuming and sending
+ * If desired QoS is QOS_ONCE_AND_ONLY_ONCE, then we start a JTA transaction and enlist the consuming and sending
* XAResources in that.
*
* If desired QoS is QOS_DUPLICATES_OK then, we use CLIENT_ACKNOWLEDGE for the consuming session and
@@ -1214,7 +1214,7 @@
{
sendMessages();
- //Commit the JTA transaction and startServerPeer another
+ //Commit the JTA transaction and start another
delistResources(tx);
@@ -1339,9 +1339,9 @@
{
failed = true;
- //Failure must be handled on a separate thread to the calling thread (either onMessage or startServerPeer).
+ //Failure must be handled on a separate thread to the calling thread (either onMessage or start).
//In the case of onMessage we can't close the connection from inside the onMessage method
- //since it will block waiting for onMessage to complete. In the case of startServerPeer we want to return
+ //since it will block waiting for onMessage to complete. In the case of start we want to return
//from the call before the connections are reestablished so that the caller is not blocked unnecessarily.
Thread t = new Thread(failureHandler);
@@ -1439,7 +1439,7 @@
}
catch (JMSException e)
{
- log.error("Failed to startServerPeer source connection", e);
+ log.error("Failed to start source connection", e);
}
}
@@ -1528,7 +1528,7 @@
}
catch (JMSException e)
{
- log.error("Failed to startServerPeer source connection", e);
+ log.error("Failed to start source connection", e);
}
}
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/BridgeService.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/BridgeService.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/bridge/BridgeService.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -342,7 +342,7 @@
bridge.setTargetDestinationFactory(targetDestinationFactory);
- bridge.startServerPeer();
+ bridge.start();
log.info("Started bridge " + this.getName() + ". Source: " + sourceDestinationLookup + " Target: " + targetDestinationLookup);*/
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -261,7 +261,7 @@
}
catch (Exception e)
{
- log.error("Failed to process failover startServerPeer", e);
+ log.error("Failed to process failover start", e);
}
}
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -320,7 +320,7 @@
}
catch (Throwable t)
{
- throw ExceptionUtil.handleJMSInvocation(t, this + " startServerPeer");
+ throw ExceptionUtil.handleJMSInvocation(t, this + " start");
}
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -138,7 +138,7 @@
this.maxDeliveryAttempts = maxDeliveryAttempts;
- // Always startServerPeer as false - wait for consumer to initiate.
+ // Always start as false - wait for consumer to initiate.
this.clientAccepting = false;
this.remote = remote;
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -982,7 +982,7 @@
//This is ok - may happen at failover
// This can happen when the failover node is being changed
- // E.g. failover node changes, replicates startServerPeer getting sent to the new failover node,
+ // E.g. failover node changes, replicates start getting sent to the new failover node,
// then the new node requests to collect the deliveries from this node, at which point we deliver
// all waiting deliveries. Then the responses to the original ones come back.
// So we can ignore them
@@ -1023,7 +1023,7 @@
if (!delivered)
{
// Response has come back out of order - this can happen when the failover node is being changed
- // E.g. failover node changes, replicates startServerPeer getting sent to the new failover node,
+ // E.g. failover node changes, replicates start getting sent to the new failover node,
// then the new node requests to collect the deliveries from this node, at which point we deliver
// all waiting deliveries. Then the responses to the original ones come back.
// So we can ignore them
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/tx/MessagingXAResource.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/tx/MessagingXAResource.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/tx/MessagingXAResource.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -152,7 +152,7 @@
if (convertTx)
{
// If I commit/rollback the tx, then there is a short period of time between the
- // AS (or whoever) calling commit on the tx and calling startServerPeer to enrolling the
+ // AS (or whoever) calling commit on the tx and calling start to enrolling the
// session in a new tx. If the session has any listeners then in that period,
// messages can be received asychronously but we want them to be received in the
// context of a tx, so we convert.
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/ChannelSupport.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/ChannelSupport.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -231,7 +231,7 @@
}
/*
- * This method clears the channel. t
+ * This method clears the channel.
* Basically it consumes the rest of the messages in the channel.
* We can't just delete the corresponding references directly from the database since
* a) We might be paging
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/FailoverWaiter.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/FailoverWaiter.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/FailoverWaiter.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -79,7 +79,7 @@
// TODO deal with multiple failover cascades
- //First wait for failover to startServerPeer
+ //First wait for failover to start
synchronized (failoverStatusLock)
{
long startToWait = failoverStartTimeout;
@@ -89,7 +89,7 @@
long start = System.currentTimeMillis();
try
{
- log.debug(this + " blocking on the failover lock, waiting for failover to startServerPeer");
+ log.debug(this + " blocking on the failover lock, waiting for failover to start");
failoverStatusLock.wait(startToWait);
log.debug(this + " releasing the failover lock, checking again whether failover started ...");
}
@@ -102,7 +102,7 @@
if (failingOverFor != failedNodeID && failedOverFor != failedNodeID)
{
//Timed out
- log.debug("Timed out waiting for failover to startServerPeer");
+ log.debug("Timed out waiting for failover to start");
return -1;
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/MessagingQueue.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/MessagingQueue.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -494,7 +494,7 @@
{
if (trace) { log.trace("Informing suckers"); }
//The receivers are still ready for more messages but there is nothing left in the local queue
- //so we inform the message suckers to startServerPeer consuming (if they aren't already)
+ //so we inform the message suckers to start consuming (if they aren't already)
informSuckers(true);
}
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -417,7 +417,7 @@
}
catch (Exception e)
{
- log.error("Failed to startServerPeer connection info ", e);
+ log.error("Failed to start connection info ", e);
}
}
}
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -141,7 +141,7 @@
//The first thing that happens after connect is a view change arrives
//Then the state will arrive (if we are not the first member)
- //Then the control messages will startServerPeer arriving.
+ //Then the control messages will start arriving.
//We can guarantee that messages won't arrive until after the state is set because we use
//the FLUSH protocol on the control channel
Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -245,7 +245,7 @@
//Sanity check - we check there aren't any other nodes already in the cluster with the same node id
if (knowAboutNodeId(configuration.getServerPeerID()))
{
- throw new IllegalArgumentException("Cannot startServerPeer post office since there is already a post office in the " +
+ throw new IllegalArgumentException("Cannot start post office since there is already a post office in the " +
"cluster with the same node id (" + configuration.getServerPeerID() + "). " +
"Are you sure you have given each node a unique node id during installation?");
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/MessagingTestCase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/MessagingTestCase.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/MessagingTestCase.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -92,7 +92,7 @@
if (isRemote())
{
- // log the test startServerPeer in the remote log, this will make hunting through logs so much easier
+ // log the test start in the remote log, this will make hunting through logs so much easier
ServerManagement.log(ServerManagement.INFO, banner);
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -85,7 +85,7 @@
groupName, jChannelFactory,
stateTimeout, castTimeout, true, 100);
- postOffice.startServerPeer();
+ postOffice.start();
*/
return null;//postOffice;
}
@@ -104,7 +104,7 @@
sc.getPostOfficeSQLProperties(),
true, 1, "NonClustered", ms, pm, tr, ff, cf, idm, cn);
- postOffice.startServerPeer();
+ postOffice.start();
return postOffice;*/ return null;
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/RoundRobinDistributorTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/RoundRobinDistributorTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/core/RoundRobinDistributorTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -429,7 +429,7 @@
}
}, "Message sending thread");
- // startServerPeer the sending tread, which will immediately grab the router's "receivers" lock, and it
+ // start the sending tread, which will immediately grab the router's "receivers" lock, and it
// will sleep for 3 seconds before attempting to grab LockingReceiver's lock.
t.start();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -74,9 +74,9 @@
{
//Start the servers
- //ServerManagement.startServerPeer(0, "all", true);
+ //ServerManagement.start(0, "all", true);
- //ServerManagement.startServerPeer(1, "all", false);
+ //ServerManagement.start(1, "all", false);
deployQueue("sourceQueue", 0);
@@ -89,7 +89,7 @@
setUpAdministeredObjects();
//We need a local transaction and recovery manager
- //We must startServerPeer this after the remote servers have been created or it won't
+ //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
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -108,7 +108,7 @@
// // Using a separate block, as everything on this block has to be released (no references from the method)
// {
// Connection conn = cf.createConnection();
-// conn.startServerPeer();
+// conn.start();
// Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
// MessageProducer prod = session.createProducer(queue[0]);
// MessageConsumer cons = session.createConsumer(queue[0]);
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -703,7 +703,7 @@
msgs.clear();
- //as above but startServerPeer consumers AFTER sending
+ //as above but start consumers AFTER sending
cons1.close();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -267,7 +267,7 @@
MessageConsumer cons = session.createConsumer(queue[1]);
MessageProducer prod = session.createProducer(queue[1]);
- // startServerPeer the connection, so the message makes it to the client-side MessageCallbackHandler
+ // start the connection, so the message makes it to the client-side MessageCallbackHandler
// buffer
conn.start();
@@ -1168,7 +1168,7 @@
}
}
- // startServerPeer to receive the very next moment the failure is detected. This way, we also
+ // start to receive the very next moment the failure is detected. This way, we also
// test the client-side failover valve
TextMessage tm = (TextMessage)cons.receive(60000);
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -44,7 +44,7 @@
{
try
{
- //ServerManagement.startServerPeer(0, "all");
+ //ServerManagement.start(0, "all");
Set view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(1, view.size());
@@ -63,13 +63,13 @@
try
{
- //ServerManagement.startServerPeer(0, "all");
+ //ServerManagement.start(0, "all");
log.info("Started server 0");
ServerManagement.addNotificationListener(0, postOfficeObjectName, listener);
- //ServerManagement.startServerPeer(1, "all");
+ //ServerManagement.start(1, "all");
log.info("Blocking to receive notification ...");
@@ -95,13 +95,13 @@
{
try
{
- //ServerManagement.startServerPeer(0, "all");
+ //ServerManagement.start(0, "all");
Set view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(1, view.size());
assertTrue(view.contains(new Integer(0)));
- //ServerManagement.startServerPeer(1, "all");
+ //ServerManagement.start(1, "all");
view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(2, view.size());
@@ -125,13 +125,13 @@
{
try
{
- //ServerManagement.startServerPeer(0, "all");
+ //ServerManagement.start(0, "all");
Set view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(1, view.size());
assertTrue(view.contains(new Integer(0)));
- //ServerManagement.startServerPeer(1, "all");
+ //ServerManagement.start(1, "all");
view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(2, view.size());
@@ -143,7 +143,7 @@
assertTrue(view.contains(new Integer(0)));
assertTrue(view.contains(new Integer(1)));
- //ServerManagement.startServerPeer(3, "all");
+ //ServerManagement.start(3, "all");
view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(3, view.size());
@@ -176,9 +176,9 @@
{
try
{
- //ServerManagement.startServerPeer(0, "all");
- //ServerManagement.startServerPeer(1, "all");
- //ServerManagement.startServerPeer(2, "all");
+ //ServerManagement.start(0, "all");
+ //ServerManagement.start(1, "all");
+ //ServerManagement.start(2, "all");
Set view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(3, view.size());
@@ -203,9 +203,9 @@
assertEquals(1, view.size());
assertTrue(view.contains(new Integer(1)));
- // Reuse the "hollow" RMI server 0 to startServerPeer another cluster node
+ // Reuse the "hollow" RMI server 0 to start another cluster node
- //ServerManagement.startServerPeer(0, "all");
+ //ServerManagement.start(0, "all");
view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(2, view.size());
@@ -213,9 +213,9 @@
assertTrue(view.contains(new Integer(1)));
- // Reuse the "hollow" RMI server 2 to startServerPeer another cluster node
+ // Reuse the "hollow" RMI server 2 to start another cluster node
- //ServerManagement.startServerPeer(2, "all");
+ //ServerManagement.start(2, "all");
view = ServerManagement.getServer(2).getNodeIDView();
assertEquals(3, view.size());
@@ -241,8 +241,8 @@
{
// Start with a 2 node cluster
- //ServerManagement.startServerPeer(0, "all");
- //ServerManagement.startServerPeer(1, "all");
+ //ServerManagement.start(0, "all");
+ //ServerManagement.start(1, "all");
Set view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(2, view.size());
@@ -287,9 +287,9 @@
{
// Start with a 3 node cluster
- //ServerManagement.startServerPeer(0, "all");
- //ServerManagement.startServerPeer(1, "all");
- //ServerManagement.startServerPeer(2, "all");
+ //ServerManagement.start(0, "all");
+ //ServerManagement.start(1, "all");
+ //ServerManagement.start(2, "all");
Set view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(3, view.size());
@@ -362,7 +362,7 @@
{
// Start with a 1 node cluster
- //ServerManagement.startServerPeer(0, "all");
+ //ServerManagement.start(0, "all");
Set view = ServerManagement.getServer(0).getNodeIDView();
assertEquals(1, view.size());
@@ -370,8 +370,8 @@
ServerManagement.addNotificationListener(0, postOfficeObjectName, clusterEvent);
- // startServerPeer the ninth node, as there is no chance to be started by scripts
- //ServerManagement.startServerPeer(9, "all");
+ // start the ninth node, as there is no chance to be started by scripts
+ //ServerManagement.start(9, "all");
if (!clusterEvent.viewChanged(30000))
{
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -63,7 +63,7 @@
ServerManagement.addNotificationListener(4, postOfficeObjectName, clusterEvent);
- // We startServerPeer programatically the eighth node.
+ // We start programatically the eighth node.
ServerManagement.start(7, "all", false);
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -179,12 +179,12 @@
// // poison the server
// ServerManagement.poisonTheServer(1, PoisonInterceptor.FAIL_SYNCHRONIZED_SEND_RECEIVE);
//
-// conn1.startServerPeer();
+// conn1.start();
//
// Session sessionConsumer2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
//
// MessageConsumer consumer2 = sessionConsumer2.createConsumer(queue[0]);
-// conn2.startServerPeer();
+// conn2.start();
//
// final Session sessionProducer = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
//
@@ -235,9 +235,9 @@
// }
// };
//
-// t2.startServerPeer();
+// t2.start();
// Thread.sleep(500);
-// t1.startServerPeer();
+// t1.start();
//
// t1.join();
// t2.join();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/crash/ClientCrashTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -79,7 +79,7 @@
localServer.start(getContainerConfig(), getConfiguration(), false);
// Start all the services locally
- //localServer.startServerPeer("all", true);
+ //localServer.start("all", true);
// This crash test is relying on a precise value of LeaseInterval, so we don't rely on
// the default, whatever that is ...
@@ -88,7 +88,7 @@
localServer.deployTopic("Topic", null, false);
- // Connect to the remote server, but don't startServerPeer a servicecontainer on it. We are only using
+ // Connect to the remote server, but don't start a servicecontainer on it. We are only using
// the remote server to open a client connection to the local server.
//ServerManagement.create();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/manual/FailoverTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/manual/FailoverTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/manual/FailoverTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -95,7 +95,7 @@
cons.setMessageListener(list);
- conn.startServerPeer();
+ conn.start();
MessageProducer prod = sessSend.createProducer(queue);
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -120,7 +120,7 @@
// Delivery is asynch - need to give enough time to get to the consumer
Thread.sleep(2000);
- // startServerPeer the receiver thread
+ // start the receiver thread
final Latch latch = new Latch();
Thread receiverThread = new Thread(new Runnable()
{
@@ -152,7 +152,7 @@
final Latch receiverLatch = new Latch();
- // startServerPeer the receiver thread
+ // start the receiver thread
Thread receiverThread = new Thread(new Runnable()
{
public void run()
@@ -177,7 +177,7 @@
final Latch senderLatch = new Latch();
- // startServerPeer the sender thread
+ // start the sender thread
Thread senderThread = new Thread(new Runnable()
{
public void run()
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -73,7 +73,7 @@
sc.getPersistenceManagerSQLProperties(),
true, batch, true, false, maxParams, !sc.getDatabaseName().equals("oracle"));
((JDBCPersistenceManager)pm).injectNodeID(1);
- p.startServerPeer();
+ p.start();
return p;*/ return null;
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -115,7 +115,7 @@
try
{
- ServerManagement.startServerPeer(0, "/some-new-context", null);
+ ServerManagement.start(0, "/some-new-context", null);
fail("should throw exception");
}
catch(MessagingJMSException e)
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/ConcurrentCloseStressTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -55,7 +55,7 @@
{
super.setUp();
- //ServerManagement.startServerPeer("all");
+ //ServerManagement.start("all");
ic = getInitialContext();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -87,7 +87,7 @@
{
super.setUp();
- //ServerManagement.startServerPeer("all");
+ //ServerManagement.start("all");
ic = getInitialContext();
deployQueue("StressTestQueue");
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/ManyConnectionsStressTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/ManyConnectionsStressTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/ManyConnectionsStressTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -60,7 +60,7 @@
{
super.setUp();
- //ServerManagement.startServerPeer("all");
+ //ServerManagement.start("all");
ic = getInitialContext();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/OpenCloseStressTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -60,7 +60,7 @@
{
super.setUp();
- //ServerManagement.startServerPeer("all");
+ //ServerManagement.start("all");
ic = getInitialContext();
cf = (JBossConnectionFactory)ic.lookup("/ConnectionFactory");
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/RelayStressTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/RelayStressTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/stress/RelayStressTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -48,7 +48,7 @@
{
super.setUp();
- //ServerManagement.startServerPeer("all");
+ //ServerManagement.start("all");
ic = getInitialContext();
deployTopic("StressTestTopic");
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 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -39,8 +39,8 @@
import java.util.*;
/**
- * Collection of static methods to use to startServerPeer/stopServerPeer and interact with the in-memory JMS server. It
- * is also use to startServerPeer/stopServerPeer a remote server.
+ * Collection of static methods to use to start/stopServerPeer and interact with the in-memory JMS server. It
+ * is also use to start/stopServerPeer a remote server.
*
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -135,17 +135,17 @@
/**
* Will clear the database at startup.
*/
- /*public static void startServerPeer(String config) throws Exception
+ /*public static void start(String config) throws Exception
{
- startServerPeer(0, config, true);
+ start(0, config, true);
}*/
/**
* Will clear the database at startup.
*/
- /*public static void startServerPeer(int i, String config) throws Exception
+ /*public static void start(int i, String config) throws Exception
{
- startServerPeer(i, config, true);
+ start(i, config, true);
}*/
public static void start(int i, String config, boolean clearDatabase) throws Exception
{
@@ -168,13 +168,13 @@
boolean clearDatabase,
boolean startMessagingServer) throws Exception
{
- log.info("Attempting to startServerPeer server " + i);
+ log.info("Attempting to start server " + i);
- //servers.get(i).startServerPeer(config, attrOverrides, clearDatabase, startMessagingServer);
+ //servers.get(i).start(config, attrOverrides, clearDatabase, startMessagingServer);
/*Server s = create(i);
- s.startServerPeer(config, attrOverrides, clearDatabase, startMessagingServer);
+ s.start(config, attrOverrides, clearDatabase, startMessagingServer);
*/
log.info("server " + i + " started");
}
@@ -260,7 +260,7 @@
/**
* This method make sure that all servers that have been implicitely spawned when as a side
- * effect of create() and/or startServerPeer() are killed. The method is important because a forked
+ * effect of create() and/or start() are killed. The method is important because a forked
* ant junit task won't exit if processes created by it are still active. If you run tests
* from ant, always call killSpawnedServers() in tearDown().
* <p/>
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Example.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Example.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/Example.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -44,7 +44,7 @@
public static void main(String[] args) throws Exception
{
/*ServiceContainer sc = new ServiceContainer("transaction, jca, database");
- sc.startServerPeer();*/
+ sc.start();*/
InitialContext ic = new InitialContext();
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 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -65,14 +65,7 @@
// Constants ------------------------------------------------------------------------------------
private static final Logger log = Logger.getLogger(LocalTestServer.class);
- private static DataSource dataSource;
- private static TransactionManager transactionManager;
private boolean started = false;
- private boolean clearDatabase;
- private int methodToInvoke = 0;
- private final static int STOPSERVERPEER = 1;
- private final static int STARTSERVERPEER = 2;
- private Thread runner;
private Map<String, ConnectionFactory> factories = new HashMap<String, ConnectionFactory>();
// Static ---------------------------------------------------------------------------------------
@@ -138,7 +131,6 @@
JBMPropertyKernelConfig propertyKernelConfig = new JBMPropertyKernelConfig(System.getProperties());
propertyKernelConfig.setServerID(getServerID());
bootstrap = new JBMBootstrapServer(containerConfig, propertyKernelConfig);
- this.clearDatabase = clearDatabase;
System.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, ""+getServerID());
bootstrap.run();
started = true;
@@ -824,17 +816,7 @@
return ResourceManagerFactory.instance.size();
}
- public void setDataSource(DataSource dataSource)
- {
- LocalTestServer.dataSource = dataSource;
- }
-
- public void setTransactionManager(TransactionManager transactionManager)
- {
- LocalTestServer.transactionManager = transactionManager;
- }
-
// Inner classes --------------------------------------------------------------------------------
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -196,7 +196,7 @@
private String ipAddressOrHostName;
// There may be many service containers on the same machine, so we need to distinguish them
- // so we don't startServerPeer up multiple servers with services running on the same port
+ // so we don't start up multiple servers with services running on the same port
private int serverIndex;
JBMBootstrapServer bootstrap;
@@ -292,7 +292,7 @@
*//**
* @param sevicesToStart - A comma separated list of services to be started. Available services:
* transaction, jca, database, remoting. Example: "transaction, database, remoting".
- * "all" will startServerPeer every service available. A dash in front of a service name will
+ * "all" will start every service available. A dash in front of a service name will
* disable that service. Example "all,-database".
* @param tm - specifies a specific TransactionManager instance to bind into the mbeanServer.
* If null, the default JBoss TransactionManager implementation will be used.
@@ -316,17 +316,17 @@
// Public ---------------------------------------------------------------------------------------
- public void startServerPeer() throws Exception
+ public void start() throws Exception
{
- startServerPeer(true);
+ start(true);
}
- public void startServerPeer(boolean cleanDatabase) throws Exception
+ public void start(boolean cleanDatabase) throws Exception
{
- startServerPeer(cleanDatabase, null);
+ start(cleanDatabase, null);
}
- public void startServerPeer(boolean cleanDatabase, ServiceAttributeOverrides attrOverrides)
+ public void start(boolean cleanDatabase, ServiceAttributeOverrides attrOverrides)
throws Exception
{
@@ -445,8 +445,8 @@
}
catch(Throwable e)
{
- log.error("Failed to startServerPeer ServiceContainer", e);
- throw new Exception("Failed to startServerPeer ServiceContainer", e);
+ log.error("Failed to start ServiceContainer", e);
+ throw new Exception("Failed to start ServiceContainer", e);
}*//*
}
@@ -493,7 +493,7 @@
catch (Exception ignore)
{
//If the serverpeer failed when starting up previously, then only some of the
- //services may be started. The ones that didn't startServerPeer will fail when attempting to shut
+ //services may be started. The ones that didn't start will fail when attempting to shut
//them down.
//Hence we must catch and ignore or we won't shut everything down
}
@@ -800,8 +800,8 @@
mbeanServer.setAttribute(on, new Attribute("JndiName", JCA_JMS_CONNECTION_FACTORY_JNDI_NAME));
mbeanServer.setAttribute(on, new Attribute("UseJavaContext", Boolean.TRUE));
- // startServerPeer it
- mbeanServer.invoke(on, "startServerPeer", new Object[0], new String[0]);
+ // start it
+ mbeanServer.invoke(on, "start", new Object[0], new String[0]);
log.debug("started " + on);
}
@@ -856,9 +856,9 @@
{
log.info("Starting arjuna recovery manager");
- //Need to startServerPeer the recovery manager manually - if deploying
+ //Need to start the recovery manager manually - if deploying
//inside JBoss this wouldn't be necessary - since you would use
- //the TransactionManagerService MBean which would startServerPeer the recovery manager
+ //the TransactionManagerService MBean which would start the recovery manager
//for you
recoveryManager = RecoveryManager.manager(RecoveryManager.INDIRECT_MANAGEMENT);
@@ -928,7 +928,7 @@
*//**
* Note that this method makes no assumption on whether the service was created or started, nor
- * does it attempt to create/startServerPeer the service.
+ * does it attempt to create/start the service.
*
* @param service - a Standard/DynamicMBean instance.
*//*
@@ -1046,7 +1046,7 @@
hsqldbServer = new Server();
hsqldbServer.setLogWriter(null);
hsqldbServer.setProperties(props);
- hsqldbServer.startServerPeer();
+ hsqldbServer.start();
log.debug("started " + config.getDatabaseName() + " in-VM");
}
@@ -1088,7 +1088,7 @@
TransactionManagerJMXWrapper mbean = new TransactionManagerJMXWrapper(tm);
mbeanServer.registerMBean(mbean, TRANSACTION_MANAGER_OBJECT_NAME);
- mbeanServer.invoke(TRANSACTION_MANAGER_OBJECT_NAME, "startServerPeer", new Object[0], new String[0]);
+ mbeanServer.invoke(TRANSACTION_MANAGER_OBJECT_NAME, "start", new Object[0], new String[0]);
log.debug("started " + TRANSACTION_MANAGER_OBJECT_NAME);
initialContext.bind(TRANSACTION_MANAGER_JNDI_NAME, tm);
@@ -1128,7 +1128,7 @@
ccm.setTransactionManagerServiceName(TRANSACTION_MANAGER_OBJECT_NAME);
mbeanServer.registerMBean(ccm, on);
- mbeanServer.invoke(on, "startServerPeer", new Object[0], new String[0]);
+ mbeanServer.invoke(on, "start", new Object[0], new String[0]);
log.debug("started " + on);
}
@@ -1156,7 +1156,7 @@
ManagedConnectionFactoryJMXWrapper mbean = new ManagedConnectionFactoryJMXWrapper(mcf);
mbeanServer.registerMBean(mbean, on);
- mbeanServer.invoke(on, "startServerPeer", new Object[0], new String[0]);
+ mbeanServer.invoke(on, "start", new Object[0], new String[0]);
log.debug("started " + on);
}
@@ -1180,7 +1180,7 @@
mcp.setManagedConnectionFactoryName(managedConnectionFactoryObjectName);
mbeanServer.registerMBean(mcp, on);
- mbeanServer.invoke(on, "startServerPeer", new Object[0], new String[0]);
+ mbeanServer.invoke(on, "start", new Object[0], new String[0]);
log.debug("started " + on);
@@ -1214,7 +1214,7 @@
cm.setManagedConnectionPool(managedConnectionPoolObjectName);
mbeanServer.registerMBean(cm, on);
- mbeanServer.invoke(on, "startServerPeer", new Object[0], new String[0]);
+ mbeanServer.invoke(on, "start", new Object[0], new String[0]);
log.debug("started " + on);
return cm;
@@ -1241,7 +1241,7 @@
Registry.bind(irrelevant, new NoopInvoker());
mbeanServer.registerMBean(wdss, DEFAULTDS_WRAPPER_DATA_SOURCE_SERVICE_OBJECT_NAME);
- mbeanServer.invoke(DEFAULTDS_WRAPPER_DATA_SOURCE_SERVICE_OBJECT_NAME, "startServerPeer", new Object[0], new String[0]);
+ mbeanServer.invoke(DEFAULTDS_WRAPPER_DATA_SOURCE_SERVICE_OBJECT_NAME, "start", new Object[0], new String[0]);
log.debug("started " + DEFAULTDS_WRAPPER_DATA_SOURCE_SERVICE_OBJECT_NAME);
}
@@ -1378,7 +1378,7 @@
mbean = new RemotingJMXWrapper(locator);
mbeanServer.registerMBean(mbean, objectName);
- mbeanServer.invoke(objectName, "startServerPeer", new Object[0], new String[0]);
+ mbeanServer.invoke(objectName, "start", new Object[0], new String[0]);
ServerInvocationHandler handler = new JMSServerInvocationHandler();
@@ -1574,7 +1574,7 @@
(MBeanConfigurationElement) services.iterator().next();
ObjectName nameMultiplexer = registerAndConfigureService(multiplexerConfig);
invoke(nameMultiplexer, "create", new Object[0], new String[0]);
- invoke(nameMultiplexer, "startServerPeer", new Object[0], new String[0]);
+ invoke(nameMultiplexer, "start", new Object[0], new String[0]);
}
private void overrideAttributes(ObjectName on, ServiceAttributeOverrides attrOverrides)
@@ -1613,7 +1613,7 @@
overrideAttributes(on, attrOverrides);
// dependencies have been automatically injected already
invoke(on, "create", new Object[0], new String[0]);
- invoke(on, "startServerPeer", new Object[0], new String[0]);
+ invoke(on, "start", new Object[0], new String[0]);
connFactoryObjectNames.add(on);
}
@@ -1626,7 +1626,7 @@
overrideAttributes(on, attrOverrides);
// dependencies have been automatically injected already
invoke(on, "create", new Object[0], new String[0]);
- invoke(on, "startServerPeer", new Object[0], new String[0]);
+ invoke(on, "start", new Object[0], new String[0]);
connFactoryObjectNames.add(on);
}
@@ -1639,7 +1639,7 @@
overrideAttributes(on, attrOverrides);
// dependencies have been automatically injected already
invoke(on, "create", new Object[0], new String[0]);
- invoke(on, "startServerPeer", new Object[0], new String[0]);
+ invoke(on, "start", new Object[0], new String[0]);
connFactoryObjectNames.add(on);
}
@@ -1652,7 +1652,7 @@
overrideAttributes(on, attrOverrides);
// dependencies have been automatically injected already
invoke(on, "create", new Object[0], new String[0]);
- invoke(on, "startServerPeer", new Object[0], new String[0]);
+ invoke(on, "start", new Object[0], new String[0]);
connFactoryObjectNames.add(on);
}
}
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/util/JNDIUtilTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/util/JNDIUtilTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/util/JNDIUtilTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -116,7 +116,7 @@
{
super.setUp();
- //ServerManagement.startServerPeer("none");
+ //ServerManagement.start("none");
ic = getInitialContext();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -207,7 +207,7 @@
ServerManagement.stop();
}
- // startServerPeer a "standard" (messaging-enabled) remoting, we need to strip off the
+ // start a "standard" (messaging-enabled) remoting, we need to strip off the
// marshaller/unmarshaller, though, since it can only bring trouble to this test ...
ServiceAttributeOverrides sao = new ServiceAttributeOverrides();
sao.put(ServiceContainer.REMOTING_OBJECT_NAME,
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/InvokerReferenceCountTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/InvokerReferenceCountTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/InvokerReferenceCountTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -49,7 +49,7 @@
{
super.setUp();
- //ServerManagement.startServerPeer("all");
+ //ServerManagement.start("all");
deployQueue("testQueue");
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -190,7 +190,7 @@
{
super.setUp();
- // startServerPeer "raw" remoting, don't use JBM configuration
+ // start "raw" remoting, don't use JBM configuration
String addr = ServiceContainer.getCurrentAddress();
int port = PortUtil.findFreePort(addr);
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -247,7 +247,7 @@
{
super.setUp();
- //ServerManagement.startServerPeer("all");
+ //ServerManagement.start("all");
ic = getInitialContext();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/SocketTransportCausalityTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/SocketTransportCausalityTest.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/SocketTransportCausalityTest.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -87,7 +87,7 @@
//
// for (int i = 0; i < NUM_THREADS; i++)
// {
-// threads[i].startServerPeer();
+// threads[i].start();
// }
//
// for (int i = 0; i < NUM_THREADS; i++)
@@ -134,7 +134,7 @@
{
super.setUp();
- // startServerPeer "raw" remoting, don't use JBM configuration, with one exception: make sure the
+ // start "raw" remoting, don't use JBM configuration, with one exception: make sure the
// server uses DirectThreadPool
String addr = ServiceContainer.getCurrentAddress();
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemService.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemService.java 2007-12-07 01:59:39 UTC (rev 3440)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemService.java 2007-12-07 08:35:24 UTC (rev 3441)
@@ -49,7 +49,7 @@
"</mbean>";
ObjectName on = ServerManagement.deploy(testSubsystemConfig);
- ServerManagement.invoke(on, "startServerPeer", new Object[0], new String[0]);
+ ServerManagement.invoke(on, "start", new Object[0], new String[0]);
return on;
}
More information about the jboss-cvs-commits
mailing list