activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r564057 [12/13] - 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/ft...
Date Thu, 09 Aug 2007 00:34:40 GMT
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/JournalTraceTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/JournalTraceTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/JournalTraceTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/JournalTraceTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.JournalTrace;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/JournalTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/JournalTransactionTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/JournalTransactionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/JournalTransactionTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.JournalTransaction;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/KeepAliveInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/KeepAliveInfoTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/KeepAliveInfoTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/KeepAliveInfoTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.KeepAliveInfo;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/LastPartialCommandTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/LastPartialCommandTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/LastPartialCommandTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/LastPartialCommandTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.LastPartialCommand;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/LocalTransactionIdTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/LocalTransactionIdTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/LocalTransactionIdTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/LocalTransactionIdTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.LocalTransactionId;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageAckTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageAckTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageAckTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageAckTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.MessageAck;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.MessageDispatchNotification;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageDispatchTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageDispatchTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageDispatchTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageDispatchTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.MessageDispatch;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageIdTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageIdTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageIdTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageIdTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.MessageId;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessagePullTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessagePullTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessagePullTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessagePullTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.MessagePull;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/MessageTestSupport.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.BrokerId;
+import org.apache.activemq.command.Message;
 
 /**
  * Test case for the OpenWire marshalling for Message NOTE!: This file is auto

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.NetworkBridgeFilter;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/PartialCommandTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/PartialCommandTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/PartialCommandTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/PartialCommandTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.PartialCommand;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerAckTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerAckTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerAckTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerAckTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.ProducerAck;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerIdTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerIdTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerIdTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerIdTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.ProducerId;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerInfoTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerInfoTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ProducerInfoTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.BrokerId;
+import org.apache.activemq.command.ProducerInfo;
 
 /**
  * Test case for the OpenWire marshalling for ProducerInfo NOTE!: This file is

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveInfoTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveInfoTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveInfoTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.RemoveInfo;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.RemoveSubscriptionInfo;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ReplayCommandTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ReplayCommandTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ReplayCommandTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ReplayCommandTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.ReplayCommand;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ResponseTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ResponseTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ResponseTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ResponseTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.Response;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SessionIdTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SessionIdTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SessionIdTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SessionIdTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.SessionId;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SessionInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SessionInfoTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SessionInfoTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SessionInfoTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.SessionInfo;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ShutdownInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ShutdownInfoTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ShutdownInfoTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/ShutdownInfoTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.ShutdownInfo;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SubscriptionInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SubscriptionInfoTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SubscriptionInfoTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/SubscriptionInfoTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.SubscriptionInfo;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/TransactionIdTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/TransactionIdTestSupport.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/TransactionIdTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/TransactionIdTestSupport.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,8 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.TransactionId;
+import org.apache.activemq.openwire.DataFileGeneratorTestSupport;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/TransactionInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/TransactionInfoTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/TransactionInfoTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/TransactionInfoTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.TransactionInfo;
 
 
 /**

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/XATransactionIdTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/XATransactionIdTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/XATransactionIdTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v3/XATransactionIdTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,7 @@
  */
 package org.apache.activemq.openwire.v3;
 
-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.XATransactionId;
 
 
 /**

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=564057&r1=564056&r2=564057
==============================================================================
--- 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 Wed Aug  8 17:34:07 2007
@@ -20,23 +20,23 @@
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+
 /**
  * @version $Revision: 1.3 $
  */
-public class AMQStoreQueueTest extends SimpleQueueTest{
-    
-        
-    protected void configureBroker(BrokerService answer) throws Exception{
-        
-    	File dataFileDir = new File("target/test-amq-data/perfTest/amq");
-    	
+public class AMQStoreQueueTest extends SimpleQueueTest {
+
+    protected void configureBroker(BrokerService answer) throws Exception {
+
+        File dataFileDir = new File("target/test-amq-data/perfTest/amq");
+
         AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter();
         adaptor.setDirectory(dataFileDir);
-        
+
         answer.setPersistenceAdapter(adaptor);
         answer.addConnector(bindAddress);
-        //answer.setDeleteAllMessagesOnStartup(true);
-        
+        // answer.setDeleteAllMessagesOnStartup(true);
+
     }
 
 }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java Wed Aug  8 17:34:07 2007
@@ -18,31 +18,25 @@
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+
 /**
  * @version $Revision: 1.3 $
  */
 public class KahaDurableTopicTest extends SimpleDurableTopicTest {
-    
+
     /*
-    protected BrokerService createBroker() throws Exception{
-        Resource resource=new ClassPathResource( "org/apache/activemq/perf/kahaBroker.xml");
-        BrokerFactoryBean factory=new BrokerFactoryBean(resource);
-        factory.afterPropertiesSet();
-        BrokerService result=factory.getBroker();
-        result.start();
-        return result;
-    }
-    */
-    
-    protected void configureBroker(BrokerService answer) throws Exception{
+     * protected BrokerService createBroker() throws Exception{ Resource
+     * resource=new ClassPathResource(
+     * "org/apache/activemq/perf/kahaBroker.xml"); BrokerFactoryBean factory=new
+     * BrokerFactoryBean(resource); factory.afterPropertiesSet(); BrokerService
+     * result=factory.getBroker(); result.start(); return result; }
+     */
+
+    protected void configureBroker(BrokerService answer) throws Exception {
         KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter();
         answer.setPersistenceAdapter(adaptor);
         answer.addConnector(bindAddress);
         answer.setDeleteAllMessagesOnStartup(true);
     }
-
-    
-
-    
 
 }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/KahaQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/KahaQueueTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/KahaQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/KahaQueueTest.java Wed Aug  8 17:34:07 2007
@@ -18,13 +18,13 @@
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter;
+
 /**
  * @version $Revision: 1.3 $
  */
-public class KahaQueueTest extends SimpleQueueTest{
-    
-        
-    protected void configureBroker(BrokerService answer) throws Exception{
+public class KahaQueueTest extends SimpleQueueTest {
+
+    protected void configureBroker(BrokerService answer) throws Exception {
         KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter();
         answer.setPersistenceAdapter(adaptor);
         answer.addConnector(bindAddress);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SlowConsumer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SlowConsumer.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SlowConsumer.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SlowConsumer.java Wed Aug  8 17:34:07 2007
@@ -16,14 +16,14 @@
  */
 package org.apache.activemq.perf;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * @version $Revision: 1.3 $
  */
@@ -43,8 +43,7 @@
         log.debug("GOT A MSG " + msg);
         try {
             Thread.sleep(10000);
-        }
-        catch (InterruptedException e) {
+        } catch (InterruptedException e) {
             e.printStackTrace();
         }
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SlowDurableConsumerTopicTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SlowDurableConsumerTopicTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SlowDurableConsumerTopicTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SlowDurableConsumerTopicTest.java Wed Aug  8 17:34:07 2007
@@ -15,15 +15,8 @@
 package org.apache.activemq.perf;
 
 import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
 import javax.jms.Destination;
 import javax.jms.JMSException;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ActiveMQPrefetchPolicy;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 
 /**
  * @version $Revision: 1.3 $

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/TemporaryTopicMemoryAllocationTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/TemporaryTopicMemoryAllocationTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/TemporaryTopicMemoryAllocationTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/TemporaryTopicMemoryAllocationTest.java Wed Aug  8 17:34:07 2007
@@ -19,16 +19,17 @@
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Session;
+
 /**
  * @version $Revision: 1.3 $
  */
-public class TemporaryTopicMemoryAllocationTest extends MemoryAllocationTest{
-    public TemporaryTopicMemoryAllocationTest(){
+public class TemporaryTopicMemoryAllocationTest extends MemoryAllocationTest {
+    public TemporaryTopicMemoryAllocationTest() {
         super();
         // TODO Auto-generated constructor stub
     }
 
-    protected Destination getDestination(Session session) throws JMSException{
+    protected Destination getDestination(Session session) throws JMSException {
         return session.createTemporaryTopic();
     }
 }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/pool/PooledTopicPublisherTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/pool/PooledTopicPublisherTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/pool/PooledTopicPublisherTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/pool/PooledTopicPublisherTest.java Wed Aug  8 17:34:07 2007
@@ -16,14 +16,14 @@
  */
 package org.apache.activemq.pool;
 
-import junit.framework.TestCase;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.command.ActiveMQTopic;
-
 import javax.jms.Session;
 import javax.jms.TopicConnection;
 import javax.jms.TopicPublisher;
 import javax.jms.TopicSession;
+
+import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQTopic;
 
 /**
  * @version $Revision$

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/JaasCertificateAuthenticationBrokerTest.java Wed Aug  8 17:34:07 2007
@@ -17,54 +17,49 @@
 
 package org.apache.activemq.security;
 
-import junit.framework.TestCase;
-
-import org.apache.activemq.broker.ConnectionContext;
-import org.apache.activemq.broker.StubBroker;
-import org.apache.activemq.command.ConnectionInfo;
-import org.apache.activemq.jaas.GroupPrincipal;
-import org.apache.activemq.jaas.UserPrincipal;
-import org.apache.activemq.transport.tcp.StubX509Certificate;
-
-import java.io.IOException;
 import java.security.Principal;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginContext;
+
+import junit.framework.TestCase;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.StubBroker;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.jaas.GroupPrincipal;
+import org.apache.activemq.jaas.UserPrincipal;
+import org.apache.activemq.transport.tcp.StubX509Certificate;
 
 public class JaasCertificateAuthenticationBrokerTest extends TestCase {
     StubBroker receiveBroker;
-    
+
     JaasCertificateAuthenticationBroker authBroker;
-    
+
     ConnectionContext connectionContext;
     ConnectionInfo connectionInfo;
-    
+
     protected void setUp() throws Exception {
         receiveBroker = new StubBroker();
-        
+
         authBroker = new JaasCertificateAuthenticationBroker(receiveBroker, "");
-        
+
         connectionContext = new ConnectionContext();
         connectionInfo = new ConnectionInfo();
-        
+
         connectionInfo.setTransportContext(new StubX509Certificate[] {});
     }
 
     protected void tearDown() throws Exception {
         super.tearDown();
     }
-    
+
     private void setConfiguration(Set userNames, Set groupNames, boolean loginShouldSucceed) {
         HashMap configOptions = new HashMap();
-        
+
         String userNamesString;
         {
             Iterator iter = userNames.iterator();
@@ -73,7 +68,7 @@
                 userNamesString += "," + (String)iter.next();
             }
         }
-        
+
         String groupNamesString = "";
         {
             Iterator iter = groupNames.iterator();
@@ -82,58 +77,48 @@
                 groupNamesString += "," + (String)iter.next();
             }
         }
-        
-        configOptions.put(StubLoginModule.ALLOW_LOGIN_PROPERTY, (loginShouldSucceed ? "true" : "false"));
+
+        configOptions.put(StubLoginModule.ALLOW_LOGIN_PROPERTY, loginShouldSucceed ? "true" : "false");
         configOptions.put(StubLoginModule.USERS_PROPERTY, userNamesString);
         configOptions.put(StubLoginModule.GROUPS_PROPERTY, groupNamesString);
-        AppConfigurationEntry configEntry = new AppConfigurationEntry(
-            "org.apache.activemq.security.StubLoginModule",
-            AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
-            configOptions);
-    
+        AppConfigurationEntry configEntry = new AppConfigurationEntry("org.apache.activemq.security.StubLoginModule", AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
+                                                                      configOptions);
+
         StubJaasConfiguration jaasConfig = new StubJaasConfiguration(configEntry);
-        
+
         Configuration.setConfiguration(jaasConfig);
     }
-    
+
     public void testAddConnectionSuccess() {
         String dnUserName = "dnUserName";
-        
+
         HashSet userNames = new HashSet();
         userNames.add(dnUserName);
-        
+
         HashSet groupNames = new HashSet();
         groupNames.add("testGroup1");
         groupNames.add("testGroup2");
         groupNames.add("tesetGroup3");
-        
-        setConfiguration(
-            userNames,
-            groupNames,
-            true);
-        
+
+        setConfiguration(userNames, groupNames, true);
+
         try {
             authBroker.addConnection(connectionContext, connectionInfo);
         } catch (Exception e) {
             fail("Call to addConnection failed: " + e.getMessage());
         }
-        
-        assertEquals("Number of addConnection calls to underlying Broker must match number of calls made to " +
-                "AuthenticationBroker.",
-            1, receiveBroker.addConnectionData.size());
-        
-        ConnectionContext receivedContext =
-            ((StubBroker.AddConnectionData)receiveBroker.addConnectionData.getFirst()).connectionContext; 
-        
-        assertEquals("The SecurityContext's userName must be set to that of the UserPrincipal.",
-            dnUserName, receivedContext.getSecurityContext().getUserName());
-        
-        Set receivedPrincipals =
-            receivedContext.getSecurityContext().getPrincipals();
-        
-        for (Iterator iter = receivedPrincipals.iterator(); iter.hasNext(); ) {
+
+        assertEquals("Number of addConnection calls to underlying Broker must match number of calls made to " + "AuthenticationBroker.", 1, receiveBroker.addConnectionData.size());
+
+        ConnectionContext receivedContext = ((StubBroker.AddConnectionData)receiveBroker.addConnectionData.getFirst()).connectionContext;
+
+        assertEquals("The SecurityContext's userName must be set to that of the UserPrincipal.", dnUserName, receivedContext.getSecurityContext().getUserName());
+
+        Set receivedPrincipals = receivedContext.getSecurityContext().getPrincipals();
+
+        for (Iterator iter = receivedPrincipals.iterator(); iter.hasNext();) {
             Principal currentPrincipal = (Principal)iter.next();
-            
+
             if (currentPrincipal instanceof UserPrincipal) {
                 if (userNames.remove(currentPrincipal.getName())) {
                     // Nothing, we did good.
@@ -151,29 +136,26 @@
                 fail("Unexpected Principal subclass found.");
             }
         }
-        
+
         if (!userNames.isEmpty()) {
             fail("Some usernames were not added as UserPrincipals");
         }
-        
+
         if (!groupNames.isEmpty()) {
             fail("Some group names were not added as GroupPrincipals");
         }
     }
-    
+
     public void testAddConnectionFailure() {
         HashSet userNames = new HashSet();
-        
+
         HashSet groupNames = new HashSet();
         groupNames.add("testGroup1");
         groupNames.add("testGroup2");
         groupNames.add("tesetGroup3");
-        
-        setConfiguration(
-            userNames,
-            groupNames,
-            false);
-        
+
+        setConfiguration(userNames, groupNames, false);
+
         boolean connectFailed = false;
         try {
             authBroker.addConnection(connectionContext, connectionInfo);
@@ -182,24 +164,21 @@
         } catch (Exception e) {
             fail("Failed to connect for unexpected reason: " + e.getMessage());
         }
-        
+
         if (!connectFailed) {
             fail("Unauthenticated connection allowed.");
         }
-        
-        assertEquals("Unauthenticated connection allowed.",
-            true, receiveBroker.addConnectionData.isEmpty());
+
+        assertEquals("Unauthenticated connection allowed.", true, receiveBroker.addConnectionData.isEmpty());
     }
-    
+
     public void testRemoveConnection() throws Exception {
         connectionContext.setSecurityContext(new StubSecurityContext());
-        
+
         authBroker.removeConnection(connectionContext, connectionInfo, new Throwable());
-        
-        assertEquals("removeConnection should clear ConnectionContext.",
-            null, connectionContext.getSecurityContext());
 
-        assertEquals("Incorrect number of calls to underlying broker were made.",
-            1, receiveBroker.removeConnectionData.size());
+        assertEquals("removeConnection should clear ConnectionContext.", null, connectionContext.getSecurityContext());
+
+        assertEquals("Incorrect number of calls to underlying broker were made.", 1, receiveBroker.removeConnectionData.size());
     }
 }

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=564057&r1=564056&r2=564057
==============================================================================
--- 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 Wed Aug  8 17:34:07 2007
@@ -16,7 +16,6 @@
  */
 package org.apache.activemq.security;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
@@ -24,10 +23,10 @@
 import javax.naming.Context;
 import javax.naming.NameClassPair;
 import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
 
+import junit.framework.TestCase;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
@@ -36,8 +35,6 @@
 import org.apache.directory.server.core.jndi.CoreContextFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import junit.framework.TestCase;
 
 /**
  * This test assumes setup like in file 'AMQauth.ldif'. Contents of this file is

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/SimpleAuthenticationPluginTest.java Wed Aug  8 17:34:07 2007
@@ -19,7 +19,6 @@
 import java.net.URI;
 
 import junit.framework.Test;
-
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.commons.logging.Log;
@@ -28,7 +27,7 @@
 public class SimpleAuthenticationPluginTest extends SecurityTestSupport {
 
     private static final Log log = LogFactory.getLog(SimpleAuthenticationPluginTest.class);
-    
+
     public static Test suite() {
         return suite(SimpleAuthenticationPluginTest.class);
     }
@@ -37,7 +36,6 @@
         junit.textui.TestRunner.run(suite());
     }
 
-
     protected BrokerService createBroker() throws Exception {
         return createBroker("org/apache/activemq/security/simple-auth-broker.xml");
     }
@@ -47,5 +45,4 @@
         return BrokerFactory.createBroker(new URI("xbean:" + uri));
     }
 
-	
-}
\ No newline at end of file
+}

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=564057&r1=564056&r2=564057
==============================================================================
--- 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 Wed Aug  8 17:34:07 2007
@@ -16,6 +16,12 @@
  */
 package org.apache.activemq.security;
 
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import junit.framework.Test;
 import org.apache.activemq.CombinationTestSupport;
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerPlugin;
@@ -24,14 +30,6 @@
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.filter.DestinationMap;
 import org.apache.activemq.jaas.GroupPrincipal;
-
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.Test;
 
 /**
  * Tests that the broker allows/fails access to destinations based on the

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/StubLoginModule.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/StubLoginModule.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/StubLoginModule.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/StubLoginModule.java Wed Aug  8 17:34:07 2007
@@ -17,9 +17,6 @@
 
 package org.apache.activemq.security;
 
-import org.apache.activemq.jaas.GroupPrincipal;
-import org.apache.activemq.jaas.UserPrincipal;
-
 import java.util.Map;
 
 import javax.security.auth.Subject;
@@ -27,6 +24,9 @@
 import javax.security.auth.login.FailedLoginException;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
+
+import org.apache.activemq.jaas.GroupPrincipal;
+import org.apache.activemq.jaas.UserPrincipal;
 
 public class StubLoginModule implements LoginModule {
     public static final String ALLOW_LOGIN_PROPERTY = "org.apache.activemq.jaas.stubproperties.allow_login";

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSecurityTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSecurityTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSecurityTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/XBeanSecurityTest.java Wed Aug  8 17:34:07 2007
@@ -16,14 +16,13 @@
  */
 package org.apache.activemq.security;
 
+import java.net.URI;
+
+import junit.framework.Test;
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.net.URI;
-
-import junit.framework.Test;
 
 /**
  * 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/selector/SelectorTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/selector/SelectorTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/selector/SelectorTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/selector/SelectorTest.java Wed Aug  8 17:34:07 2007
@@ -31,18 +31,18 @@
  * @version $Revision: 1.7 $
  */
 public class SelectorTest extends TestCase {
-    
+
     public void testBooleanSelector() throws Exception {
         Message message = createMessage();
 
         assertSelector(message, "(trueProp OR falseProp) AND trueProp", true);
         assertSelector(message, "(trueProp OR falseProp) AND falseProp", false);
-        
+
     }
 
     public void testXPathSelectors() throws Exception {
         ActiveMQTextMessage message = new ActiveMQTextMessage();
-        
+
         message.setJMSType("xml");
         message.setText("<root><a key='first'/><b key='second'/></root>");
 
@@ -64,18 +64,18 @@
 
         assertSelector(message, "JMSType = 'selector-test'", true);
         assertSelector(message, "JMSType = 'crap'", false);
-        
+
         assertSelector(message, "JMSMessageID = 'id:test:1:1:1:1'", true);
         assertSelector(message, "JMSMessageID = 'id:not-test:1:1:1:1'", false);
-        
+
         message = createMessage();
         message.setJMSType("1001");
-        
+
         assertSelector(message, "JMSType='1001'", true);
         assertSelector(message, "JMSType='1001' OR JMSType='1002'", true);
         assertSelector(message, "JMSType = 'crap'", false);
     }
-    
+
     public void testBasicSelectors() throws Exception {
         Message message = createMessage();
 
@@ -83,7 +83,7 @@
         assertSelector(message, "rank > 100", true);
         assertSelector(message, "rank >= 123", true);
         assertSelector(message, "rank >= 124", false);
-        
+
     }
 
     public void testPropertyTypes() throws Exception {
@@ -96,7 +96,6 @@
         assertSelector(message, "shortProp = 123", true);
         assertSelector(message, "shortProp = 10", false);
 
-
         assertSelector(message, "shortProp = 123", true);
         assertSelector(message, "shortProp = 10", false);
 
@@ -112,6 +111,7 @@
         assertSelector(message, "doubleProp = 123", true);
         assertSelector(message, "doubleProp = 10", false);
     }
+
     public void testAndSelectors() throws Exception {
         Message message = createMessage();
 
@@ -195,7 +195,6 @@
         assertSelector(message, "name is null", false);
     }
 
-
     public void testLike() throws Exception {
         Message message = createMessage();
         message.setStringProperty("modelClassId", "com.whatever.something.foo.bar");
@@ -203,18 +202,21 @@
         message.setStringProperty("modelRequestError", "abc");
         message.setStringProperty("modelCorrelatedClientId", "whatever");
 
-        assertSelector(message, "modelClassId LIKE 'com.whatever.something.%' AND modelInstanceId = '170' AND (modelRequestError IS NULL OR modelCorrelatedClientId = 'whatever')", true);
+        assertSelector(message, "modelClassId LIKE 'com.whatever.something.%' AND modelInstanceId = '170' AND (modelRequestError IS NULL OR modelCorrelatedClientId = 'whatever')",
+                       true);
 
         message.setStringProperty("modelCorrelatedClientId", "shouldFailNow");
 
-        assertSelector(message, "modelClassId LIKE 'com.whatever.something.%' AND modelInstanceId = '170' AND (modelRequestError IS NULL OR modelCorrelatedClientId = 'whatever')", false);
+        assertSelector(message, "modelClassId LIKE 'com.whatever.something.%' AND modelInstanceId = '170' AND (modelRequestError IS NULL OR modelCorrelatedClientId = 'whatever')",
+                       false);
 
         message = createMessage();
         message.setStringProperty("modelClassId", "com.whatever.something.foo.bar");
         message.setStringProperty("modelInstanceId", "170");
         message.setStringProperty("modelCorrelatedClientId", "shouldNotMatch");
 
-        assertSelector(message, "modelClassId LIKE 'com.whatever.something.%' AND modelInstanceId = '170' AND (modelRequestError IS NULL OR modelCorrelatedClientId = 'whatever')", true);
+        assertSelector(message, "modelClassId LIKE 'com.whatever.something.%' AND modelInstanceId = '170' AND (modelRequestError IS NULL OR modelCorrelatedClientId = 'whatever')",
+                       true);
     }
 
     /**
@@ -230,7 +232,6 @@
         message.setLongProperty("SessionserverId", 1234);
         assertSelector(message, "SessionserverId=1870414179", false);
 
-
         assertSelector(message, "Command NOT IN ('MirrorLobbyRequest', 'MirrorLobbyReply')", false);
 
         message.setStringProperty("Command", "Cheese");
@@ -244,11 +245,12 @@
 
     public void testFloatComparisons() throws Exception {
         Message message = createMessage();
-        
-        // JMS 1.1 Section 3.8.1.1 : Approximate literals use the Java floating-point literal syntax. 
+
+        // JMS 1.1 Section 3.8.1.1 : Approximate literals use the Java
+        // floating-point literal syntax.
         // We will use the java varible x to demo valid floating point syntaxs.
         double x;
-        
+
         // test decimals like x.x
         x = 1.0;
         x = -1.1;
@@ -267,7 +269,7 @@
         assertSelector(message, "-1.1 < 1.", true);
         assertSelector(message, "1.E1 < 1.1E1", true);
         assertSelector(message, "-1.1E1 < 1.E1", true);
-        
+
         // test decimals like .x
         x = .5;
         x = -.5;
@@ -276,7 +278,7 @@
         assertSelector(message, "-.5 < .1", true);
         assertSelector(message, ".1E1 < .5E1", true);
         assertSelector(message, "-.5E1 < .1E1", true);
-        
+
         // test exponents
         x = 4E10;
         x = -4E10;
@@ -329,9 +331,9 @@
         message.setJMSMessageID("connection:1:1:1:1");
         message.setObjectProperty("name", "James");
         message.setObjectProperty("location", "London");
-        
+
         message.setByteProperty("byteProp", (byte)123);
-        message.setByteProperty("byteProp2", (byte) 33);
+        message.setByteProperty("byteProp2", (byte)33);
         message.setShortProperty("shortProp", (short)123);
         message.setIntProperty("intProp", (int)123);
         message.setLongProperty("longProp", (long)123);
@@ -348,13 +350,11 @@
         return message;
     }
 
-
     protected void assertInvalidSelector(Message message, String text) throws JMSException {
         try {
             new SelectorParser().parse(text);
             fail("Created a valid selector");
-        }
-        catch (InvalidSelectorException e) {
+        } catch (InvalidSelectorException e) {
         }
     }
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java Wed Aug  8 17:34:07 2007
@@ -16,16 +16,16 @@
  */
 package org.apache.activemq.spring;
 
-import junit.framework.Assert;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.jms.Message;
 import javax.jms.MessageListener;
-import java.util.ArrayList;
-import java.util.List;
+
+import junit.framework.Assert;
 
 public class ConsumerBean extends Assert implements MessageListener {
-    private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory
-            .getLog(ConsumerBean.class);
+    private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(ConsumerBean.class);
     private List messages = new ArrayList();
     private Object semaphore;
     private boolean verbose;
@@ -39,7 +39,7 @@
 
     /**
      * Constructor, initialized semaphore object.
-     *
+     * 
      * @param semaphore
      */
     public ConsumerBean(Object semaphore) {
@@ -57,7 +57,7 @@
 
     /**
      * Method implemented from MessageListener interface.
-     *
+     * 
      * @param message
      */
     public synchronized void onMessage(Message message) {
@@ -84,8 +84,7 @@
                     semaphore.wait(4000);
                 }
             }
-        }
-        catch (InterruptedException e) {
+        } catch (InterruptedException e) {
             log.info("Caught: " + e);
         }
         long end = System.currentTimeMillis() - start;
@@ -95,7 +94,7 @@
 
     /**
      * Used to wait for a message to arrive given a particular message count.
-     *
+     * 
      * @param messageCount
      */
     public void waitForMessagesToArrive(int messageCount) {
@@ -111,8 +110,7 @@
                 synchronized (semaphore) {
                     semaphore.wait(1000);
                 }
-            }
-            catch (InterruptedException e) {
+            } catch (InterruptedException e) {
                 log.info("Caught: " + e);
             }
         }
@@ -140,7 +138,7 @@
 
     /**
      * Identifies if the message is empty.
-     *
+     * 
      * @return
      */
     protected boolean hasReceivedMessage() {
@@ -149,7 +147,7 @@
 
     /**
      * Identifies if the message count has reached the total size of message.
-     *
+     * 
      * @param messageCount
      * @return
      */

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java Wed Aug  8 17:34:07 2007
@@ -16,10 +16,6 @@
  */
 package org.apache.activemq.spring;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.jms.core.JmsTemplate;
-
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
@@ -29,6 +25,10 @@
 import javax.jms.MessageListener;
 import javax.jms.Session;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.jms.core.JmsTemplate;
+
 public class SpringConsumer extends ConsumerBean implements MessageListener {
     private static final Log log = LogFactory.getLog(SpringConsumer.class);
     private JmsTemplate template;
@@ -58,8 +58,7 @@
             session = connection.createSession(true, Session.CLIENT_ACKNOWLEDGE);
             consumer = session.createConsumer(destination, selector, false);
             consumer.setMessageListener(this);
-        }
-        catch (JMSException ex) {
+        } catch (JMSException ex) {
             log.error("", ex);
             throw ex;
         }
@@ -81,14 +80,13 @@
         super.onMessage(message);
         try {
             message.acknowledge();
-        }
-        catch (JMSException e) {
+        } catch (JMSException e) {
             log.error("Failed to acknowledge: " + e, e);
         }
     }
 
     // Properties
-    //-------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     public Destination getDestination() {
         return destination;
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java Wed Aug  8 17:34:07 2007
@@ -16,14 +16,14 @@
  */
 package org.apache.activemq.spring;
 
-import org.springframework.jms.core.JmsTemplate;
-import org.springframework.jms.core.MessageCreator;
-
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.Session;
 import javax.jms.TextMessage;
+
+import org.springframework.jms.core.JmsTemplate;
+import org.springframework.jms.core.MessageCreator;
 
 public class SpringProducer {
     private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,12 @@
  */
 package org.apache.activemq.spring;
 
+import java.util.Iterator;
+import java.util.List;
+
 import junit.framework.TestCase;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * @version $Revision: 1.1 $

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/streams/JMSInputStreamTest.java Wed Aug  8 17:34:07 2007
@@ -18,17 +18,15 @@
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.jms.Destination;
 
 import junit.framework.Test;
-
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.JmsTestSupport;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
-
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * JMSInputStreamTest

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsResourceProvider.java Wed Aug  8 17:34:07 2007
@@ -19,13 +19,13 @@
 import javax.jms.Connection;
 import javax.jms.ConnectionConsumer;
 import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.ServerSessionPool;
 import javax.jms.Session;
-import javax.jms.DeliveryMode;
 import javax.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnectionFactory;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveTest.java Wed Aug  8 17:34:07 2007
@@ -27,9 +27,8 @@
  * @version $Revision: 1.2 $
  */
 public class JmsTopicSendReceiveTest extends JmsSendReceiveTestSupport {
-    private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory
-            .getLog(JmsTopicSendReceiveTest.class);
-    
+    private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(JmsTopicSendReceiveTest.class);
+
     protected Connection connection;
 
     protected void setUp() throws Exception {
@@ -51,14 +50,12 @@
         producer = session.createProducer(null);
         producer.setDeliveryMode(deliveryMode);
 
-        log.info("Created producer: " + producer + " delivery mode = " +
-                (deliveryMode == DeliveryMode.PERSISTENT ? "PERSISTENT" : "NON_PERSISTENT"));
+        log.info("Created producer: " + producer + " delivery mode = " + (deliveryMode == DeliveryMode.PERSISTENT ? "PERSISTENT" : "NON_PERSISTENT"));
 
         if (topic) {
             consumerDestination = session.createTopic(getConsumerSubject());
             producerDestination = session.createTopic(getProducerSubject());
-        }
-        else {
+        } else {
             consumerDestination = session.createQueue(getConsumerSubject());
             producerDestination = session.createQueue(getProducerSubject());
         }
@@ -78,33 +75,32 @@
 
     protected void tearDown() throws Exception {
         log.info("Dumping stats...");
-        //TODO
-        //connectionFactory.getFactoryStats().dump(new IndentPrinter());
+        // TODO
+        // connectionFactory.getFactoryStats().dump(new IndentPrinter());
 
         log.info("Closing down connection");
 
         /** TODO we should be able to shut down properly */
         session.close();
         connection.close();
-    }    
-    
+    }
+
     /**
-     * Creates a session. 
+     * Creates a session.
      * 
-     * @return session 
+     * @return session
      * @throws JMSException
      */
     protected Session createConsumerSession() throws JMSException {
         if (useSeparateSession) {
             return connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-        }
-        else {
+        } else {
             return session;
         }
     }
 
     /**
-     * Creates a durable suscriber or a consumer. 
+     * Creates a durable suscriber or a consumer.
      * 
      * @return MessageConsumer - durable suscriber or consumer.
      * @throws JMSException
@@ -112,7 +108,7 @@
     protected MessageConsumer createConsumer() throws JMSException {
         if (durable) {
             log.info("Creating durable consumer");
-            return consumeSession.createDurableSubscriber((Topic) consumerDestination, getName());
+            return consumeSession.createDurableSubscriber((Topic)consumerDestination, getName());
         }
         return consumeSession.createConsumer(consumerDestination);
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithEmbeddedBrokerAndUserIDTest.java Wed Aug  8 17:34:07 2007
@@ -16,14 +16,14 @@
  */
 package org.apache.activemq.test;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
 
-import java.util.Iterator;
-import java.util.List;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
 
 /**
  * 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/JmsTopicSendReceiveWithTwoConnectionsTest.java Wed Aug  8 17:34:07 2007
@@ -30,7 +30,7 @@
  * @version $Revision: 1.3 $
  */
 public class JmsTopicSendReceiveWithTwoConnectionsTest extends JmsSendReceiveTestSupport {
-    
+
     protected static final Log log = LogFactory.getLog(JmsTopicSendReceiveWithTwoConnectionsTest.class);
 
     protected Connection sendConnection;
@@ -69,14 +69,12 @@
         producer = session.createProducer(null);
         producer.setDeliveryMode(deliveryMode);
 
-        log.info("Created producer: " + producer + " delivery mode = " +
-                (deliveryMode == DeliveryMode.PERSISTENT ? "PERSISTENT" : "NON_PERSISTENT"));
+        log.info("Created producer: " + producer + " delivery mode = " + (deliveryMode == DeliveryMode.PERSISTENT ? "PERSISTENT" : "NON_PERSISTENT"));
 
         if (topic) {
             consumerDestination = session.createTopic(getConsumerSubject());
             producerDestination = session.createTopic(getProducerSubject());
-        }
-        else {
+        } else {
             consumerDestination = session.createQueue(getConsumerSubject());
             producerDestination = session.createQueue(getProducerSubject());
         }
@@ -93,7 +91,7 @@
     protected MessageConsumer createConsumer() throws JMSException {
         return receiveSession.createConsumer(consumerDestination);
     }
-    
+
     /*
      * @see junit.framework.TestCase#tearDown()
      */
@@ -117,7 +115,7 @@
     /**
      * Creates a connection.
      * 
-     * @return Connection 
+     * @return Connection
      * @throws Exception
      */
     protected Connection createSendConnection() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/TemporaryDestinationToFromNameTest.java Wed Aug  8 17:34:07 2007
@@ -16,11 +16,11 @@
  */
 package org.apache.activemq.test;
 
-import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
-
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.Topic;
+
+import org.apache.activemq.EmbeddedBrokerAndConnectionTestSupport;
 
 /**
  * @version $Revision: 1.1 $

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/message/NestedMapAndListPropertyTest.java Wed Aug  8 17:34:07 2007
@@ -16,17 +16,17 @@
  */
 package org.apache.activemq.test.message;
 
-import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+
+import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Tests that a Message can have nested Map and List properties attached.

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=564057&r1=564056&r2=564057
==============================================================================
--- 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 Wed Aug  8 17:34:07 2007
@@ -16,18 +16,18 @@
  */
 package org.apache.activemq.test.message;
 
-import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.jms.JMSException;
 import javax.jms.MapMessage;
 import javax.jms.Message;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsAndEmbeddedBrokerTest;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest.java Wed Aug  8 17:34:07 2007
@@ -16,12 +16,12 @@
  */
 package org.apache.activemq.test.retroactive;
 
-import org.apache.activemq.command.ActiveMQTopic;
-
-import javax.jms.MessageProducer;
-import javax.jms.TextMessage;
 import javax.jms.JMSException;
 import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.TextMessage;
+
+import org.apache.activemq.command.ActiveMQTopic;
 
 /**
  *

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerTestWithSimpleMessageListTest.java Wed Aug  8 17:34:07 2007
@@ -21,11 +21,11 @@
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
-import javax.jms.JMSException;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.EmbeddedBrokerTestSupport;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/retroactive/RetroactiveConsumerWithMessageQueryTest.java Wed Aug  8 17:34:07 2007
@@ -16,13 +16,8 @@
  */
 package org.apache.activemq.test.retroactive;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.util.MessageIdList;
-import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.springframework.core.io.ClassPathResource;
+import java.net.URI;
+import java.util.Date;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -31,8 +26,11 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import java.net.URI;
-import java.util.Date;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.util.MessageIdList;
 
 /**
  * @version $Revision$

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/rollback/DelegatingTransactionalMessageListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/rollback/DelegatingTransactionalMessageListener.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/rollback/DelegatingTransactionalMessageListener.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/rollback/DelegatingTransactionalMessageListener.java Wed Aug  8 17:34:07 2007
@@ -16,9 +16,6 @@
  */
 package org.apache.activemq.test.rollback;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -27,6 +24,8 @@
 import javax.jms.MessageListener;
 import javax.jms.Session;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class DelegatingTransactionalMessageListener implements MessageListener {
     private static final transient Log log = LogFactory.getLog(DelegatingTransactionalMessageListener.class);
@@ -43,8 +42,7 @@
             session = connection.createSession(transacted, ackMode);
             MessageConsumer consumer = session.createConsumer(destination);
             consumer.setMessageListener(this);
-        }
-        catch (JMSException e) {
+        } catch (JMSException e) {
             throw new IllegalStateException("Could not listen to " + destination, e);
         }
     }
@@ -53,8 +51,7 @@
         try {
             underlyingListener.onMessage(message);
             session.commit();
-        }
-        catch (Throwable e) {
+        } catch (Throwable e) {
             rollback();
         }
     }
@@ -62,8 +59,7 @@
     private void rollback() {
         try {
             session.rollback();
-        }
-        catch (JMSException e) {
+        } catch (JMSException e) {
             log.error("Failed to rollback: " + e, e);
         }
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/rollback/RollbacksWhileConsumingLargeQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/rollback/RollbacksWhileConsumingLargeQueueTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/rollback/RollbacksWhileConsumingLargeQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/test/rollback/RollbacksWhileConsumingLargeQueueTest.java Wed Aug  8 17:34:07 2007
@@ -16,6 +16,10 @@
  */
 package org.apache.activemq.test.rollback;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import javax.jms.Connection;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -28,10 +32,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.jms.core.MessageCreator;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @version $Revision$

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/StubTransportListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/StubTransportListener.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/StubTransportListener.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/StubTransportListener.java Wed Aug  8 17:34:07 2007
@@ -16,11 +16,9 @@
  */
 package org.apache.activemq.transport;
 
+import java.io.IOException;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
-
-
-import java.io.IOException;
 
 /**
  * 

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=564057&r1=564056&r2=564057
==============================================================================
--- 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 Wed Aug  8 17:34:07 2007
@@ -20,6 +20,7 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -33,7 +34,6 @@
 import javax.jms.TextMessage;
 
 import junit.framework.TestCase;
-
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnector;
@@ -43,8 +43,6 @@
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @version $Revision$

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/BadConnectionTest.java Wed Aug  8 17:34:07 2007
@@ -20,7 +20,6 @@
 import java.net.URI;
 
 import junit.framework.TestCase;
-
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportFactory;
@@ -29,11 +28,10 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- *
  * @version $Revision: 1.1 $
  */
 public class BadConnectionTest extends TestCase {
-    
+
     protected static final Log log = LogFactory.getLog(BadConnectionTest.class);
 
     protected Transport transport;
@@ -42,11 +40,11 @@
         try {
             transport.asyncRequest(new ActiveMQMessage(), null);
             fail("This should never succeed");
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             log.info("Caught expected exception: " + e, e);
         }
     }
+
     protected Transport createTransport() throws Exception {
         return TransportFactory.connect(new URI("failover://(tcp://doesNotExist:1234)?useExponentialBackOff=false&maxReconnectAttempts=3&initialReconnectDelay=100"));
     }
@@ -71,9 +69,9 @@
     }
 
     protected void tearDown() throws Exception {
-        if (transport != null) { 
+        if (transport != null) {
             transport.stop();
         }
     }
-        
+
 }



Mime
View raw message