activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r563982 [29/32] - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/ main/java/org/apache/activemq/advisory/ main/java/org/apache/activemq/blob/ main/java/org/apache/activemq/broker/ main/java/org/apache/activemq/broker/jm...
Date Wed, 08 Aug 2007 18:58:13 GMT
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=563982&r1=563981&r2=563982
==============================================================================
--- 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 Wed Aug  8 11:56:59 2007
@@ -81,7 +81,8 @@
     }
 
     protected ConnectionFactory createConnectionFactory() throws URISyntaxException, IOException {
-        return new ActiveMQConnectionFactory(((TransportConnector)broker.getTransportConnectors().get(0)).getServer().getConnectURI());
+        return new ActiveMQConnectionFactory(((TransportConnector)broker.getTransportConnectors().get(0))
+            .getServer().getConnectURI());
     }
 
     public ActiveMQDestination destination;
@@ -93,18 +94,22 @@
     public int messageSize = 1024;
 
     public void initCombosForTestSendReceive() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
-        addCombinationValues("destinationType", new Object[] {Byte.valueOf(ActiveMQDestination.TOPIC_TYPE),});
-        addCombinationValues("durableConsumer", new Object[] {Boolean.TRUE,});
-        addCombinationValues("messageSize", new Object[] {Integer.valueOf(101), Integer.valueOf(102), Integer.valueOf(103), Integer.valueOf(104), Integer.valueOf(105),
-                                                          Integer.valueOf(106), Integer.valueOf(107), Integer.valueOf(108),});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("destinationType", new Object[] {Byte.valueOf(ActiveMQDestination.TOPIC_TYPE)});
+        addCombinationValues("durableConsumer", new Object[] {Boolean.TRUE});
+        addCombinationValues("messageSize", new Object[] {Integer.valueOf(101), Integer.valueOf(102),
+                                                          Integer.valueOf(103), Integer.valueOf(104),
+                                                          Integer.valueOf(105), Integer.valueOf(106),
+                                                          Integer.valueOf(107), Integer.valueOf(108)});
     }
 
     public void testSendReceive() throws Exception {
 
         // Durable consumer combination is only valid with topics
-        if (durableConsumer && destinationType != ActiveMQDestination.TOPIC_TYPE)
+        if (durableConsumer && destinationType != ActiveMQDestination.TOPIC_TYPE) {
             return;
+        }
 
         connection.setClientID(getName());
         connection.getPrefetchPolicy().setAll(1000);
@@ -114,7 +119,8 @@
         destination = createDestination(session, destinationType);
         MessageConsumer consumer;
         if (durableConsumer) {
-            consumer = session.createDurableSubscriber((Topic)destination, "sub1:" + System.currentTimeMillis());
+            consumer = session.createDurableSubscriber((Topic)destination, "sub1:"
+                                                                           + System.currentTimeMillis());
         } else {
             consumer = session.createConsumer(destination);
         }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ProducerFlowControlTest.java Wed Aug  8 11:56:59 2007
@@ -163,8 +163,9 @@
         while (true) {
             Thread.sleep(1000);
             // the producer is blocked once the done flag stays true.
-            if (done.get())
+            if (done.get()) {
                 break;
+            }
             done.set(true);
         }
         keepGoing.set(false);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java Wed Aug  8 11:56:59 2007
@@ -37,18 +37,18 @@
 
         // now lets create another which should fail
         for (int i = 1; i < 11; i++) {
-        Connection connection2 = connectionFactory.createConnection();
-        try {
-            useConnection(connection2);
-            fail("Should have thrown InvalidClientIDException on attempt" + i);
-        }
-        catch (InvalidClientIDException e) {
-            connection2.close();
-            LOG.info("Caught expected: " + e);
-        }
+            Connection connection2 = connectionFactory.createConnection();
+            try {
+                useConnection(connection2);
+                fail("Should have thrown InvalidClientIDException on attempt" + i);
+            } catch (InvalidClientIDException e) {
+                connection2.close();
+                LOG.info("Caught expected: " + e);
+            }
         }
 
-        // now lets try closing the original connection and creating a new connection with the same ID
+        // now lets try closing the original connection and creating a new
+        // connection with the same ID
         connection.close();
         connection = connectionFactory.createConnection();
         useConnection(connection);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java Wed Aug  8 11:56:59 2007
@@ -16,8 +16,10 @@
  */
 package org.apache.activemq.broker;
 
-import junit.framework.Test;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicInteger;
 
+import junit.framework.Test;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
@@ -30,9 +32,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * BrokerBenchmark is used to get an idea of the raw performance of a broker.
  * Since the broker data structures using in message dispatching are under high
@@ -55,18 +54,18 @@
     public boolean deliveryMode;
 
     public void initCombosForTestPerformance() {
-        addCombinationValues("destination", new Object[] {new ActiveMQQueue("TEST"), new ActiveMQTopic("TEST")});
+        addCombinationValues("destination", new Object[] {new ActiveMQQueue("TEST"),
+                                                          new ActiveMQTopic("TEST")});
         addCombinationValues("PRODUCER_COUNT", new Object[] {new Integer("1"), new Integer("10")});
         addCombinationValues("CONSUMER_COUNT", new Object[] {new Integer("1"), new Integer("10")});
         addCombinationValues("CONSUMER_COUNT", new Object[] {new Integer("1"), new Integer("10")});
-        addCombinationValues("deliveryMode", new Object[] {
-        // Boolean.FALSE,
-                             Boolean.TRUE});
+        addCombinationValues("deliveryMode", new Object[] {Boolean.TRUE});
     }
 
     public void testPerformance() throws Exception {
 
-        log.info("Running Benchmark for destination=" + destination + ", producers=" + PRODUCER_COUNT + ", consumers=" + CONSUMER_COUNT + ", deliveryMode=" + deliveryMode);
+        log.info("Running Benchmark for destination=" + destination + ", producers=" + PRODUCER_COUNT
+                 + ", consumers=" + CONSUMER_COUNT + ", deliveryMode=" + deliveryMode);
         final int CONSUME_COUNT = destination.isTopic() ? CONSUMER_COUNT * PRODUCE_COUNT : PRODUCE_COUNT;
 
         final Semaphore consumersStarted = new Semaphore(1 - (CONSUMER_COUNT));
@@ -122,7 +121,8 @@
                             }
 
                             if (msg != null) {
-                                connection.send(createAck(consumerInfo, msg, counter, MessageAck.STANDARD_ACK_TYPE));
+                                connection.send(createAck(consumerInfo, msg, counter,
+                                                          MessageAck.STANDARD_ACK_TYPE));
                             } else if (receiveCounter.get() < CONSUME_COUNT) {
                                 log.info("Consumer stall, waiting for message #" + receiveCounter.get() + 1);
                             }
@@ -179,7 +179,8 @@
         consumersFinished.acquire();
         long end2 = System.currentTimeMillis();
 
-        log.info("Results for destination=" + destination + ", producers=" + PRODUCER_COUNT + ", consumers=" + CONSUMER_COUNT + ", deliveryMode=" + deliveryMode);
+        log.info("Results for destination=" + destination + ", producers=" + PRODUCER_COUNT + ", consumers="
+                 + CONSUMER_COUNT + ", deliveryMode=" + deliveryMode);
         log.info("Produced at messages/sec: " + (PRODUCE_COUNT * 1000.0 / (end1 - start)));
         log.info("Consumed at messages/sec: " + (CONSUME_COUNT * 1000.0 / (end2 - start)));
         profilerPause("Benchmark done.  Stop profiler ");

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java Wed Aug  8 11:56:59 2007
@@ -16,61 +16,61 @@
  */
 package org.apache.activemq.broker;
 
-import org.apache.activemq.network.NetworkConnector;
-
 import junit.framework.TestCase;
+import org.apache.activemq.network.NetworkConnector;
 
 /**
- * Tests for the BrokerService class 
+ * Tests for the BrokerService class
+ * 
  * @author chirino
  */
 public class BrokerServiceTest extends TestCase {
 
-	public void testAddRemoveTransportsWithJMX() throws Exception {
-		BrokerService service = new BrokerService();
-		service.setUseJmx(true);
-		service.setPersistent(false);
-		TransportConnector connector = service.addConnector("tcp://localhost:0");
-		service.start();
-		
-		service.removeConnector(connector);
-		connector.stop();
-		service.stop();
-	}
-	
-	public void testAddRemoveTransportsWithoutJMX() throws Exception {
-		BrokerService service = new BrokerService();
-		service.setPersistent(false);
-		service.setUseJmx(false);
-		TransportConnector connector = service.addConnector("tcp://localhost:0");
-		service.start();
-		
-		service.removeConnector(connector);
-		connector.stop();
-		service.stop();
-	}
-	
-	public void testAddRemoveNetworkWithJMX() throws Exception {
-		BrokerService service = new BrokerService();
-		service.setPersistent(false);
-		service.setUseJmx(true);
-		NetworkConnector connector = service.addNetworkConnector("multicast://default");
-		service.start();
-		
-		service.removeNetworkConnector(connector);
-		connector.stop();
-		service.stop();
-	}
-	
-	public void testAddRemoveNetworkWithoutJMX() throws Exception {
-		BrokerService service = new BrokerService();
-		service.setPersistent(false);
-		service.setUseJmx(false);
-		NetworkConnector connector = service.addNetworkConnector("multicast://default");
-		service.start();
-		
-		service.removeNetworkConnector(connector);
-		connector.stop();
-		service.stop();
-	}
+    public void testAddRemoveTransportsWithJMX() throws Exception {
+        BrokerService service = new BrokerService();
+        service.setUseJmx(true);
+        service.setPersistent(false);
+        TransportConnector connector = service.addConnector("tcp://localhost:0");
+        service.start();
+
+        service.removeConnector(connector);
+        connector.stop();
+        service.stop();
+    }
+
+    public void testAddRemoveTransportsWithoutJMX() throws Exception {
+        BrokerService service = new BrokerService();
+        service.setPersistent(false);
+        service.setUseJmx(false);
+        TransportConnector connector = service.addConnector("tcp://localhost:0");
+        service.start();
+
+        service.removeConnector(connector);
+        connector.stop();
+        service.stop();
+    }
+
+    public void testAddRemoveNetworkWithJMX() throws Exception {
+        BrokerService service = new BrokerService();
+        service.setPersistent(false);
+        service.setUseJmx(true);
+        NetworkConnector connector = service.addNetworkConnector("multicast://default");
+        service.start();
+
+        service.removeNetworkConnector(connector);
+        connector.stop();
+        service.stop();
+    }
+
+    public void testAddRemoveNetworkWithoutJMX() throws Exception {
+        BrokerService service = new BrokerService();
+        service.setPersistent(false);
+        service.setUseJmx(false);
+        NetworkConnector connector = service.addNetworkConnector("multicast://default");
+        service.start();
+
+        service.removeNetworkConnector(connector);
+        connector.stop();
+        service.stop();
+    }
 }

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=563982&r1=563981&r2=563982
==============================================================================
--- 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 Wed Aug  8 11:56:59 2007
@@ -45,7 +45,8 @@
     public boolean durableConsumer;
 
     public void initCombosForTestQueueOnlyOnceDeliveryWith2Consumers() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
     }
 
     public void testQueueOnlyOnceDeliveryWith2Consumers() throws Exception {
@@ -98,7 +99,8 @@
     }
 
     public void initCombosForTestQueuBrowserWith2Consumers() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
     }
 
     /**
@@ -167,8 +169,11 @@
         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)});
+        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 testConsumerPrefetchAndStandardAck() throws Exception {
@@ -214,9 +219,13 @@
     }
 
     public void initCombosForTestTransactedAckWithPrefetchOfOne() {
-        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)});
+        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 testTransactedAckWithPrefetchOfOne() throws Exception {
@@ -262,9 +271,13 @@
     }
 
     public void initCombosForTestTransactedSend() {
-        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)});
+        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 testTransactedSend() throws Exception {
@@ -312,8 +325,11 @@
     }
 
     public void initCombosForTestQueueTransactedAck() {
-        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.TEMP_QUEUE_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.TEMP_QUEUE_TYPE)});
     }
 
     public void testQueueTransactedAck() throws Exception {
@@ -360,7 +376,8 @@
     }
 
     public void initCombosForTestConsumerCloseCausesRedelivery() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
         addCombinationValues("destination", new Object[] {new ActiveMQQueue("TEST")});
     }
 
@@ -470,7 +487,8 @@
     }
 
     public void initCombosForTestGroupedMessagesDeliveredToOnlyOneConsumer() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
     }
 
     public void testGroupedMessagesDeliveredToOnlyOneConsumer() throws Exception {
@@ -531,7 +549,8 @@
     }
 
     public void initCombosForTestTopicConsumerOnlySeeMessagesAfterCreation() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
         addCombinationValues("durableConsumer", new Object[] {Boolean.TRUE, Boolean.FALSE});
     }
 
@@ -575,7 +594,8 @@
     }
 
     public void initCombosForTestTopicRetroactiveConsumerSeeMessagesBeforeCreation() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
         addCombinationValues("durableConsumer", new Object[] {Boolean.TRUE, Boolean.FALSE});
     }
 
@@ -723,8 +743,11 @@
     // }
 
     public void initCombosForTestTempDestinationsOnlyAllowsLocalConsumers() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
-        addCombinationValues("destinationType", new Object[] {Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE), Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("destinationType",
+                             new Object[] {Byte.valueOf(ActiveMQDestination.TEMP_QUEUE_TYPE),
+                                           Byte.valueOf(ActiveMQDestination.TEMP_TOPIC_TYPE)});
     }
 
     public void testTempDestinationsOnlyAllowsLocalConsumers() throws Exception {
@@ -762,7 +785,8 @@
     }
 
     public void initCombosForTestExclusiveQueueDeliversToOnlyOneConsumer() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
     }
 
     public void testExclusiveQueueDeliversToOnlyOneConsumer() throws Exception {
@@ -826,8 +850,10 @@
     }
 
     public void initCombosForTestWildcardConsume() {
-        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)});
+        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)});
     }
 
     public void testWildcardConsume() throws Exception {
@@ -842,14 +868,19 @@
         connection1.send(producerInfo1);
 
         // setup the wildcard consumer.
-        ActiveMQDestination compositeDestination = ActiveMQDestination.createDestination("WILD.*.TEST", destinationType);
+        ActiveMQDestination compositeDestination = ActiveMQDestination.createDestination("WILD.*.TEST",
+                                                                                         destinationType);
         ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, compositeDestination);
         consumerInfo1.setPrefetchSize(100);
         connection1.send(consumerInfo1);
 
         // These two message should NOT match the wild card.
-        connection1.send(createMessage(producerInfo1, ActiveMQDestination.createDestination("WILD.CARD", destinationType), deliveryMode));
-        connection1.send(createMessage(producerInfo1, ActiveMQDestination.createDestination("WILD.TEST", destinationType), deliveryMode));
+        connection1.send(createMessage(producerInfo1, ActiveMQDestination.createDestination("WILD.CARD",
+                                                                                            destinationType),
+                                       deliveryMode));
+        connection1.send(createMessage(producerInfo1, ActiveMQDestination.createDestination("WILD.TEST",
+                                                                                            destinationType),
+                                       deliveryMode));
 
         // These two message should match the wild card.
         ActiveMQDestination d1 = ActiveMQDestination.createDestination("WILD.CARD.TEST", destinationType);
@@ -869,8 +900,10 @@
     }
 
     public void initCombosForTestCompositeConsume() {
-        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)});
+        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)});
     }
 
     public void testCompositeConsume() throws Exception {
@@ -885,7 +918,8 @@
         connection1.send(producerInfo1);
 
         // setup the composite consumer.
-        ActiveMQDestination compositeDestination = ActiveMQDestination.createDestination("A,B", destinationType);
+        ActiveMQDestination compositeDestination = ActiveMQDestination.createDestination("A,B",
+                                                                                         destinationType);
         ConsumerInfo consumerInfo1 = createConsumerInfo(sessionInfo1, compositeDestination);
         consumerInfo1.setRetroactive(true);
         consumerInfo1.setPrefetchSize(100);
@@ -910,8 +944,10 @@
     }
 
     public void initCombosForTestCompositeSend() {
-        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)});
+        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)});
     }
 
     public void testCompositeSend() throws Exception {
@@ -945,7 +981,8 @@
         connection2.send(consumerInfo2);
 
         // Send the messages to the composite destination.
-        ActiveMQDestination compositeDestination = ActiveMQDestination.createDestination("A,B", destinationType);
+        ActiveMQDestination compositeDestination = ActiveMQDestination.createDestination("A,B",
+                                                                                         destinationType);
         for (int i = 0; i < 4; i++) {
             connection1.send(createMessage(producerInfo1, compositeDestination, deliveryMode));
         }
@@ -976,8 +1013,10 @@
     }
 
     public void initCombosForTestConnectionCloseCascades() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
-        addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST"), new ActiveMQQueue("TEST")});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST"),
+                                                          new ActiveMQQueue("TEST")});
     }
 
     public void testConnectionCloseCascades() throws Exception {
@@ -1026,8 +1065,10 @@
     }
 
     public void initCombosForTestSessionCloseCascades() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
-        addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST"), new ActiveMQQueue("TEST")});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST"),
+                                                          new ActiveMQQueue("TEST")});
     }
 
     public void testSessionCloseCascades() throws Exception {
@@ -1076,8 +1117,10 @@
     }
 
     public void initCombosForTestConsumerClose() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
-        addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST"), new ActiveMQQueue("TEST")});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST"),
+                                                          new ActiveMQQueue("TEST")});
     }
 
     public void testConsumerClose() throws Exception {
@@ -1126,7 +1169,8 @@
     }
 
     public void initCombosForTestTopicNoLocal() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
     }
 
     public void testTopicNoLocal() throws Exception {
@@ -1191,7 +1235,8 @@
     }
 
     public void initCombosForTopicDispatchIsBroadcast() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT), Integer.valueOf(DeliveryMode.PERSISTENT)});
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
+                                                           Integer.valueOf(DeliveryMode.PERSISTENT)});
     }
 
     public void testTopicDispatchIsBroadcast() throws Exception {
@@ -1239,8 +1284,11 @@
     }
 
     public void initCombosForTestQueueDispatchedAreRedeliveredOnConsumerClose() {
-        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.TEMP_QUEUE_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.TEMP_QUEUE_TYPE)});
     }
 
     public void testQueueDispatchedAreRedeliveredOnConsumerClose() throws Exception {
@@ -1293,8 +1341,11 @@
     }
 
     public void initCombosForTestQueueBrowseMessages() {
-        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.TEMP_QUEUE_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.TEMP_QUEUE_TYPE)});
     }
 
     public void testQueueBrowseMessages() throws Exception {
@@ -1330,8 +1381,11 @@
     }
 
     public void initCombosForTestQueueSendThenAddConsumer() {
-        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.TEMP_QUEUE_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.TEMP_QUEUE_TYPE)});
     }
 
     public void testQueueSendThenAddConsumer() throws Exception {
@@ -1361,8 +1415,11 @@
     }
 
     public void initCombosForTestQueueAckRemovesMessage() {
-        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.TEMP_QUEUE_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.TEMP_QUEUE_TYPE)});
     }
 
     public void testQueueAckRemovesMessage() throws Exception {
@@ -1399,9 +1456,13 @@
     }
 
     public void initCombosForTestSelectorSkipsMessages() {
-        addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST_TOPIC"), new ActiveMQQueue("TEST_QUEUE")});
-        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)});
+        addCombinationValues("destination", new Object[] {new ActiveMQTopic("TEST_TOPIC"),
+                                                          new ActiveMQQueue("TEST_QUEUE")});
+        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 testSelectorSkipsMessages() throws Exception {
@@ -1439,9 +1500,13 @@
     }
 
     public void initCombosForTestAddConsumerThenSend() {
-        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)});
+        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 testAddConsumerThenSend() throws Exception {
@@ -1468,9 +1533,13 @@
     }
 
     public void initCombosForTestConsumerPrefetchAtOne() {
-        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)});
+        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 testConsumerPrefetchAtOne() throws Exception {
@@ -1502,9 +1571,13 @@
     }
 
     public void initCombosForTestConsumerPrefetchAtTwo() {
-        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)});
+        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 testConsumerPrefetchAtTwo() throws Exception {
@@ -1539,9 +1612,13 @@
     }
 
     public void initCombosForTestConsumerPrefetchAndDeliveredAck() {
-        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)});
+        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 testConsumerPrefetchAndDeliveredAck() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java Wed Aug  8 11:56:59 2007
@@ -50,7 +50,7 @@
     }
 
     public void initCombosForTestDoubleSubscription() {
-        addCombinationValues("destination", new Object[] {new ActiveMQQueue("TEST"), new ActiveMQQueue("TEST"),});
+        addCombinationValues("destination", new Object[] {new ActiveMQQueue("TEST"), new ActiveMQQueue("TEST")});
     }
 
     public void testDoubleSubscription() throws Exception {

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=563982&r1=563981&r2=563982
==============================================================================
--- 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 Wed Aug  8 11:56:59 2007
@@ -19,7 +19,8 @@
 import javax.jms.DeliveryMode;
 
 import junit.framework.Test;
-
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ConnectionInfo;
 import org.apache.activemq.command.ConsumerInfo;
@@ -28,11 +29,6 @@
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.SessionInfo;
-import org.apache.activemq.broker.region.policy.FixedCountSubscriptionRecoveryPolicy;
-import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.activemq.broker.region.policy.PolicyEntry;
-import org.apache.activemq.broker.region.policy.RoundRobinDispatchPolicy;
-import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
 
 public class MessageExpirationTest extends BrokerTestSupport {
 
@@ -152,9 +148,7 @@
      * DeliveryMode.PERSISTENT test combination for now.
      */
     public void initCombosForTestMessagesInLongTransactionExpire() {
-        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_PERSISTENT),
-        // Integer.valueOf(DeliveryMode.PERSISTENT)
-                             });
+        addCombinationValues("deliveryMode", new Object[] {Integer.valueOf(DeliveryMode.NON_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)});
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java Wed Aug  8 11:56:59 2007
@@ -26,28 +26,28 @@
 /**
  * @version $Revision: 1.3 $
  */
-public class CursorDurableTest extends CursorSupport{
+public class CursorDurableTest extends CursorSupport {
 
-    protected Destination getDestination(Session session) throws JMSException{
+    protected Destination getDestination(Session session) throws JMSException {
         String topicName = getClass().getName();
         return session.createTopic(topicName);
     }
 
-    protected Connection getConsumerConnection(ConnectionFactory fac) throws JMSException{
-        Connection connection=fac.createConnection();
+    protected Connection getConsumerConnection(ConnectionFactory fac) throws JMSException {
+        Connection connection = fac.createConnection();
         connection.setClientID("testConsumer");
         connection.start();
         return connection;
     }
 
-    protected MessageConsumer getConsumer(Connection connection) throws Exception{
-        Session consumerSession=connection.createSession(false,Session.AUTO_ACKNOWLEDGE);
-        Topic topic=(Topic)getDestination(consumerSession);
-        MessageConsumer consumer=consumerSession.createDurableSubscriber(topic,"testConsumer");
+    protected MessageConsumer getConsumer(Connection connection) throws Exception {
+        Session consumerSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Topic topic = (Topic)getDestination(consumerSession);
+        MessageConsumer consumer = consumerSession.createDurableSubscriber(topic, "testConsumer");
         return consumer;
     }
-    
-    protected void configureBroker(BrokerService answer) throws Exception{
+
+    protected void configureBroker(BrokerService answer) throws Exception {
         answer.setDeleteAllMessagesOnStartup(true);
         answer.addConnector(bindAddress);
         answer.setDeleteAllMessagesOnStartup(true);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQDestinationTest.java Wed Aug  8 11:56:59 2007
@@ -29,58 +29,54 @@
 public class ActiveMQDestinationTest extends DataStructureTestSupport {
 
     public ActiveMQDestination destination;
-    
+
     public void initCombosForTestDesintaionMarshaling() {
-        addCombinationValues("destination", new Object[]{
-                new ActiveMQQueue("TEST"),
-                new ActiveMQTopic("TEST"),
-                new ActiveMQTempQueue("TEST:1"),
-                new ActiveMQTempTopic("TEST:1"),
-                new ActiveMQTempQueue("TEST"),
-                new ActiveMQTempTopic("TEST"),
-                new ActiveMQQueue("TEST?option=value"),
-                new ActiveMQTopic("TEST?option=value"),
-                new ActiveMQTempQueue("TEST:1?option=value"),
-                new ActiveMQTempTopic("TEST:1?option=value"),
-        });
+        addCombinationValues("destination", new Object[] {new ActiveMQQueue("TEST"),
+                                                          new ActiveMQTopic("TEST"),
+                                                          new ActiveMQTempQueue("TEST:1"),
+                                                          new ActiveMQTempTopic("TEST:1"),
+                                                          new ActiveMQTempQueue("TEST"),
+                                                          new ActiveMQTempTopic("TEST"),
+                                                          new ActiveMQQueue("TEST?option=value"),
+                                                          new ActiveMQTopic("TEST?option=value"),
+                                                          new ActiveMQTempQueue("TEST:1?option=value"),
+                                                          new ActiveMQTempTopic("TEST:1?option=value")});
     }
-    
+
     public void testDesintaionMarshaling() throws IOException {
         assertBeanMarshalls(destination);
     }
-    
+
     public void initCombosForTestDesintaionOptions() {
-        addCombinationValues("destination", new Object[]{
-                new ActiveMQQueue("TEST?k1=v1&k2=v2"),
-                new ActiveMQTopic("TEST?k1=v1&k2=v2"),
-                new ActiveMQTempQueue("TEST:1?k1=v1&k2=v2"),
-                new ActiveMQTempTopic("TEST:1?k1=v1&k2=v2"),
-        });
+        addCombinationValues("destination", new Object[] {new ActiveMQQueue("TEST?k1=v1&k2=v2"),
+                                                          new ActiveMQTopic("TEST?k1=v1&k2=v2"),
+                                                          new ActiveMQTempQueue("TEST:1?k1=v1&k2=v2"),
+                                                          new ActiveMQTempTopic("TEST:1?k1=v1&k2=v2"),});
     }
-    
+
     public void testDesintaionOptions() throws IOException {
         Map options = destination.getOptions();
         assertNotNull(options);
         assertEquals("v1", options.get("k1"));
         assertEquals("v2", options.get("k2"));
     }
-    
+
     public void testSorting() throws Exception {
         SortedSet set = new TreeSet();
-        ActiveMQDestination[] destinations = { new ActiveMQQueue("A"), new ActiveMQQueue("B"), new ActiveMQTopic("A"), new ActiveMQTopic("B") };
+        ActiveMQDestination[] destinations = {new ActiveMQQueue("A"), new ActiveMQQueue("B"),
+                                              new ActiveMQTopic("A"), new ActiveMQTopic("B")};
         List expected = Arrays.asList(destinations);
         set.addAll(expected);
         List actual = new ArrayList(set);
         assertEquals("Sorted order", expected, actual);
     }
-    
-   
+
     public static Test suite() {
         return suite(ActiveMQDestinationTest.class);
     }
-    
+
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
     }
-    
+
 }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/ForwardingBridgeTest.java Wed Aug  8 11:56:59 2007
@@ -27,28 +27,25 @@
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.SessionInfo;
 
-
 public class ForwardingBridgeTest extends NetworkTestSupport {
-    
+
     public ActiveMQDestination destination;
     public byte destinationType;
     public int deliveryMode;
     private ForwardingBridge bridge;
 
-    public void initCombosForTestAddConsumerThenSend() {    
-        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), 
-                } );
-    }    
+    public void initCombosForTestAddConsumerThenSend() {
+        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),});
+    }
+
     public void testAddConsumerThenSend() throws Exception {
-        // Start a producer on local broker 
+        // Start a producer on local broker
         StubConnection connection1 = createConnection();
         ConnectionInfo connectionInfo1 = createConnectionInfo();
-        SessionInfo sessionInfo1 = createSessionInfo(connectionInfo1);        
+        SessionInfo sessionInfo1 = createSessionInfo(connectionInfo1);
         ProducerInfo producerInfo = createProducerInfo(sessionInfo1);
         connection1.send(connectionInfo1);
         connection1.send(sessionInfo1);
@@ -59,10 +56,10 @@
         // Start a consumer on a remote broker
         StubConnection connection2 = createRemoteConnection();
         ConnectionInfo connectionInfo2 = createConnectionInfo();
-        SessionInfo sessionInfo2 = createSessionInfo(connectionInfo2);        
+        SessionInfo sessionInfo2 = createSessionInfo(connectionInfo2);
         connection2.send(connectionInfo2);
         connection2.send(sessionInfo2);
-        ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo2, destination);        
+        ConsumerInfo consumerInfo = createConsumerInfo(sessionInfo2, destination);
         connection2.send(consumerInfo);
         Thread.sleep(1000);
         // Give forwarding bridge a chance to finish setting up
@@ -71,33 +68,33 @@
         } catch (InterruptedException ie) {
             ie.printStackTrace();
         }
-        
+
         // Send the message to the local boker.
         connection1.send(createMessage(producerInfo, destination, deliveryMode));
-        
+
         // Make sure the message was delivered via the remote.
-        
+
         Message m = receiveMessage(connection2);
         assertNotNull(m);
     }
-    
+
     protected void setUp() throws Exception {
         super.setUp();
         bridge = new ForwardingBridge(createTransport(), createRemoteTransport());
         bridge.setClientId("local-remote-bridge");
         bridge.setDispatchAsync(false);
-        bridge.start();        
+        bridge.start();
     }
-    
+
     protected void tearDown() throws Exception {
         bridge.stop();
         super.tearDown();
     }
-    
+
     public static Test suite() {
         return suite(ForwardingBridgeTest.class);
     }
-    
+
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/MulticastNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/MulticastNetworkTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/MulticastNetworkTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/MulticastNetworkTest.java Wed Aug  8 11:56:59 2007
@@ -17,7 +17,6 @@
 package org.apache.activemq.network;
 
 /**
- *
  * @version $Revision$
  */
 public class MulticastNetworkTest extends SimpleNetworkTest {
@@ -29,4 +28,4 @@
     protected String getLocalBrokerURI() {
         return "org/apache/activemq/network/multicast/localBroker.xml";
     }
-    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/SSHTunnelNetworkReconnectTest.java Wed Aug  8 11:56:59 2007
@@ -40,11 +40,13 @@
     ArrayList processes = new ArrayList();
 
     protected BrokerService createFirstBroker() throws Exception {
-        return BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/network/ssh-reconnect-broker1.xml"));
+        return BrokerFactory
+            .createBroker(new URI("xbean:org/apache/activemq/network/ssh-reconnect-broker1.xml"));
     }
 
     protected BrokerService createSecondBroker() throws Exception {
-        return BrokerFactory.createBroker(new URI("xbean:org/apache/activemq/network/ssh-reconnect-broker2.xml"));
+        return BrokerFactory
+            .createBroker(new URI("xbean:org/apache/activemq/network/ssh-reconnect-broker2.xml"));
     }
 
     protected void setUp() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/NumberRangesWhileMarshallingTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/NumberRangesWhileMarshallingTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/NumberRangesWhileMarshallingTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/NumberRangesWhileMarshallingTest.java Wed Aug  8 11:56:59 2007
@@ -16,10 +16,6 @@
  */
 package org.apache.activemq.openwire;
 
-import org.apache.activemq.command.SessionId;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -27,96 +23,72 @@
 import java.io.IOException;
 
 import junit.framework.TestCase;
+import org.apache.activemq.command.SessionId;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
- *
  * @version $Revision$
  */
 public class NumberRangesWhileMarshallingTest extends TestCase {
 
     private static final Log log = LogFactory.getLog(NumberRangesWhileMarshallingTest.class);
-    
+
     protected String connectionId = "Cheese";
     protected ByteArrayOutputStream buffer = new ByteArrayOutputStream();
     protected DataOutputStream ds = new DataOutputStream(buffer);
     protected OpenWireFormat openWireformat;
     protected int endOfStreamMarker = 0x12345678;
 
-    
     public void testLongNumberRanges() throws Exception {
-        long[] numberValues = { 
-                // bytes
-                0, 1, 0x7e, 0x7f, 0x80, 0x81, 0xf0, 0xff,
-                // shorts
-                0x7eff, 0x7fffL, 0x8001L, 0x8000L, 0xe000L, 0xe0001L, 0xff00L, 0xffffL,
-                // ints
-                0x10000L, 
-                0x700000L, 
-                0x12345678L, 
-                0x72345678L, 
-                0x7fffffffL, 
-                0x80000000L, 
-                0x80000001L, 
-                0xE0000001L, 
-                0xFFFFFFFFL,
-                
-                // 3 byte longs
-                0x123456781L, 
-                0x1234567812L, 
-                0x12345678123L, 
-                0x123456781234L, 
-                0x1234567812345L, 
-                0x12345678123456L, 
-                0x7e345678123456L, 
-                0x7fffffffffffffL, 
-                0x80000000000000L, 
-                0x80000000000001L,
-                0xe0000000000001L, 
-                0xffffffffffffffL,
-                
-                // 4 byte longs
-                0x1234567812345678L, 
-                0x7fffffffffffffffL, 
-                0x8000000000000000L, 
-                0x8000000000000001L,
-                0xe000000000000001L, 
-                0xffffffffffffffffL,
-                1 };
-        
+        long[] numberValues = {
+                               // bytes
+                               0, 1, 0x7e, 0x7f, 0x80, 0x81, 0xf0, 0xff,
+                               // shorts
+                               0x7eff, 0x7fffL, 0x8001L, 0x8000L, 0xe000L, 0xe0001L, 0xff00L, 0xffffL,
+                               // ints
+                               0x10000L, 0x700000L, 0x12345678L, 0x72345678L, 0x7fffffffL, 0x80000000L, 0x80000001L, 0xE0000001L, 0xFFFFFFFFL,
+
+                               // 3 byte longs
+                               0x123456781L, 0x1234567812L, 0x12345678123L, 0x123456781234L, 0x1234567812345L, 0x12345678123456L, 0x7e345678123456L, 0x7fffffffffffffL,
+                               0x80000000000000L, 0x80000000000001L, 0xe0000000000001L, 0xffffffffffffffL,
+
+                               // 4 byte longs
+                               0x1234567812345678L, 0x7fffffffffffffffL, 0x8000000000000000L, 0x8000000000000001L, 0xe000000000000001L, 0xffffffffffffffffL, 1};
+
         for (int i = 0; i < numberValues.length; i++) {
             long value = numberValues[i];
-            
+
             SessionId object = new SessionId();
             object.setConnectionId(connectionId);
             object.setValue(value);
             writeObject(object);
         }
         ds.writeInt(endOfStreamMarker);
-        
+
         // now lets read from the stream
         ds.close();
-        
+
         ByteArrayInputStream in = new ByteArrayInputStream(buffer.toByteArray());
         DataInputStream dis = new DataInputStream(in);
         for (int i = 0; i < numberValues.length; i++) {
             long value = numberValues[i];
             String expected = Long.toHexString(value);
             log.info("Unmarshaling value: " + i + " = " + expected);
-            
-            SessionId command = (SessionId) openWireformat.unmarshal(dis);
-            assertEquals("connection ID in object: "+ i, connectionId, command.getConnectionId());
+
+            SessionId command = (SessionId)openWireformat.unmarshal(dis);
+            assertEquals("connection ID in object: " + i, connectionId, command.getConnectionId());
             String actual = Long.toHexString(command.getValue());
-            assertEquals("value of object: "+ i + " was: " + actual, expected, actual);
+            assertEquals("value of object: " + i + " was: " + actual, expected, actual);
         }
         int marker = dis.readInt();
         assertEquals("Marker int", Integer.toHexString(endOfStreamMarker), Integer.toHexString(marker));
-        
+
         // lets try read and we should get an exception
         try {
             byte value = dis.readByte();
             fail("Should have reached the end of the stream");
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             // worked!
         }
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageTest.java Wed Aug  8 11:56:59 2007
@@ -16,40 +16,31 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQBytesMessage;
 
 /**
  * Test case for the OpenWire marshalling for ActiveMQBytesMessage
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ActiveMQBytesMessageTest extends ActiveMQMessageTest {
 
-
     public static ActiveMQBytesMessageTest SINGLETON = new ActiveMQBytesMessageTest();
 
     public Object createObject() throws Exception {
-    		ActiveMQBytesMessage info = new ActiveMQBytesMessage();
-    		populateObject(info);
-    		return info;
+        ActiveMQBytesMessage info = new ActiveMQBytesMessage();
+        populateObject(info);
+        return info;
     }
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQBytesMessage info = (ActiveMQBytesMessage) object;
+        super.populateObject(object);
+        ActiveMQBytesMessage info = (ActiveMQBytesMessage)object;
 
-            }
-        }
+    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQDestinationTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQDestinationTestSupport.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQDestinationTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQDestinationTestSupport.java Wed Aug  8 11:56:59 2007
@@ -16,32 +16,25 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 /**
  * Test case for the OpenWire marshalling for ActiveMQDestination
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public abstract class ActiveMQDestinationTestSupport extends DataFileGeneratorTestSupport {
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQDestination info = (ActiveMQDestination) object;
+        super.populateObject(object);
+        ActiveMQDestination info = (ActiveMQDestination)object;
         info.setPhysicalName("PhysicalName:1");
 
-            }
-        }
+    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageTest.java Wed Aug  8 11:56:59 2007
@@ -16,40 +16,31 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQMapMessage;
 
 /**
  * Test case for the OpenWire marshalling for ActiveMQMapMessage
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ActiveMQMapMessageTest extends ActiveMQMessageTest {
 
-
     public static ActiveMQMapMessageTest SINGLETON = new ActiveMQMapMessageTest();
 
     public Object createObject() throws Exception {
-    		ActiveMQMapMessage info = new ActiveMQMapMessage();
-    		populateObject(info);
-    		return info;
+        ActiveMQMapMessage info = new ActiveMQMapMessage();
+        populateObject(info);
+        return info;
     }
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQMapMessage info = (ActiveMQMapMessage) object;
+        super.populateObject(object);
+        ActiveMQMapMessage info = (ActiveMQMapMessage)object;
 
-            }
-        }
+    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMessageTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQMessageTest.java Wed Aug  8 11:56:59 2007
@@ -16,40 +16,31 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQMessage;
 
 /**
  * Test case for the OpenWire marshalling for ActiveMQMessage
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ActiveMQMessageTest extends MessageTestSupport {
 
-
     public static ActiveMQMessageTest SINGLETON = new ActiveMQMessageTest();
 
     public Object createObject() throws Exception {
-    		ActiveMQMessage info = new ActiveMQMessage();
-    		populateObject(info);
-    		return info;
+        ActiveMQMessage info = new ActiveMQMessage();
+        populateObject(info);
+        return info;
     }
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQMessage info = (ActiveMQMessage) object;
+        super.populateObject(object);
+        ActiveMQMessage info = (ActiveMQMessage)object;
 
-            }
-        }
+    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageTest.java Wed Aug  8 11:56:59 2007
@@ -16,40 +16,31 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQObjectMessage;
 
 /**
  * Test case for the OpenWire marshalling for ActiveMQObjectMessage
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * 
+ * 
+ * NOTE!: This file is auto generated - do not modify! if you need to make a
+ * change, please see the modify the groovy scripts in the under src/gram/script
+ * and then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ActiveMQObjectMessageTest extends ActiveMQMessageTest {
 
-
     public static ActiveMQObjectMessageTest SINGLETON = new ActiveMQObjectMessageTest();
 
     public Object createObject() throws Exception {
-    		ActiveMQObjectMessage info = new ActiveMQObjectMessage();
-    		populateObject(info);
-    		return info;
+        ActiveMQObjectMessage info = new ActiveMQObjectMessage();
+        populateObject(info);
+        return info;
     }
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQObjectMessage info = (ActiveMQObjectMessage) object;
+        super.populateObject(object);
+        ActiveMQObjectMessage info = (ActiveMQObjectMessage)object;
 
-            }
-        }
+    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQQueueTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQQueueTest.java Wed Aug  8 11:56:59 2007
@@ -16,40 +16,29 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQQueue;
 
 /**
- * Test case for the OpenWire marshalling for ActiveMQQueue
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * Test case for the OpenWire marshalling for ActiveMQQueue NOTE!: This file is
+ * auto generated - do not modify! if you need to make a change, please see the
+ * modify the groovy scripts in the under src/gram/script and then use maven
+ * openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ActiveMQQueueTest extends ActiveMQDestinationTestSupport {
 
-
     public static ActiveMQQueueTest SINGLETON = new ActiveMQQueueTest();
 
     public Object createObject() throws Exception {
-    		ActiveMQQueue info = new ActiveMQQueue();
-    		populateObject(info);
-    		return info;
+        ActiveMQQueue info = new ActiveMQQueue();
+        populateObject(info);
+        return info;
     }
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQQueue info = (ActiveMQQueue) object;
+        super.populateObject(object);
+        ActiveMQQueue info = (ActiveMQQueue)object;
 
-            }
-        }
+    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageTest.java Wed Aug  8 11:56:59 2007
@@ -16,40 +16,29 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQStreamMessage;
 
 /**
- * Test case for the OpenWire marshalling for ActiveMQStreamMessage
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * Test case for the OpenWire marshalling for ActiveMQStreamMessage NOTE!: This
+ * file is auto generated - do not modify! if you need to make a change, please
+ * see the modify the groovy scripts in the under src/gram/script and then use
+ * maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ActiveMQStreamMessageTest extends ActiveMQMessageTest {
 
-
     public static ActiveMQStreamMessageTest SINGLETON = new ActiveMQStreamMessageTest();
 
     public Object createObject() throws Exception {
-    		ActiveMQStreamMessage info = new ActiveMQStreamMessage();
-    		populateObject(info);
-    		return info;
+        ActiveMQStreamMessage info = new ActiveMQStreamMessage();
+        populateObject(info);
+        return info;
     }
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQStreamMessage info = (ActiveMQStreamMessage) object;
+        super.populateObject(object);
+        ActiveMQStreamMessage info = (ActiveMQStreamMessage)object;
 
-            }
-        }
+    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationTestSupport.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationTestSupport.java Wed Aug  8 11:56:59 2007
@@ -16,31 +16,21 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQTempDestination;
 
 /**
- * Test case for the OpenWire marshalling for ActiveMQTempDestination
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * Test case for the OpenWire marshalling for ActiveMQTempDestination NOTE!:
+ * This file is auto generated - do not modify! if you need to make a change,
+ * please see the modify the groovy scripts in the under src/gram/script and
+ * then use maven openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public abstract class ActiveMQTempDestinationTestSupport extends ActiveMQDestinationTestSupport {
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQTempDestination info = (ActiveMQTempDestination) object;
+        super.populateObject(object);
+        ActiveMQTempDestination info = (ActiveMQTempDestination)object;
 
-            }
-        }
+    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueTest.java Wed Aug  8 11:56:59 2007
@@ -16,40 +16,29 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQTempQueue;
 
 /**
- * Test case for the OpenWire marshalling for ActiveMQTempQueue
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * Test case for the OpenWire marshalling for ActiveMQTempQueue NOTE!: This file
+ * is auto generated - do not modify! if you need to make a change, please see
+ * the modify the groovy scripts in the under src/gram/script and then use maven
+ * openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ActiveMQTempQueueTest extends ActiveMQTempDestinationTestSupport {
 
-
     public static ActiveMQTempQueueTest SINGLETON = new ActiveMQTempQueueTest();
 
     public Object createObject() throws Exception {
-    		ActiveMQTempQueue info = new ActiveMQTempQueue();
-    		populateObject(info);
-    		return info;
+        ActiveMQTempQueue info = new ActiveMQTempQueue();
+        populateObject(info);
+        return info;
     }
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQTempQueue info = (ActiveMQTempQueue) object;
+        super.populateObject(object);
+        ActiveMQTempQueue info = (ActiveMQTempQueue)object;
 
-            }
-        }
+    }
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicTest.java?view=diff&rev=563982&r1=563981&r2=563982
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicTest.java Wed Aug  8 11:56:59 2007
@@ -16,40 +16,29 @@
  */
 package org.apache.activemq.openwire.v1;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
+import org.apache.activemq.command.ActiveMQTempTopic;
 
 /**
- * Test case for the OpenWire marshalling for ActiveMQTempTopic
- *
- *
- * NOTE!: This file is auto generated - do not modify!
- *        if you need to make a change, please see the modify the groovy scripts in the
- *        under src/gram/script and then use maven openwire:generate to regenerate 
- *        this file.
- *
+ * Test case for the OpenWire marshalling for ActiveMQTempTopic NOTE!: This file
+ * is auto generated - do not modify! if you need to make a change, please see
+ * the modify the groovy scripts in the under src/gram/script and then use maven
+ * openwire:generate to regenerate this file.
+ * 
  * @version $Revision$
  */
 public class ActiveMQTempTopicTest extends ActiveMQTempDestinationTestSupport {
 
-
     public static ActiveMQTempTopicTest SINGLETON = new ActiveMQTempTopicTest();
 
     public Object createObject() throws Exception {
-    		ActiveMQTempTopic info = new ActiveMQTempTopic();
-    		populateObject(info);
-    		return info;
+        ActiveMQTempTopic info = new ActiveMQTempTopic();
+        populateObject(info);
+        return info;
     }
 
-    
     protected void populateObject(Object object) throws Exception {
-    		super.populateObject(object);
-    		ActiveMQTempTopic info = (ActiveMQTempTopic) object;
+        super.populateObject(object);
+        ActiveMQTempTopic info = (ActiveMQTempTopic)object;
 
-            }
-        }
+    }
+}



Mime
View raw message