activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r550449 [2/2] - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/broker/ main/java/org/apache/activemq/broker/jmx/ main/java/org/apache/activemq/broker/region/ main/java/org/apache/activemq/command/ main/java/org/apache/a...
Date Mon, 25 Jun 2007 10:46:14 GMT
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSConsumerTest.java Mon Jun 25 03:45:55 2007
@@ -65,13 +65,13 @@
     
     public void initCombosForTestMessageListenerWithConsumerCanBeStopped() {
         addCombinationValues("deliveryMode", new Object[] { 
-                new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("destinationType", new Object[] { 
-                new Byte(ActiveMQDestination.QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
     public void testMessageListenerWithConsumerCanBeStopped() throws Exception {
 
@@ -115,17 +115,17 @@
     
     public void initCombosForTestMutiReceiveWithPrefetch1() {
         addCombinationValues("deliveryMode", new Object[] { 
-                new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("ackMode", new Object[] { 
-                new Integer(Session.AUTO_ACKNOWLEDGE),
-                new Integer(Session.DUPS_OK_ACKNOWLEDGE), 
-                new Integer(Session.CLIENT_ACKNOWLEDGE) });
+                Integer.valueOf(Session.AUTO_ACKNOWLEDGE),
+                Integer.valueOf(Session.DUPS_OK_ACKNOWLEDGE), 
+                Integer.valueOf(Session.CLIENT_ACKNOWLEDGE) });
         addCombinationValues("destinationType", new Object[] { 
-                new Byte(ActiveMQDestination.QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)
                 });
     }
 
@@ -155,10 +155,10 @@
 
     public void initCombosForTestDurableConsumerSelectorChange() {
         addCombinationValues("deliveryMode", new Object[] { 
-                new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("destinationType", new Object[] { 
-                new Byte(ActiveMQDestination.TOPIC_TYPE)});
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE)});
     }
     public void testDurableConsumerSelectorChange() throws Exception {
 
@@ -200,11 +200,11 @@
     }
 
     public void initCombosForTestSendReceiveBytesMessage() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
-        addCombinationValues("destinationType", new Object[] { new Byte(ActiveMQDestination.QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TOPIC_TYPE), new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
+        addCombinationValues("destinationType", new Object[] { Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
 
     public void testSendReceiveBytesMessage() throws Exception {
@@ -233,13 +233,13 @@
     
     public void initCombosForTestSetMessageListenerAfterStart() {
         addCombinationValues("deliveryMode", new Object[] { 
-                new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("destinationType", new Object[] { 
-                new Byte(ActiveMQDestination.QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
     public void testSetMessageListenerAfterStart() throws Exception {
 
@@ -273,15 +273,15 @@
     
     public void initCombosForTestMessageListenerUnackedWithPrefetch1StayInQueue() {
         addCombinationValues("deliveryMode", new Object[] { 
-                new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) 
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) 
                 });
         addCombinationValues("ackMode", new Object[] { 
-                new Integer(Session.AUTO_ACKNOWLEDGE),
-                new Integer(Session.DUPS_OK_ACKNOWLEDGE), 
-                new Integer(Session.CLIENT_ACKNOWLEDGE) 
+                Integer.valueOf(Session.AUTO_ACKNOWLEDGE),
+                Integer.valueOf(Session.DUPS_OK_ACKNOWLEDGE), 
+                Integer.valueOf(Session.CLIENT_ACKNOWLEDGE) 
                 });
-        addCombinationValues("destinationType", new Object[] { new Byte(ActiveMQDestination.QUEUE_TYPE), });
+        addCombinationValues("destinationType", new Object[] { Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), });
     }
 
     public void testMessageListenerUnackedWithPrefetch1StayInQueue() throws Exception {
@@ -364,13 +364,13 @@
     
     public void initCombosForTestMessageListenerWithConsumerWithPrefetch1() {
         addCombinationValues("deliveryMode", new Object[] { 
-                new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("destinationType", new Object[] { 
-                new Byte(ActiveMQDestination.QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
     public void testMessageListenerWithConsumerWithPrefetch1() throws Exception {
 
@@ -404,13 +404,13 @@
 
     public void initCombosForTestMessageListenerWithConsumer() {
         addCombinationValues("deliveryMode", new Object[] { 
-                new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("destinationType", new Object[] { 
-                new Byte(ActiveMQDestination.QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
     public void testMessageListenerWithConsumer() throws Exception {
 
@@ -441,11 +441,11 @@
     }
 
     public void initCombosForTestUnackedWithPrefetch1StayInQueue() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
-        addCombinationValues("ackMode", new Object[] { new Integer(Session.AUTO_ACKNOWLEDGE),
-                new Integer(Session.DUPS_OK_ACKNOWLEDGE), new Integer(Session.CLIENT_ACKNOWLEDGE) });
-        addCombinationValues("destinationType", new Object[] { new Byte(ActiveMQDestination.QUEUE_TYPE), });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+        		Integer.valueOf(DeliveryMode.PERSISTENT) });
+        addCombinationValues("ackMode", new Object[] { Integer.valueOf(Session.AUTO_ACKNOWLEDGE),
+        		Integer.valueOf(Session.DUPS_OK_ACKNOWLEDGE), Integer.valueOf(Session.CLIENT_ACKNOWLEDGE) });
+        addCombinationValues("destinationType", new Object[] { Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), });
     }
 
     public void testUnackedWithPrefetch1StayInQueue() throws Exception {
@@ -490,8 +490,8 @@
 
     }
     public void initCombosForTestPrefetch1MessageNotDispatched() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
     }
     
     public void testPrefetch1MessageNotDispatched() throws Exception {
@@ -532,9 +532,9 @@
     }
     
     public void initCombosForTestDontStart() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT), });
-        addCombinationValues("destinationType", new Object[] { new Byte(ActiveMQDestination.QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TOPIC_TYPE), });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT), });
+        addCombinationValues("destinationType", new Object[] { Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), });
     }
 
     public void testDontStart() throws Exception {
@@ -551,9 +551,9 @@
     }
 
     public void initCombosForTestStartAfterSend() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT), });
-        addCombinationValues("destinationType", new Object[] { new Byte(ActiveMQDestination.QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TOPIC_TYPE), });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT), });
+        addCombinationValues("destinationType", new Object[] { Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), });
     }
 
     public void testStartAfterSend() throws Exception {
@@ -574,11 +574,11 @@
     }
 
     public void initCombosForTestReceiveMessageWithConsumer() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
-        addCombinationValues("destinationType", new Object[] { new Byte(ActiveMQDestination.QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TOPIC_TYPE), new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE),
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE) });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
+        addCombinationValues("destinationType", new Object[] { Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE) });
     }
 
     public void testReceiveMessageWithConsumer() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java Mon Jun 25 03:45:55 2007
@@ -45,8 +45,8 @@
     public int deliveryMode;
     
     public void initCombosForTestRoundRobinDispatchOnNonExclusive() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+        		Integer.valueOf(DeliveryMode.PERSISTENT) });
     }
 
     /**
@@ -82,8 +82,8 @@
     }
 
     public void initCombosForTestDispatchExclusive() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+        		Integer.valueOf(DeliveryMode.PERSISTENT) });
     }
 
     /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSMessageTest.java Mon Jun 25 03:45:55 2007
@@ -65,10 +65,10 @@
                 "vm://localhost?marshal=true" 
                 });
         addCombinationValues("deliveryMode", new Object[] { 
-                new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+        		Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+        		Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("destinationType", new Object[] { 
-                new Byte(ActiveMQDestination.QUEUE_TYPE)});
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE)});
     }
     
     public void testTextMessage() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JMSUsecaseTest.java Mon Jun 25 03:45:55 2007
@@ -50,11 +50,11 @@
 
     public void initCombosForTestQueueBrowser() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 } );
     }       
     public void testQueueBrowser() throws Exception {
@@ -80,13 +80,13 @@
 
     public void initCombosForTestSendReceive() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }       
     public void testSendReceive() throws Exception {
         // Send a message to the broker.
@@ -105,13 +105,13 @@
 
     public void initCombosForTestSendReceiveTransacted() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }       
     public void testSendReceiveTransacted() throws Exception {
         // Send a message to the broker.

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/JmsTransactionTestSupport.java Mon Jun 25 03:45:55 2007
@@ -54,8 +54,8 @@
     protected Destination destination;
     
     // for message listener test
-    private final int messageCount = 5;
-    private final String messageText = "message";
+    private static final int messageCount = 5;
+    private static final String messageText = "message";
     private List unackMessages = new ArrayList(messageCount);
     private List ackMessages = new ArrayList(messageCount);
     private boolean resendPhase = false;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LargeStreamletTest.java Mon Jun 25 03:45:55 2007
@@ -94,7 +94,7 @@
                 });
 
                 final Thread writerThread = new Thread(new Runnable() {
-
+                	private final Random random = new Random();
                     public void run() {
                         totalWritten.set(0);
                         int count = MESSAGE_COUNT;
@@ -103,7 +103,7 @@
                                     .createOutputStream(destination);
                             try {
                                 final byte[] buf = new byte[BUFFER_SIZE];
-                                new Random().nextBytes(buf);
+                                random.nextBytes(buf);
                                 while (count > 0 && !stopThreads.get()) {
                                     outputStream.write(buf);
                                     totalWritten.addAndGet(buf.length);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/LoadTestBurnIn.java Mon Jun 25 03:45:55 2007
@@ -97,25 +97,25 @@
     
     public void initCombosForTestSendReceive() {
         addCombinationValues("deliveryMode", new Object[] { 
-                new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("destinationType", new Object[] { 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-//                new Byte(ActiveMQDestination.QUEUE_TYPE),
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+//                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE),
                 });
         addCombinationValues("durableConsumer", new Object[] { 
                 Boolean.TRUE, 
 //                Boolean.FALSE,
                 });
         addCombinationValues("messageSize", new Object[] { 
-                new Integer(101), 
-                new Integer(102), 
-                new Integer(103), 
-                new Integer(104), 
-                new Integer(105), 
-                new Integer(106), 
-                new Integer(107), 
-                new Integer(108), 
+                Integer.valueOf(101), 
+                Integer.valueOf(102), 
+                Integer.valueOf(103), 
+                Integer.valueOf(104), 
+                Integer.valueOf(105), 
+                Integer.valueOf(106), 
+                Integer.valueOf(107), 
+                Integer.valueOf(108), 
         });
     }
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTest.java Mon Jun 25 03:45:55 2007
@@ -47,8 +47,8 @@
     
     public void initCombosForTestQueuBrowserWith2Consumers() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
     }   
     
     /**
@@ -114,13 +114,13 @@
 
     public void initCombosForTestConsumerPrefetchAndStandardAck() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-//                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+//                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)
                 } );
     }
     
@@ -168,13 +168,13 @@
 
     public void initCombosForTestTransactedAckWithPrefetchOfOne() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)
                 } );
     }
 
@@ -222,13 +222,13 @@
 
     public void initCombosForTestTransactedSend() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }    
     public void testTransactedSend() throws Exception {
         
@@ -276,11 +276,11 @@
 
     public void initCombosForTestQueueTransactedAck() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
         } );
     }
     
@@ -329,8 +329,8 @@
 
     public void initCombosForTestConsumerCloseCausesRedelivery() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destination", new Object[]{ 
                 new ActiveMQQueue("TEST")} );
     }   
@@ -442,8 +442,8 @@
 
     public void initCombosForTestGroupedMessagesDeliveredToOnlyOneConsumer() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
     }
     public void testGroupedMessagesDeliveredToOnlyOneConsumer() throws Exception {
         
@@ -503,8 +503,8 @@
 
     public void initCombosForTestTopicConsumerOnlySeeMessagesAfterCreation() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "durableConsumer", new Object[]{ 
                 Boolean.TRUE, 
                 Boolean.FALSE});
@@ -551,8 +551,8 @@
     
     public void initCombosForTestTopicRetroactiveConsumerSeeMessagesBeforeCreation() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "durableConsumer", new Object[]{ 
                 Boolean.TRUE, 
                 Boolean.FALSE});
@@ -611,11 +611,11 @@
 // 
 //    public void initCombosForTestTempDestinationsRemovedOnConnectionClose() {    
 //        addCombinationValues( "deliveryMode", new Object[]{ 
-//                new Integer(DeliveryMode.NON_PERSISTENT), 
-//                new Integer(DeliveryMode.PERSISTENT)} );
+//                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+//                Integer.valueOf(DeliveryMode.PERSISTENT)} );
 //        addCombinationValues( "destinationType", new Object[]{ 
-//                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-//                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+//                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+//                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
 //    }
 //    
 //    public void testTempDestinationsRemovedOnConnectionClose() throws Exception {
@@ -657,11 +657,11 @@
     
 //    public void initCombosForTestTempDestinationsAreNotAutoCreated() {    
 //        addCombinationValues( "deliveryMode", new Object[]{ 
-//                new Integer(DeliveryMode.NON_PERSISTENT), 
-//                new Integer(DeliveryMode.PERSISTENT)} );
+//                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+//                Integer.valueOf(DeliveryMode.PERSISTENT)} );
 //        addCombinationValues( "destinationType", new Object[]{ 
-//                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-//                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+//                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+//                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
 //    }
 //    
 //   
@@ -697,11 +697,11 @@
     
     public void initCombosForTestTempDestinationsOnlyAllowsLocalConsumers() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
     public void testTempDestinationsOnlyAllowsLocalConsumers() throws Exception {
@@ -739,8 +739,8 @@
 
     public void initCombosForTestExclusiveQueueDeliversToOnlyOneConsumer() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
     }
     public void testExclusiveQueueDeliversToOnlyOneConsumer() throws Exception {
         
@@ -803,11 +803,11 @@
 
     public void initCombosForTestWildcardConsume() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE)} );
     }   
     
     public void testWildcardConsume() throws Exception {
@@ -850,11 +850,11 @@
 
     public void initCombosForTestCompositeConsume() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE)} );
     }   
     
     public void testCompositeConsume() throws Exception {
@@ -895,11 +895,11 @@
 
     public void initCombosForTestCompositeSend() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE)} );
     }   
     
     public void testCompositeSend() throws Exception {
@@ -964,8 +964,8 @@
 
     public void initCombosForTestConnectionCloseCascades() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destination", new Object[]{ 
                 new ActiveMQTopic("TEST"), 
                 new ActiveMQQueue("TEST")} );
@@ -1018,8 +1018,8 @@
     
     public void initCombosForTestSessionCloseCascades() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destination", new Object[]{ 
                 new ActiveMQTopic("TEST"), 
                 new ActiveMQQueue("TEST")} );
@@ -1072,8 +1072,8 @@
     
     public void initCombosForTestConsumerClose() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destination", new Object[]{ 
                 new ActiveMQTopic("TEST"), 
                 new ActiveMQQueue("TEST")} );
@@ -1125,8 +1125,8 @@
     }
     public void initCombosForTestTopicNoLocal() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
     }   
     
     public void testTopicNoLocal() throws Exception {
@@ -1192,8 +1192,8 @@
     
     public void initCombosForTopicDispatchIsBroadcast() {
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
     }   
     
     public void testTopicDispatchIsBroadcast() throws Exception {
@@ -1242,11 +1242,11 @@
     
     public void initCombosForTestQueueDispatchedAreRedeliveredOnConsumerClose() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 } );
     }   
     
@@ -1301,11 +1301,11 @@
     
     public void initCombosForTestQueueBrowseMessages() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 } );
     }   
     public void testQueueBrowseMessages() throws Exception {
@@ -1343,8 +1343,8 @@
      
     public void initCombosForTestQueueOnlyOnceDeliveryWith2Consumers() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
     }   
     public void testQueueOnlyOnceDeliveryWith2Consumers() throws Exception {
         
@@ -1397,11 +1397,11 @@
     
     public void initCombosForTestQueueSendThenAddConsumer() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 } );
     }   
     public void testQueueSendThenAddConsumer() throws Exception {
@@ -1432,11 +1432,11 @@
     
     public void initCombosForTestQueueAckRemovesMessage() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
                 } );
     }
     
@@ -1477,10 +1477,10 @@
             new ActiveMQTopic("TEST_TOPIC"), 
             new ActiveMQQueue("TEST_QUEUE")} );
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
     public void testSelectorSkipsMessages() throws Exception {
@@ -1518,13 +1518,13 @@
     
     public void initCombosForTestAddConsumerThenSend() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
     public void testAddConsumerThenSend() throws Exception {
@@ -1552,13 +1552,13 @@
 
     public void initCombosForTestConsumerPrefetchAtOne() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }    
     
     public void testConsumerPrefetchAtOne() throws Exception {
@@ -1591,13 +1591,13 @@
     
     public void initCombosForTestConsumerPrefetchAtTwo() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }    
 
     public void testConsumerPrefetchAtTwo() throws Exception {
@@ -1633,13 +1633,13 @@
     
     public void initCombosForTestConsumerPrefetchAndDeliveredAck() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-            new Integer(DeliveryMode.NON_PERSISTENT), 
-            new Integer(DeliveryMode.PERSISTENT)} );        
+            Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+            Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)} );
     }
     
     public void testConsumerPrefetchAndDeliveredAck() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java Mon Jun 25 03:45:55 2007
@@ -65,7 +65,7 @@
     /**
      * Setting this to false makes the test run faster but they may be less accurate.
      */
-    public static boolean FAST_NO_MESSAGE_LEFT_ASSERT = System.getProperty("FAST_NO_MESSAGE_LEFT_ASSERT", "true").equals("true");
+    public static final boolean FAST_NO_MESSAGE_LEFT_ASSERT = System.getProperty("FAST_NO_MESSAGE_LEFT_ASSERT", "true").equals("true");
 
     protected RegionBroker regionBroker;    
     protected BrokerService broker;    

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java Mon Jun 25 03:45:55 2007
@@ -54,13 +54,13 @@
     
     public void initCombosForTestMessagesWaitingForUssageDecreaseExpire() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE),
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE),
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
                 } );
     }
 
@@ -162,14 +162,14 @@
      */
     public void initCombosForTestMessagesInLongTransactionExpire() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                //new Integer(DeliveryMode.PERSISTENT)
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                //Integer.valueOf(DeliveryMode.PERSISTENT)
                 } );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)
                 } );
     }
     
@@ -232,25 +232,25 @@
 
     public void TestMessagesInSubscriptionPendingListExpire() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)
                 } );
     }
     
     public void initCombosForTestMessagesInSubscriptionPendingListExpire() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)} );        
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)} );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_QUEUE_TYPE), 
-                new Byte(ActiveMQDestination.TEMP_TOPIC_TYPE)
+                Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)
                 } );
     }
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubBroker.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubBroker.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/StubBroker.java Mon Jun 25 03:45:55 2007
@@ -58,7 +58,7 @@
         }
     }
     
-    public class RemoveConnectionData {
+    public static class RemoveConnectionData {
         public final ConnectionContext connectionContext;
         public final ConnectionInfo connectionInfo;
         public final Throwable error;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java Mon Jun 25 03:45:55 2007
@@ -92,7 +92,7 @@
 
     protected TextMessage createMessage(Session session, int i) throws JMSException {
         TextMessage textMessage = session.createTextMessage("message: " + i);
-        if (i % 2 == 1) {
+        if (i % 2 != 0) {
             textMessage.setStringProperty("odd", "yes");
         }
         textMessage.setIntProperty("i", i);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java Mon Jun 25 03:45:55 2007
@@ -46,12 +46,12 @@
     protected MessageProducer producer2;
     protected Destination consumerDestination2;
     BrokerService broker;
-    final int NMSG=100;
-    final int MSIZE=256000;
+    static final int NMSG=100;
+    static final int MSIZE=256000;
     private Connection connection3;
     private Session consumeSession3;
     private TopicSubscriber consumer3;
-    private final String countProperyName = "count";
+    private static final String countProperyName = "count";
 
     /**
      * Set up a durable suscriber test.

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQBytesMessageTest.java Mon Jun 25 03:45:55 2007
@@ -243,11 +243,11 @@
         try {
             msg.writeObject("fred");
             msg.writeObject(Boolean.TRUE);
-            msg.writeObject(new Character('q'));
-            msg.writeObject(new Byte((byte) 1));
-            msg.writeObject(new Short((short) 3));
-            msg.writeObject(new Integer(3));
-            msg.writeObject(new Long(300l));
+            msg.writeObject(Character.valueOf('q'));
+            msg.writeObject(Byte.valueOf((byte) 1));
+            msg.writeObject(Short.valueOf((short) 3));
+            msg.writeObject(Integer.valueOf(3));
+            msg.writeObject(Long.valueOf(300l));
             msg.writeObject(new Float(3.3f));
             msg.writeObject(new Double(3.3));
             msg.writeObject(new byte[3]);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java Mon Jun 25 03:45:55 2007
@@ -364,7 +364,7 @@
             msg.reset();
             assertTrue(msg.readLong() == test);
             msg.reset();
-            assertTrue(msg.readString().equals(new Long(test).toString()));
+            assertTrue(msg.readString().equals(Long.valueOf(test).toString()));
             msg.reset();
             try {
                 msg.readBoolean();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/SimpleNetworkTest.java Mon Jun 25 03:45:55 2007
@@ -61,6 +61,7 @@
     
     
     public void testRequestReply() throws Exception{
+        System.err.println("START TEST!");
         final MessageProducer remoteProducer=remoteSession.createProducer(null);
         MessageConsumer remoteConsumer=remoteSession.createConsumer(included);
         remoteConsumer.setMessageListener(new MessageListener(){
@@ -88,9 +89,11 @@
             assertNotNull(result);
             log.info(result.getText());
         }
+        System.err.println("FIN TEST!");
     }
 
-    public void testFiltering() throws Exception{
+    public void XtestFiltering() throws Exception{
+      
         MessageConsumer includedConsumer=remoteSession.createConsumer(included);
         MessageConsumer excludedConsumer=remoteSession.createConsumer(excluded);
         MessageProducer includedProducer=localSession.createProducer(included);
@@ -101,9 +104,10 @@
         excludedProducer.send(test);
         assertNull(excludedConsumer.receive(500));
         assertNotNull(includedConsumer.receive(500));
+        System.err.println("FIN TEST!");
     }
 
-    public void testConduitBridge() throws Exception{
+    public void XtestConduitBridge() throws Exception{
         MessageConsumer consumer1=remoteSession.createConsumer(included);
         MessageConsumer consumer2=remoteSession.createConsumer(included);
         MessageProducer producer=localSession.createProducer(included);
@@ -120,7 +124,7 @@
         assertNull(consumer2.receive(500));
     }
 
-    public void testDurableStoreAndForward() throws Exception{
+    public void XtestDurableStoreAndForward() throws Exception{
         // create a remote durable consumer
         MessageConsumer remoteConsumer=remoteSession.createDurableSubscriber(included,consumerName);
         Thread.sleep(1000);
@@ -165,19 +169,10 @@
     }
 
     protected void doSetUp() throws Exception{
-        Resource resource=new ClassPathResource(getRemoteBrokerURI());
-        BrokerFactoryBean factory=new BrokerFactoryBean(resource);
-        factory.afterPropertiesSet();
-        remoteBroker=factory.getBroker();
+        remoteBroker=createRemoteBroker();
         remoteBroker.start();
-        
-        resource=new ClassPathResource(getLocalBrokerURI());
-        factory=new BrokerFactoryBean(resource);
-        factory.afterPropertiesSet();
-        localBroker=factory.getBroker();
-        
+        localBroker=createLocalBroker();
         localBroker.start();
-        
         URI localURI=localBroker.getVmConnectorURI();
         ActiveMQConnectionFactory fac=new ActiveMQConnectionFactory(localURI);
         localConnection=fac.createConnection();
@@ -193,6 +188,7 @@
         localSession=localConnection.createSession(false,Session.AUTO_ACKNOWLEDGE);
         remoteSession=remoteConnection.createSession(false,Session.AUTO_ACKNOWLEDGE);
     }
+    
 
     protected String getRemoteBrokerURI() {
         return "org/apache/activemq/network/remoteBroker.xml";
@@ -200,5 +196,23 @@
 
     protected String getLocalBrokerURI() {
         return "org/apache/activemq/network/localBroker.xml";
+    }
+    
+    protected BrokerService createBroker(String URI) throws Exception {
+        Resource resource=new ClassPathResource(URI);
+        BrokerFactoryBean factory=new BrokerFactoryBean(resource);
+        resource=new ClassPathResource(URI);
+        factory=new BrokerFactoryBean(resource);
+        factory.afterPropertiesSet();
+        BrokerService result=factory.getBroker();
+        return result;
+    }
+    
+    protected BrokerService createLocalBroker() throws Exception {
+        return createBroker(getLocalBrokerURI());
+    }
+    
+    protected BrokerService createRemoteBroker() throws Exception {
+        return createBroker(getRemoteBrokerURI());
     }
 }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageTest.java Mon Jun 25 03:45:55 2007
@@ -39,7 +39,7 @@
 public class ActiveMQTextMessageTest extends ActiveMQMessageTest {
 
 
-    public static ActiveMQTextMessageTest SINGLETON = new ActiveMQTextMessageTest();
+    public static final ActiveMQTextMessageTest SINGLETON = new ActiveMQTextMessageTest();
 
     public Object createObject() throws Exception {
     		ActiveMQTextMessage info = new ActiveMQTextMessage();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerInfoTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerInfoTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/BrokerInfoTest.java Mon Jun 25 03:45:55 2007
@@ -39,7 +39,7 @@
 public class BrokerInfoTest extends BaseCommandTestSupport {
 
 
-    public static BrokerInfoTest SINGLETON = new BrokerInfoTest();
+    public static final BrokerInfoTest SINGLETON = new BrokerInfoTest();
 
     public Object createObject() throws Exception {
     		BrokerInfo info = new BrokerInfo();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageAckTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageAckTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageAckTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageAckTest.java Mon Jun 25 03:45:55 2007
@@ -39,7 +39,7 @@
 public class MessageAckTest extends BaseCommandTestSupport {
 
 
-    public static MessageAckTest SINGLETON = new MessageAckTest();
+    public static final MessageAckTest SINGLETON = new MessageAckTest();
 
     public Object createObject() throws Exception {
     		MessageAck info = new MessageAck();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java Mon Jun 25 03:45:55 2007
@@ -36,7 +36,7 @@
         
         answer.setPersistenceAdapter(adaptor);
         answer.addConnector(bindAddress);
-        answer.setDeleteAllMessagesOnStartup(true);
+        //answer.setDeleteAllMessagesOnStartup(true);
         
     }
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java Mon Jun 25 03:45:55 2007
@@ -43,7 +43,7 @@
     protected String DESTINATION_NAME=getClass().getName();
     protected int SAMPLE_COUNT=10;
     protected long SAMPLE_INTERVAL=1000;
-    protected int NUMBER_OF_CONSUMERS=1;
+    protected int NUMBER_OF_CONSUMERS=10;
     protected int NUMBER_OF_PRODUCERS=1;
     protected int PAYLOAD_SIZE=1024;
     protected byte[] array=null;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyConnectorTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyConnectorTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyConnectorTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/proxy/ProxyConnectorTest.java Mon Jun 25 03:45:55 2007
@@ -51,11 +51,11 @@
 
     public void initCombosForTestSendAndConsume() {
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)
+        		Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+        		Integer.valueOf(DeliveryMode.PERSISTENT)
                 } );        
         addCombinationValues( "destinationType", new Object[]{ 
-                new Byte(ActiveMQDestination.TOPIC_TYPE), 
+                Byte.valueOf(ActiveMQDestination.TOPIC_TYPE), 
                 } );
     }
     public void testSendAndConsume() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/LDAPAuthorizationMapTest.java Mon Jun 25 03:45:55 2007
@@ -48,7 +48,6 @@
  * 
  */
 public class LDAPAuthorizationMapTest extends TestCase {
-    private HashMap options;
     private LDAPAuthorizationMap authMap;
 
     protected void setUp() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleSecurityBrokerSystemTest.java Mon Jun 25 03:45:55 2007
@@ -104,7 +104,7 @@
         return new SimpleAuthorizationMap(writeAccess, readAccess, adminAccess);
     }
 
-    class SimpleAuthenticationFactory implements BrokerPlugin {
+    static class SimpleAuthenticationFactory implements BrokerPlugin {
         public Broker installPlugin(Broker broker) {
 
             HashMap u = new HashMap();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapMessageTest.java Mon Jun 25 03:45:55 2007
@@ -49,8 +49,8 @@
         Map map = (Map) mapMessage.getObject("mapField");
         assertNotNull(map);
         assertEquals("mapField.a", "foo", map.get("a"));
-        assertEquals("mapField.b", new Integer(23), map.get("b"));
-        assertEquals("mapField.c", new Long(45), map.get("c"));
+        assertEquals("mapField.b", Integer.valueOf(23), map.get("b"));
+        assertEquals("mapField.c", Long.valueOf(45), map.get("c"));
 
         value = map.get("d");
         assertTrue("mapField.d should be a Map", value instanceof Map);
@@ -84,8 +84,8 @@
 
         Map nestedMap = new HashMap();
         nestedMap.put("a", "foo");
-        nestedMap.put("b", new Integer(23));
-        nestedMap.put("c", new Long(45));
+        nestedMap.put("b", Integer.valueOf(23));
+        nestedMap.put("c", Long.valueOf(45));
         nestedMap.put("d", grandChildMap);
 
         answer.setObject("mapField", nestedMap);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/DummyMessageQuery.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/DummyMessageQuery.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/DummyMessageQuery.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/DummyMessageQuery.java Mon Jun 25 03:45:55 2007
@@ -34,7 +34,7 @@
     
     protected static final Log log = LogFactory.getLog(DummyMessageQuery.class);
 
-    public static int messageCount = 10;
+    public static final int messageCount = 10;
     
     public void execute(ActiveMQDestination destination, MessageListener listener) throws Exception {
         log.info("Initial query is creating: " + messageCount + " messages");

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java Mon Jun 25 03:45:55 2007
@@ -54,8 +54,8 @@
     protected Destination destination;
     protected boolean topic = true;
     protected AtomicInteger receivedMessageCount = new AtomicInteger(0);
-    protected static int MESSAGE_COUNT = 50;
-    protected static int NUMBER_IN_CLUSTER = 3;
+    protected static final int MESSAGE_COUNT = 50;
+    protected static final int NUMBER_IN_CLUSTER = 3;
     protected int deliveryMode = DeliveryMode.NON_PERSISTENT;
     protected MessageProducer[] producers;
     protected Connection[] connections;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransportBrokerTest.java Mon Jun 25 03:45:55 2007
@@ -47,8 +47,8 @@
 
     public void initCombosForTestPublisherFailsOver() {    
         addCombinationValues( "deliveryMode", new Object[]{ 
-                new Integer(DeliveryMode.NON_PERSISTENT), 
-                new Integer(DeliveryMode.PERSISTENT)
+                Integer.valueOf(DeliveryMode.NON_PERSISTENT), 
+                Integer.valueOf(DeliveryMode.PERSISTENT)
                 } );        
         addCombinationValues( "destination", new Object[]{ 
                 new ActiveMQQueue("TEST"), 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/fanout/FanoutTransportBrokerTest.java Mon Jun 25 03:45:55 2007
@@ -61,8 +61,8 @@
     }
 
     public void initCombosForTestPublisherFansout() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+        		Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("destination", new Object[] { new ActiveMQQueue("TEST"), new ActiveMQTopic("TEST"), });
     }
 
@@ -109,8 +109,8 @@
 
     
     public void initCombosForTestPublisherWaitsForServerToBeUp() {
-        addCombinationValues("deliveryMode", new Object[] { new Integer(DeliveryMode.NON_PERSISTENT),
-                new Integer(DeliveryMode.PERSISTENT) });
+        addCombinationValues("deliveryMode", new Object[] { Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                Integer.valueOf(DeliveryMode.PERSISTENT) });
         addCombinationValues("destination", new Object[] { new ActiveMQQueue("TEST"), new ActiveMQTopic("TEST"), });
     }
     public void testPublisherWaitsForServerToBeUp() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/peer/PeerTransportTest.java Mon Jun 25 03:45:55 2007
@@ -48,8 +48,8 @@
     protected Log log = LogFactory.getLog(getClass());
     protected ActiveMQDestination destination;
     protected boolean topic = true;
-    protected static int MESSAGE_COUNT = 50;
-    protected static int NUMBER_IN_CLUSTER = 3;
+    protected static final int MESSAGE_COUNT = 50;
+    protected static final int NUMBER_IN_CLUSTER = 3;
     protected int deliveryMode = DeliveryMode.NON_PERSISTENT;
     protected MessageProducer[] producers;
     protected Connection[] connections;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/InactivityMonitorTest.java Mon Jun 25 03:45:55 2007
@@ -204,8 +204,8 @@
         
         startClient();
 
-        addCombinationValues("clientInactivityLimit", new Object[] { new Long(1000)});
-        addCombinationValues("serverInactivityLimit", new Object[] { new Long(1000)});
+        addCombinationValues("clientInactivityLimit", new Object[] { Long.valueOf(1000)});
+        addCombinationValues("serverInactivityLimit", new Object[] { Long.valueOf(1000)});
         addCombinationValues("serverRunOnCommand", new Object[] { new Runnable() {
                 public void run() {
                     try {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/tcp/SslTransportTest.java Mon Jun 25 03:45:55 2007
@@ -37,7 +37,6 @@
 public class SslTransportTest extends TestCase {
     
     SSLSocket sslSocket;
-    SslTransport transport;    
     StubTransportListener stubListener;
     
     String username;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQDeadlockTestW4Brokers.java Mon Jun 25 03:45:55 2007
@@ -241,7 +241,7 @@
         return acf;
     }
 
-    private class TestMessageListener1 implements MessageListener {
+    private static class TestMessageListener1 implements MessageListener {
         private final long waitTime;
         final AtomicInteger count = new AtomicInteger(0);
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/AMQFailoverIssue.java Mon Jun 25 03:45:55 2007
@@ -174,7 +174,7 @@
         }
     }
 
-    private class PooledProducerTask implements Runnable{
+    private static class PooledProducerTask implements Runnable{
 
         private final String queueName;
         private final PooledConnectionFactory pcf;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java Mon Jun 25 03:45:55 2007
@@ -49,7 +49,7 @@
         HashMap map = new HashMap();
         ObjectMessage message = publisherSession.createObjectMessage();
         for (int i = 0;i < COUNT;i++) {
-            map.put(VALUE_NAME, new Integer(i));
+            map.put(VALUE_NAME, Integer.valueOf(i));
             message.setObject(map);
             producer.send(message);
             assertTrue(message.getObject()==map);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java?view=diff&rev=550449&r1=550448&r2=550449
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java Mon Jun 25 03:45:55 2007
@@ -45,7 +45,7 @@
         super(n);
     }
     
-    protected void setup() throws Exception{
+    protected void setUp() throws Exception{
         super.setUp();
         topic = true;
     }



Mime
View raw message