[jboss-cvs] JBoss Messaging SVN: r2340 - in trunk: src/main/org/jboss/jms/server and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 16 06:14:15 EST 2007
Author: ovidiu.feodorov at jboss.com
Date: 2007-02-16 06:14:15 -0500 (Fri, 16 Feb 2007)
New Revision: 2340
Modified:
trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
trunk/src/main/org/jboss/jms/server/ServerPeer.java
trunk/tests/bin/.testrc.example
trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java
trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingConnectionFailureTest.java
Log:
minor reformatting
Modified: trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2007-02-16 08:41:05 UTC (rev 2339)
+++ trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2007-02-16 11:14:15 UTC (rev 2340)
@@ -46,7 +46,6 @@
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
* @author <a href="ovidiu at jboss.org">Ovidiu Feodorov</a>
* @version <tt>$Revision$</tt>
- *
* $Id$
*/
public class JMSRemotingConnection
@@ -69,8 +68,8 @@
}
catch (Exception ignore)
{
- //May get a security exception depending on security permissions, in which case
- //we return null
+ // May get a security exception depending on security permissions, in which case we
+ // return null
}
return prop;
@@ -179,7 +178,7 @@
{
// For transports derived from the socket transport, allow true push callbacks,
- // with callback Connector. For http transport, simulate push callbacks.
+ // with callback Connector. For http transport, simulate push callbacks.
String protocol = serverLocator.getProtocol();
boolean isBisocket = "bisocket".equals(protocol) || "sslbisocket".equals(protocol);
boolean isSocket = "socket".equals(protocol) || "sslsocket".equals(protocol);
Modified: trunk/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeer.java 2007-02-16 08:41:05 UTC (rev 2339)
+++ trunk/src/main/org/jboss/jms/server/ServerPeer.java 2007-02-16 11:14:15 UTC (rev 2340)
@@ -239,8 +239,8 @@
jmsUserManager = (JMSUserManager)mbeanServer.
getAttribute(jmsUserManagerObjectName, "Instance");
- //We get references to some plugins lazily to avoid problems with circular
- //MBean dependencies
+ // We get references to some plugins lazily to avoid problems with circular MBean
+ // dependencies
// Create the wired components
messageIDManager = new IDManager("MESSAGE_ID", 4096, persistenceManager);
@@ -270,10 +270,10 @@
securityStore.start();
txRepository.start();
- //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
+ // 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
txRepository.loadPreparedTransactions();
Modified: trunk/tests/bin/.testrc.example
===================================================================
--- trunk/tests/bin/.testrc.example 2007-02-16 08:41:05 UTC (rev 2339)
+++ trunk/tests/bin/.testrc.example 2007-02-16 11:14:15 UTC (rev 2340)
@@ -19,7 +19,7 @@
# overrides the value specified in container.xml.
#
-TEST_REMOTING=socket
+TEST_REMOTING=bisocket
#verbose output on spawned servers?
TEST_SPAWN_VERBOSE=false
@@ -33,185 +33,8 @@
# switch.
#
CLUSTERED=true
-#
-#
-# util
-#
-#TARGET_CLASS=org.jboss.test.messaging.util.SelectiveIteratorTest
-#TARGET_CLASS=org.jboss.test.messaging.util.UtilTest
-#TARGET_CLASS=org.jboss.test.messaging.util.RemoteServerTest
-#TARGET_TEST=testRemoteServer
-#TARGET_CLASS=org.jboss.test.messaging.util.XMLUtilTest
-#TARGET_TEST=testElementToString_3
-#TARGET_CLASS=org.jboss.test.messaging.util.MBeanConfigurationElementTest
-#TARGET_TEST=testConstructor
-#TARGET_CLASS=org.jboss.test.messaging.util.ServiceDeploymentDescriptorTest
-#TARGET_TEST=testServiceConfiguration
-#
-# core
-#
-#TARGET_CLASS=org.jboss.test.messaging.core.SimpleDeliveryTest
-#TARGET_CLASS=org.jboss.test.messaging.core.ReplicatorOutputDeliveryTest
-#
-# local core
-#
-#TARGET_CLASS=org.jboss.test.messaging.core.CoreTest
-#TARGET_CLASS=org.jboss.test.messaging.core.NonRecoverableState1Test
-#TARGET_TEST=testNonRecoverableState_1
-#TARGET_CLASS=org.jboss.test.messaging.core.NonRecoverableState2Test
-#TARGET_TEST=testNonRecoverableState_17
-#TARGET_CLASS=org.jboss.test.messaging.core.RecoverableStateTest
-#TARGET_TEST=testRecoverableState_57
-#TARGET_CLASS=org.jboss.test.messaging.core.local.NonRecoverableQueueTest
-#TARGET_TEST=testRecoverableChannel_3
-#TARGET_CLASS=org.jboss.test.messaging.core.local.RecoverableQueueTest
-#TARGET_TEST=testRecoverableChannel_17
-#TARGET_CLASS=org.jboss.test.messaging.core.local.SubscriptionTest
-#TARGET_CLASS=org.jboss.test.messaging.core.local.DurableSubscriptionTest
-#TARGET_CLASS=org.jboss.test.messaging.core.local.TopicTest
-#TARGET_TEST=testNACKINGReceiver
-#TARGET_CLASS=org.jboss.test.messaging.core.DistributorTest
-#TARGET_CLASS=org.jboss.test.messaging.core.MessageReferenceSupportTest
-#TARGET_CLASS=org.jboss.test.messaging.core.MessageSupportTest
-#TARGET_CLASS=org.jboss.test.messaging.core.PointToMultipointRouterAsDistributorTest
-#TARGET_CLASS=org.jboss.test.messaging.core.PointToPointRouterAsDistributorTest
-#TARGET_CLASS=org.jboss.test.messaging.core.RoutableSupportTest
-#TARGET_CLASS=org.jboss.test.messaging.core.LocalQueueAsDistributorTest
-#TARGET_CLASS=org.jboss.test.messaging.core.LocalTopicAsDistributorTest
-#TARGET_CLASS=org.jboss.test.messaging.core.ChannelSupportTest
-#TARGET_CLASS=org.jboss.test.messaging.core.TransactionalChannelSupportTest
-#TARGET_CLASS=org.jboss.test.messaging.core.LocalQueueAsChannelTest
-#TARGET_CLASS=org.jboss.test.messaging.core.LocalTopicAsChannelTest
-#TARGET_CLASS=org.jboss.test.messaging.core.AbstractDestinationAsChannelTest
-#TARGET_CLASS=org.jboss.test.messaging.core.LocalPipeAsChannelTest
-#TARGET_CLASS=org.jboss.test.messaging.core.persistence.JDBCUtilTest
-#TARGET_CLASS=org.jboss.test.messaging.core.persistence.CoreMessageJDBCPersistenceManagerTest
-#TARGET_TEST=testAddRetrieveRemoveMessage
-#
-# core - message
-#
-#TARGET_CLASS=org.jboss.test.messaging.core.message.InMemoryMessageStoreTest
-#TARGET_CLASS=org.jboss.test.messaging.core.message.PersistentMessageStoreTest
-#TARGET_TEST=testRecoverableMessageStore_1
-#
-# core - persistence
-#
-#TARGET_CLASS=org.jboss.test.messaging.core.persistence.CoreMessageJDBCPersistenceManagerTest
-#TARGET_TEST=testAddRetrieveRemoveMessage
-#
-# distributed core
-#
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.pipe.SharedPipeOutputTest
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.replicator.ReplicatorTimeoutExceptionTest
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.replicator.ToEraseReplicatorOutputTest
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.queue.InvalidQueueTest
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.queue.QueueTest
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.queue.QueueAsChannelTest
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.pipe.PipeAsChannelTest
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.PeerIdentityTest
-#
-# core.distributed.queue
-#
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.queue.QueuePeerTest
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.queue.NonRecoverableDistributedQueueTest
-#TARGET_TEST=testNonRecoverableDistributedChannel_30
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.queue.RecoverableDistributedQueueTest
-#TARGET_TEST=testRecoverableDistributedChannel_32_mixed
-#
-# core.distributed.topic
-#
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.topic.TopicPeerTest
-#TARGET_TEST=testTwoPeers_1
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.topic.DistributedTopicTest
-#TARGET_TEST=testDistributedTopic_2
-#
-# core.distributed.replicator
-#
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.replicator.ReplicatorOutputTest
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.replicator.ReplicatorTest
-#TARGET_TEST=testReplicator_6
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.replicator.ReplicatorAsChannelTest
-#
-# distributed utils
-#
-#TARGET_CLASS=org.jboss.test.messaging.core.distributed.util.RpcServerTest
-#TARGET_TEST=testNoSuchMethodName_Local
-#
-# JMS Facade
-#
-#TARGET_CLASS=org.jboss.test.messaging.jms.MessageConsumerTest
-#TARGET_TEST=testReceive
-#TARGET_CLASS=org.jboss.test.messaging.jms.DurableSubscriptionTest
-#TARGET_TEST=testSimplestDurableSubscription
-#TARGET_CLASS=org.jboss.test.messaging.jms.TransactedSessionTest
-#TARGET_TEST=testRedeliveredFlagLocalTopic
-#TARGET_CLASS=org.jboss.test.messaging.jms.SessionTest
-#TARGET_TEST=testCreateConsumer
-#TARGET_CLASS=org.jboss.test.messaging.jms.MessageProducerTest
-#TARGET_TEST=testCreateProducerOnInexistentDestination
-#TARGET_CLASS=org.jboss.test.messaging.jms.ConnectionTest
-#TARGET_TEST=testClose1
-#TARGET_CLASS=org.jboss.test.messaging.jms.ConnectionClosedTest
-#TARGET_TEST=testCloseOnce,testCloseTwice
-#TARGET_TEST=testCannotReceiveMessageOnStoppedConnection
-#TARGET_CLASS=org.jboss.test.messaging.jms.ConnectionConsumerTest
-#TARGET_TEST=testSimple
-#TARGET_CLASS=org.jboss.test.messaging.jms.ConnectionFactoryTest
-#TARGET_CLASS=org.jboss.test.messaging.jms.BrowserTest
-#TARGET_TEST=testCreateBrowserOnNullDestination
-#TARGET_CLASS=org.jboss.test.messaging.jms.AcknowledgmentTest
-#TARGET_TEST=testAutoAcknowledge
-#TARGET_CLASS=org.jboss.test.messaging.jms.TemporaryDestinationTest
-#TARGET_CLASS=org.jboss.test.messaging.jms.selector.SelectorTest
-#TARGET_TEST=testSelectiveClosingConsumer
-#TARGET_CLASS=org.jboss.test.messaging.jms.QueueTest
-#TARGET_TEST=testQueue
-#TARGET_CLASS=org.jboss.test.messaging.jms.TopicTest
-#TARGET_TEST=testQueue
-#TARGET_CLASS=org.jboss.test.messaging.jms.persistence.JBossBytesMessagePersistenceManagerTest
-#TARGET_TEST=testAddReference
-#TARGET_CLASS=org.jboss.test.messaging.jms.SecurityTest
-#TARGET_TEST=testSecurityForQueuesAndTopicsWithTheSameName
-#TARGET_CLASS=org.jboss.test.messaging.jms.PersistenceTest
-#TARGET_TEST=testQueuePersistence
-#
-# JMS Facade server
-#
-#TARGET_CLASS=org.jboss.test.messaging.jms.server.ServerPeerTest
-#TARGET_TEST=testUnbindContexts
-#TARGET_CLASS=org.jboss.test.messaging.jms.server.DestinationManagerTest
-#TARGET_TEST=testCreateDuplicateQueue
-#TARGET_CLASS=org.jboss.test.messaging.jms.server.plugin.InMemoryDurableSubscriptionStoreTest
-#TARGET_TEST=testCreateGetRemoveDurableSubscription
-#TARGET_CLASS=org.jboss.test.messaging.jms.server.plugin.JDBCDurableSubscriptionStoreTest
-#TARGET_TEST=testCreateGetRemoveDurableSubscription
-#TARGET_CLASS=org.jboss.test.messaging.jms.server.destination.QueueManagementTest
-#TARGET_TEST=testDefaultSecurityConfiguration
-#TARGET_CLASS=org.jboss.test.messaging.jms.server.destination.TopicManagementTest
-#TARGET_TEST=testDestroyNonProgrammaticDestination
-#TARGET_CLASS=org.jboss.test.messaging.jms.server.connectionfactory.ConnectionFactoryTest
-#TARGET_TEST=testDefaultConnectionFactory
-#TARGET_CLASS=org.jboss.test.messaging.jms.server.connectionfactory.JNDIBindingsTest
-#TARGET_TEST=testParse_3
-#
-# Message tests
-#
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.JMSExpirationHeaderTest
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.JMSReplyToHeaderTest
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.JMSCorrelationIDHeaderTest
-#TARGET_TEST=testJMSDestination
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.MessageTest
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.MessageBodyTest
-#TARGET_TEST=testStreamMessage
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.TextMessageTest
-#TARGET_TEST=testPersistentSend
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.MapMessageTest
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.BytesMessageTest
-#TARGET_TEST=testPersistentSend
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.StreamMessageTest
-#TARGET_TEST=testNonPersistentSend
-#TARGET_CLASS=org.jboss.test.messaging.jms.message.ObjectMessageTest
-#
-#
+
+
+
TARGET_CLASS=org.jboss.test.messaging.jms.JMSTest
TARGET_TEST=testAll
Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java 2007-02-16 08:41:05 UTC (rev 2339)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/CallbackServerTimeoutTest.java 2007-02-16 11:14:15 UTC (rev 2340)
@@ -113,10 +113,9 @@
{
if (client != null)
{
- // Note. Calling Client.disconnect() does remove the InvokerCallbackHandler
- // registered above. For the http transport, the CallbackPoller will continue
- // running, which will generate a lot of ERROR log messages after the server
- // has shut down.
+ // Note. Calling Client.disconnect() does remove the InvokerCallbackHandler registered
+ // above. For the http transport, the CallbackPoller will continue running, which will
+ // generate a lot of ERROR log messages after the server has shut down.
client.removeListener(callbackHandler);
client.disconnect();
}
Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingConnectionFailureTest.java 2007-02-16 08:41:05 UTC (rev 2339)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingConnectionFailureTest.java 2007-02-16 11:14:15 UTC (rev 2340)
@@ -118,11 +118,11 @@
}
catch(IOException e)
{
- // This happens for bisocket clients - if the client throws IOException subclass, we're fine,
- // this is what our FailoverValveInteceptor is looking after
+ // This happens for bisocket clients - if the client throws IOException subclass, we're
+ // fine, this is what our FailoverValveInteceptor is looking after
- // Note. The bisocket transport can make internal invocations and therefore have a
- // pooled connectin available.
+ // Note. The bisocket transport can make internal invocations and therefore have a pooled
+ // connection available.
}
}
More information about the jboss-cvs-commits
mailing list