[jboss-cvs] JBoss Messaging SVN: r2984 - in trunk: src/main/org/jboss/messaging/core/impl/clusterconnection and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-08-08 16:44:03 -0400 (Wed, 08 Aug 2007)
New Revision: 2984

Modified:
   trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java
   trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
   trunk/tests/build.xml
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
Log:
tests speedup


Modified: trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java	2007-08-08 20:38:27 UTC (rev 2983)
+++ trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java	2007-08-08 20:44:03 UTC (rev 2984)
@@ -288,9 +288,7 @@
       Iterator iter = queues.iterator();
       
       int count = 0;
-      
-      log.info("Getting message count for " + this.name);
-      
+       
       while (iter.hasNext())
       {
          Queue queue = (Queue)iter.next();
@@ -299,8 +297,6 @@
              || (type == NON_DURABLE && !queue.isRecoverable()))
          {            
             count += queue.getMessageCount();
-            
-            log.info("Count for " + queue.getName() + " is " + queue.getMessageCount());
          }
       }
 

Modified: trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2007-08-08 20:38:27 UTC (rev 2983)
+++ trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2007-08-08 20:44:03 UTC (rev 2984)
@@ -268,7 +268,6 @@
 			{
 				//Add a header saying we have sucked the message
 				((MessageProxy)msg).getMessage().putHeader(org.jboss.messaging.core.contract.Message.CLUSTER_SUCKED, "x");
-				log.info("Added clustersucked header");
 			}
 			
 			long timeToLive = msg.getJMSExpiration();

Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2007-08-08 20:38:27 UTC (rev 2983)
+++ trunk/tests/build.xml	2007-08-08 20:44:03 UTC (rev 2984)
@@ -753,18 +753,17 @@
 
 
 <!--
-              <include name="**/jms/clustering/${test-mask}.class"/>i
+              <include name="**/jms/clustering/${test-mask}.class"/>
               <exclude name="**/jms/clustering/ClusterLeakTest.class"/>
 -->
 
-<!-- Put the tests that kill servers first -->
+<!--
 <include name="**/jms/clustering/ChangeFailoverNodeTest.class"/> 
 <include name="**/jms/clustering/ClusteredConnectionFactoryTest.class"/>
 <include name="**/jms/clustering/ClusterViewUpdateTest.class"/>
 <include name="**/jms/clustering/DisableLoadBalancingAndFailoverTest.class"/>
 <include name="**/jms/clustering/DistributedQueueDontUseXATest.class"/>
 <include name="**/jms/clustering/DistributedQueueUseXATest.class"/>
-<include name="**/jms/clustering/FailoverTest.class"/>
 <include name="**/jms/clustering/HATest.class"/>
 <include name="**/jms/clustering/MergeQueueTest.class"/>
 <include name="**/jms/clustering/MultipleFailoverTest.class"/>
@@ -773,18 +772,18 @@
 <include name="**/jms/clustering/PreserveOrderingTest.class"/>
 <include name="**/jms/clustering/RecoverDeliveriesTest.class"/>
 <include name="**/jms/clustering/XAFailoverTest.class"/>
-
 <include name="**/jms/clustering/ClusterConnectionManagerTest.class"/>
 <include name="**/jms/clustering/ClusteringAspectInternalTest.class"/>
 <include name="**/jms/clustering/DistributedRequestResponseTest.class"/>
-<include name="**/jms/clustering/DistributedTopicTest.class"/>
 <include name="**/jms/clustering/LoadBalancingTest.class"/>
 <include name="**/jms/clustering/TemporaryDestinationTest.class"/>
+-->
 
+<include name="**/jms/clustering/DistributedTopicTest.class"/>
+<include name="**/jms/clustering/FailoverTest.class"/>
 
 
 
-
 <!--
 <include name="**/jms/clustering/GroupManagementTest.class"/>
 <include name="**/jms/clustering/LargeClusterTest.class"/>

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java	2007-08-08 20:38:27 UTC (rev 2983)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java	2007-08-08 20:44:03 UTC (rev 2984)
@@ -395,6 +395,11 @@
    protected void setUp() throws Exception
    {
       super.setUp();
+      
+      for (int i = 0 ; i < ServerManagement.MAX_SERVER_COUNT; i++)
+      {
+      	ServerManagement.kill(i);
+      }
    }
 
    protected void tearDown() throws Exception