activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r564057 [7/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/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.FlushCommand;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.IntegerResponse;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.JournalQueueAck;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTopicAckMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,32 +21,30 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
-
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.JournalTopicAck;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
- * Marshalling code for Open Wire Format for JournalTopicAckMarshaller
- *
- *
- * 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.
- *
+ * Marshalling code for Open Wire Format for JournalTopicAckMarshaller 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 JournalTopicAckMarshaller extends BaseDataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return JournalTopicAck.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,7 +54,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -65,16 +63,15 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setMessageSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setSubscritionName(tightUnmarshalString(dataIn, bs));
         info.setClientId(tightUnmarshalString(dataIn, bs));
-        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId)tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -85,7 +82,7 @@
         int rc = super.tightMarshal1(wireFormat, o, bs);
         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getMessageSequenceId(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getMessageSequenceId(), bs);
         rc += tightMarshalString1(info.getSubscritionName(), bs);
         rc += tightMarshalString1(info.getClientId(), bs);
         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
@@ -95,7 +92,7 @@
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
@@ -115,7 +112,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -124,15 +121,14 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         JournalTopicAck info = (JournalTopicAck)o;
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setMessageId((org.apache.activemq.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setMessageSequenceId(looseUnmarshalLong(wireFormat, dataIn));
         info.setSubscritionName(looseUnmarshalString(dataIn));
         info.setClientId(looseUnmarshalString(dataIn));
-        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId)looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.JournalTrace;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.JournalTransaction;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.KeepAliveInfo;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.LastPartialCommand;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,32 +21,30 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
-
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.LocalTransactionId;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
- * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller
- *
- *
- * 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.
- *
+ * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller 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 LocalTransactionIdMarshaller extends TransactionIdMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return LocalTransactionId.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,7 +54,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -66,11 +64,10 @@
 
         LocalTransactionId info = (LocalTransactionId)o;
         info.setValue(tightUnmarshalLong(wireFormat, dataIn, bs));
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -79,7 +76,7 @@
         LocalTransactionId info = (LocalTransactionId)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-        rc+=tightMarshalLong1(wireFormat, info.getValue(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getValue(), bs);
         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
 
         return rc + 0;
@@ -87,7 +84,7 @@
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
@@ -103,7 +100,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -113,10 +110,9 @@
 
         LocalTransactionId info = (LocalTransactionId)o;
         info.setValue(looseUnmarshalLong(wireFormat, dataIn));
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId)looseUnmarsalCachedObject(wireFormat, dataIn));
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,32 +21,31 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
-
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.MessageDispatchNotification;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
- * Marshalling code for Open Wire Format for MessageDispatchNotificationMarshaller
- *
- *
- * 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.
- *
+ * Marshalling code for Open Wire Format for
+ * MessageDispatchNotificationMarshaller 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 MessageDispatchNotificationMarshaller extends BaseCommandMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return MessageDispatchNotification.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,7 +55,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -65,14 +64,13 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setDeliverySequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
-        info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -83,7 +81,7 @@
         int rc = super.tightMarshal1(wireFormat, o, bs);
         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getDeliverySequenceId(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getDeliverySequenceId(), bs);
         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
 
         return rc + 0;
@@ -91,7 +89,7 @@
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
@@ -109,7 +107,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -118,13 +116,12 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setDeliverySequenceId(looseUnmarshalLong(wireFormat, dataIn));
-        info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setMessageId((org.apache.activemq.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,32 +21,30 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
-
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.MessageId;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
- * Marshalling code for Open Wire Format for MessageIdMarshaller
- *
- *
- * 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.
- *
+ * Marshalling code for Open Wire Format for MessageIdMarshaller 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 MessageIdMarshaller extends BaseDataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return MessageId.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,7 +54,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -65,13 +63,12 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((org.apache.activemq.command.ProducerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -81,15 +78,15 @@
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs);
 
         return rc + 0;
     }
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
@@ -106,7 +103,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -115,12 +112,11 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setProducerId((org.apache.activemq.command.ProducerId)looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
         info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,27 +21,24 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
-
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
- * Marshalling code for Open Wire Format for MessageMarshaller
- *
- *
- * 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.
- *
+ * Marshalling code for Open Wire Format for MessageMarshaller 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 MessageMarshaller extends BaseCommandMarshaller {
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -52,38 +49,37 @@
         Message info = (Message)o;
 
         info.beforeUnmarshall(wireFormat);
-        
-        info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+
+        info.setProducerId((org.apache.activemq.command.ProducerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setGroupID(tightUnmarshalString(dataIn, bs));
         info.setGroupSequence(dataIn.readInt());
         info.setCorrelationId(tightUnmarshalString(dataIn, bs));
         info.setPersistent(bs.readBoolean());
         info.setExpiration(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setPriority(dataIn.readByte());
-        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setTimestamp(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setType(tightUnmarshalString(dataIn, bs));
         info.setContent(tightUnmarshalByteSequence(dataIn, bs));
         info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));
-        info.setDataStructure((org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDataStructure((org.apache.activemq.command.DataStructure)tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setCompressed(bs.readBoolean());
         info.setRedeliveryCounter(dataIn.readInt());
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)tightUnmarsalNestedObject(wireFormat, dataIn, bs);
             }
             info.setBrokerPath(value);
-        }
-        else {
+        } else {
             info.setBrokerPath(null);
         }
         info.setArrival(tightUnmarshalLong(wireFormat, dataIn, bs));
@@ -94,12 +90,11 @@
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)tightUnmarsalNestedObject(wireFormat, dataIn, bs);
             }
             info.setCluster(value);
-        }
-        else {
+        } else {
             info.setCluster(null);
         }
         info.setBrokerInTime(tightUnmarshalLong(wireFormat, dataIn, bs));
@@ -109,7 +104,6 @@
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -129,9 +123,9 @@
         rc += tightMarshalString1(info.getGroupID(), bs);
         rc += tightMarshalString1(info.getCorrelationId(), bs);
         bs.writeBoolean(info.isPersistent());
-        rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getExpiration(), bs);
         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getTimestamp(), bs);
         rc += tightMarshalString1(info.getType(), bs);
         rc += tightMarshalByteSequence1(info.getContent(), bs);
         rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
@@ -139,20 +133,20 @@
         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs);
         bs.writeBoolean(info.isCompressed());
         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getArrival(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getArrival(), bs);
         rc += tightMarshalString1(info.getUserID(), bs);
         bs.writeBoolean(info.isRecievedByDFBridge());
         bs.writeBoolean(info.isDroppable());
         rc += tightMarshalObjectArray1(wireFormat, info.getCluster(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getBrokerInTime(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getBrokerOutTime(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getBrokerInTime(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getBrokerOutTime(), bs);
 
         return rc + 9;
     }
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
@@ -197,7 +191,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -208,38 +202,37 @@
         Message info = (Message)o;
 
         info.beforeUnmarshall(wireFormat);
-        
-        info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+
+        info.setProducerId((org.apache.activemq.command.ProducerId)looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId)looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setMessageId((org.apache.activemq.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId)looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setGroupID(looseUnmarshalString(dataIn));
         info.setGroupSequence(dataIn.readInt());
         info.setCorrelationId(looseUnmarshalString(dataIn));
         info.setPersistent(dataIn.readBoolean());
         info.setExpiration(looseUnmarshalLong(wireFormat, dataIn));
         info.setPriority(dataIn.readByte());
-        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setTimestamp(looseUnmarshalLong(wireFormat, dataIn));
         info.setType(looseUnmarshalString(dataIn));
         info.setContent(looseUnmarshalByteSequence(dataIn));
         info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));
-        info.setDataStructure((org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDataStructure((org.apache.activemq.command.DataStructure)looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setCompressed(dataIn.readBoolean());
         info.setRedeliveryCounter(dataIn.readInt());
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)looseUnmarsalNestedObject(wireFormat, dataIn);
             }
             info.setBrokerPath(value);
-        }
-        else {
+        } else {
             info.setBrokerPath(null);
         }
         info.setArrival(looseUnmarshalLong(wireFormat, dataIn));
@@ -250,12 +243,11 @@
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
             org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
-            for( int i=0; i < size; i++ ) {
-                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+            for (int i = 0; i < size; i++) {
+                value[i] = (org.apache.activemq.command.BrokerId)looseUnmarsalNestedObject(wireFormat, dataIn);
             }
             info.setCluster(value);
-        }
-        else {
+        } else {
             info.setCluster(null);
         }
         info.setBrokerInTime(looseUnmarshalLong(wireFormat, dataIn));
@@ -264,7 +256,6 @@
         info.afterUnmarshall(wireFormat);
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.MessagePull;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
  * Marshalling code for Open Wire Format for MessagePullMarshaller

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.NetworkBridgeFilter;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.PartialCommand;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.ProducerAck;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,32 +21,30 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
-
-
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
- * Marshalling code for Open Wire Format for ProducerIdMarshaller
- *
- *
- * 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.
- *
+ * Marshalling code for Open Wire Format for ProducerIdMarshaller 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 ProducerIdMarshaller extends BaseDataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
+     * 
      * @return short representation of the type data structure
      */
     public byte getDataStructureType() {
         return ProducerId.DATA_STRUCTURE_TYPE;
     }
-    
+
     /**
      * @return a new object instance
      */
@@ -56,7 +54,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -71,7 +69,6 @@
 
     }
 
-
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -81,15 +78,15 @@
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
         rc += tightMarshalString1(info.getConnectionId(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getValue(), bs);
-        rc+=tightMarshalLong1(wireFormat, info.getSessionId(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getValue(), bs);
+        rc += tightMarshalLong1(wireFormat, info.getSessionId(), bs);
 
         return rc + 0;
     }
 
     /**
      * Write a object instance to data output stream
-     *
+     * 
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
@@ -106,7 +103,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     *
+     * 
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -120,7 +117,6 @@
         info.setSessionId(looseUnmarshalLong(wireFormat, dataIn));
 
     }
-
 
     /**
      * Write the booleans that this object uses to a BooleanStream

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
  * Marshalling code for Open Wire Format for ProducerInfoMarshaller

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveInfoMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.RemoveInfo;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.ReplayCommand;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.SessionId;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
  * Marshalling code for Open Wire Format for SessionIdMarshaller

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.SubscriptionInfo;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.TransactionInfo;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.WireFormatInfo;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java Wed Aug  8 17:34:07 2007
@@ -21,8 +21,10 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.openwire.*;
-import org.apache.activemq.command.*;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.XATransactionId;
+import org.apache.activemq.openwire.BooleanStream;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java Wed Aug  8 17:34:07 2007
@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.jms.JMSException;
 import javax.jms.Session;
@@ -32,8 +33,6 @@
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.transport.TransportListener;
 import org.apache.commons.pool.ObjectPoolFactory;
-
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Holds a real JMS connection along with the session pools associated with it.

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java Wed Aug  8 17:34:07 2007
@@ -16,10 +16,6 @@
  */
 package org.apache.activemq.pool;
 
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.ActiveMQSession;
-import org.apache.activemq.AlreadyClosedException;
-
 import javax.jms.Connection;
 import javax.jms.ConnectionConsumer;
 import javax.jms.ConnectionMetaData;
@@ -34,6 +30,10 @@
 import javax.jms.Topic;
 import javax.jms.TopicConnection;
 import javax.jms.TopicSession;
+
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQSession;
+import org.apache.activemq.AlreadyClosedException;
 
 /**
  * Represents a proxy {@link Connection} which is-a {@link TopicConnection} and

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java Wed Aug  8 17:34:07 2007
@@ -16,16 +16,16 @@
  */
 package org.apache.activemq.pool;
 
-import org.apache.activemq.ActiveMQMessageProducer;
-
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 
+import org.apache.activemq.ActiveMQMessageProducer;
+
 /**
  * A pooled {@link MessageProducer}
- *
+ * 
  * @version $Revision: 1.1 $
  */
 public class PooledProducer implements MessageProducer {
@@ -120,13 +120,13 @@
     }
 
     // Implementation methods
-    //-------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     protected ActiveMQMessageProducer getMessageProducer() {
         return messageProducer;
     }
-    
+
     public String toString() {
-        return "PooledProducer { "+messageProducer+" }";
+        return "PooledProducer { " + messageProducer + " }";
     }
 
 }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java Wed Aug  8 17:34:07 2007
@@ -16,13 +16,13 @@
  */
 package org.apache.activemq.pool;
 
-import org.apache.activemq.ActiveMQQueueSender;
-
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.Queue;
 import javax.jms.QueueSender;
+
+import org.apache.activemq.ActiveMQQueueSender;
 
 /**
  * @version $Revision: 1.1 $

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java Wed Aug  8 17:34:07 2007
@@ -18,6 +18,7 @@
 
 import java.io.Serializable;
 import java.util.Iterator;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.jms.BytesMessage;
 import javax.jms.Destination;
@@ -50,8 +51,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.util.concurrent.CopyOnWriteArrayList;
-
 /**
  * @version $Revision: 1.1 $
  */
@@ -65,11 +64,10 @@
     private ActiveMQTopicPublisher topicPublisher;
     private boolean transactional = true;
     private boolean ignoreClose = false;
-    
+
     private final CopyOnWriteArrayList consumers = new CopyOnWriteArrayList();
     private final CopyOnWriteArrayList browsers = new CopyOnWriteArrayList();
 
-
     public PooledSession(ActiveMQSession aSession, SessionPool sessionPool) {
         this.session = aSession;
         this.sessionPool = sessionPool;
@@ -87,43 +85,42 @@
     public void close() throws JMSException {
         if (!ignoreClose) {
             // TODO a cleaner way to reset??
-    
+
             // lets reset the session
             getSession().setMessageListener(null);
-            
+
             // Close any consumers and browsers that may have been created.
             for (Iterator iter = consumers.iterator(); iter.hasNext();) {
-                MessageConsumer consumer = (MessageConsumer) iter.next();
+                MessageConsumer consumer = (MessageConsumer)iter.next();
                 consumer.close();
             }
             consumers.clear();
-            
+
             for (Iterator iter = browsers.iterator(); iter.hasNext();) {
-                QueueBrowser browser = (QueueBrowser) iter.next();
+                QueueBrowser browser = (QueueBrowser)iter.next();
                 browser.close();
             }
             browsers.clear();
-    
+
             // maybe do a rollback?
             if (transactional) {
                 try {
                     getSession().rollback();
-                }
-                catch (JMSException e) {
+                } catch (JMSException e) {
                     log.warn("Caught exception trying rollback() when putting session back into the pool: " + e, e);
-    
-                    // lets close the session and not put the session back into the pool
+
+                    // lets close the session and not put the session back into
+                    // the pool
                     try {
                         session.close();
-                    }
-                    catch (JMSException e1) {
+                    } catch (JMSException e1) {
                         log.trace("Ignoring exception as discarding session: " + e1, e1);
                     }
                     session = null;
                     return;
                 }
             }
-    
+
             sessionPool.returnSession(this);
         }
     }
@@ -206,9 +203,8 @@
         }
     }
 
-
     // Consumer related methods
-    //-------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     public QueueBrowser createBrowser(Queue queue) throws JMSException {
         return addQueueBrowser(getSession().createBrowser(queue));
     }
@@ -233,7 +229,6 @@
         return addTopicSubscriber(getSession().createDurableSubscriber(topic, selector));
     }
 
-
     public TopicSubscriber createDurableSubscriber(Topic topic, String name, String selector, boolean noLocal) throws JMSException {
         return addTopicSubscriber(getSession().createDurableSubscriber(topic, name, selector, noLocal));
     }
@@ -262,9 +257,8 @@
         return addQueueReceiver(getSession().createReceiver(queue, selector));
     }
 
-
     // Producer related methods
-    //-------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     public MessageProducer createProducer(Destination destination) throws JMSException {
         return new PooledProducer(getMessageProducer(), destination);
     }
@@ -278,7 +272,7 @@
     }
 
     // Implementation methods
-    //-------------------------------------------------------------------------
+    // -------------------------------------------------------------------------
     protected ActiveMQSession getSession() throws AlreadyClosedException {
         if (session == null) {
             throw new AlreadyClosedException("The session has already been closed");
@@ -288,21 +282,21 @@
 
     public ActiveMQMessageProducer getMessageProducer() throws JMSException {
         if (messageProducer == null) {
-            messageProducer = (ActiveMQMessageProducer) getSession().createProducer(null);
+            messageProducer = (ActiveMQMessageProducer)getSession().createProducer(null);
         }
         return messageProducer;
     }
 
     public ActiveMQQueueSender getQueueSender() throws JMSException {
         if (queueSender == null) {
-            queueSender = (ActiveMQQueueSender) getSession().createSender(null);
+            queueSender = (ActiveMQQueueSender)getSession().createSender(null);
         }
         return queueSender;
     }
 
     public ActiveMQTopicPublisher getTopicPublisher() throws JMSException {
         if (topicPublisher == null) {
-            topicPublisher = (ActiveMQTopicPublisher) getSession().createPublisher(null);
+            topicPublisher = (ActiveMQTopicPublisher)getSession().createPublisher(null);
         }
         return topicPublisher;
     }
@@ -311,20 +305,23 @@
         browsers.add(browser);
         return browser;
     }
+
     private MessageConsumer addConsumer(MessageConsumer consumer) {
         consumers.add(consumer);
         return consumer;
-    }    
+    }
+
     private TopicSubscriber addTopicSubscriber(TopicSubscriber subscriber) {
         consumers.add(subscriber);
         return subscriber;
     }
+
     private QueueReceiver addQueueReceiver(QueueReceiver receiver) {
         consumers.add(receiver);
         return receiver;
     }
 
     public String toString() {
-        return "PooledSession { "+session+" }";
+        return "PooledSession { " + session + " }";
     }
 }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java Wed Aug  8 17:34:07 2007
@@ -16,13 +16,13 @@
  */
 package org.apache.activemq.pool;
 
-import org.apache.activemq.ActiveMQTopicPublisher;
-
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.Topic;
 import javax.jms.TopicPublisher;
+
+import org.apache.activemq.ActiveMQTopicPublisher;
 
 /**
  * @version $Revision: 1.1 $

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java Wed Aug  8 17:34:07 2007
@@ -16,15 +16,14 @@
  */
 package org.apache.activemq.pool;
 
+import javax.jms.JMSException;
+
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.AlreadyClosedException;
 import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.PoolableObjectFactory;
-import org.apache.commons.pool.impl.GenericObjectPool;
-
-import javax.jms.JMSException;
 
 /**
  * Represents the session pool for a given JMS connection.
@@ -53,12 +52,10 @@
     public PooledSession borrowSession() throws JMSException {
         try {
             Object object = getSessionPool().borrowObject();
-            return (PooledSession) object;
-        }
-        catch (JMSException e) {
+            return (PooledSession)object;
+        } catch (JMSException e) {
             throw e;
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw JMSExceptionSupport.create(e);
         }
     }
@@ -68,8 +65,7 @@
         getConnection();
         try {
             getSessionPool().returnObject(session);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             throw JMSExceptionSupport.create("Failed to return session to pool: " + e, e);
         }
     }
@@ -81,7 +77,7 @@
     }
 
     public void destroyObject(Object o) throws Exception {
-        PooledSession session = (PooledSession) o;
+        PooledSession session = (PooledSession)o;
         session.getSession().close();
     }
 
@@ -109,7 +105,7 @@
     }
 
     protected ActiveMQSession createSession() throws JMSException {
-        return (ActiveMQSession) getConnection().createSession(key.isTransacted(), key.getAckMode());
+        return (ActiveMQSession)getConnection().createSession(key.isTransacted(), key.getAckMode());
     }
 
 }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java Wed Aug  8 17:34:07 2007
@@ -17,21 +17,21 @@
 package org.apache.activemq.proxy;
 
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.apache.activemq.Service;
 import org.apache.activemq.command.ShutdownInfo;
 import org.apache.activemq.transport.DefaultTransportListener;
 import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 class ProxyConnection implements Service {
 
     static final private Log log = LogFactory.getLog(ProxyConnection.class);
-    
+
     private final Transport localTransport;
     private final Transport remoteTransport;
     private AtomicBoolean shuttingDown = new AtomicBoolean(false);
@@ -43,8 +43,8 @@
     }
 
     public void onFailure(IOException e) {
-        if( !shuttingDown.get() ) {
-            log.debug("Transport error: "+e,e);
+        if (!shuttingDown.get()) {
+            log.debug("Transport error: " + e, e);
             try {
                 stop();
             } catch (Exception ignore) {
@@ -53,20 +53,20 @@
     }
 
     public void start() throws Exception {
-        if( !running.compareAndSet(false, true) ) {
-            return;            
+        if (!running.compareAndSet(false, true)) {
+            return;
         }
-            
+
         this.localTransport.setTransportListener(new DefaultTransportListener() {
             public void onCommand(Object command) {
-                boolean shutdown=false;
-                if( command.getClass() == ShutdownInfo.class ) {
+                boolean shutdown = false;
+                if (command.getClass() == ShutdownInfo.class) {
                     shuttingDown.set(true);
-                    shutdown=true;
+                    shutdown = true;
                 }
                 try {
                     remoteTransport.oneway(command);
-                    if( shutdown )
+                    if (shutdown)
                         stop();
                 } catch (IOException error) {
                     onFailure(error);
@@ -74,11 +74,12 @@
                     onFailure(IOExceptionSupport.create(error));
                 }
             }
+
             public void onException(IOException error) {
                 onFailure(error);
             }
         });
-        
+
         this.remoteTransport.setTransportListener(new DefaultTransportListener() {
             public void onCommand(Object command) {
                 try {
@@ -87,17 +88,18 @@
                     onFailure(error);
                 }
             }
+
             public void onException(IOException error) {
                 onFailure(error);
             }
         });
-        
+
         localTransport.start();
         remoteTransport.start();
     }
-    
+
     public void stop() throws Exception {
-        if( !running.compareAndSet(true, false) ) {
+        if (!running.compareAndSet(true, false)) {
             return;
         }
         shuttingDown.set(true);
@@ -106,5 +108,5 @@
         ss.stop(remoteTransport);
         ss.throwFirstException();
     }
-    
+
 }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java Wed Aug  8 17:34:07 2007
@@ -20,6 +20,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Iterator;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.apache.activemq.Service;
 import org.apache.activemq.transport.CompositeTransport;
@@ -31,8 +32,6 @@
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * @org.apache.xbean.XBean

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationBroker.java Wed Aug  8 17:34:07 2007
@@ -146,7 +146,7 @@
             } else {
                 allowedACLs = authorizationMap.getTempDestinationWriteACLs();
             }
-            if (allowedACLs != null && !subject.isInOneOf(allowedACLs)){
+            if (allowedACLs != null && !subject.isInOneOf(allowedACLs)) {
                 throw new SecurityException("User " + subject.getUserName() + " is not authorized to write to: " + info.getDestination());
             }
             subject.getAuthorizedWriteDests().put(info.getDestination(), info.getDestination());

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationMap.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationMap.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationMap.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/AuthorizationMap.java Wed Aug  8 17:34:07 2007
@@ -16,9 +16,9 @@
  */
 package org.apache.activemq.security;
 
-import org.apache.activemq.command.ActiveMQDestination;
-
 import java.util.Set;
+
+import org.apache.activemq.command.ActiveMQDestination;
 
 /**
  *

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java Wed Aug  8 17:34:07 2007
@@ -16,13 +16,13 @@
  */
 package org.apache.activemq.security;
 
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.filter.DestinationMap;
-
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.filter.DestinationMap;
 
 /**
  * Represents a destination based configuration of policies so that individual

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java Wed Aug  8 17:34:07 2007
@@ -18,6 +18,7 @@
 
 import java.util.Iterator;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
@@ -26,10 +27,7 @@
 import org.apache.activemq.broker.BrokerFilter;
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ConnectionInfo;
-
 import org.apache.activemq.jaas.JassCredentialCallbackHandler;
-
-import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Logs a user in using JAAS.

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationPlugin.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationPlugin.java Wed Aug  8 17:34:07 2007
@@ -16,10 +16,10 @@
  */
 package org.apache.activemq.security;
 
+import java.net.URL;
+
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerPlugin;
-
-import java.net.URL;
 
 /**
  * Adds a JAAS based authentication security plugin

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java?view=diff&rev=564057&r1=564056&r2=564057
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasCertificateAuthenticationBroker.java Wed Aug  8 17:34:07 2007
@@ -17,14 +17,6 @@
 
 package org.apache.activemq.security;
 
-import org.apache.activemq.broker.Broker;
-import org.apache.activemq.broker.BrokerFilter;
-import org.apache.activemq.broker.ConnectionContext;
-import org.apache.activemq.command.ConnectionInfo;
-import org.apache.activemq.jaas.JaasCertificateCallbackHandler;
-import org.apache.activemq.jaas.UserPrincipal;
-import org.apache.activemq.security.JaasAuthenticationBroker.JaasSecurityContext;
-
 import java.security.Principal;
 import java.security.cert.X509Certificate;
 import java.util.Iterator;
@@ -32,6 +24,13 @@
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.LoginContext;
+
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.BrokerFilter;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.jaas.JaasCertificateCallbackHandler;
+import org.apache.activemq.jaas.UserPrincipal;
 
 /**
  * A JAAS Authentication Broker that uses SSL Certificates.



Mime
View raw message