activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r380778 [1/2] - in /incubator/activemq/trunk/activemq-core: ./ src/main/java/org/apache/activemq/command/ src/main/java/org/apache/activemq/openwire/v1/ src/test/java/org/apache/activemq/openwire/v1/
Date Fri, 24 Feb 2006 18:45:04 GMT
Author: jstrachan
Date: Fri Feb 24 10:45:01 2006
New Revision: 380778

URL: http://svn.apache.org/viewcvs?rev=380778&view=rev
Log:
latest generated OpenWire commands and marshallers - updated WireFormatInfo so that it has boolean flags for the various options like stack trace and the like (we should avoid int based bitflags going forwards now as they are harder to support in other languages and are more brittle)

Modified:
    incubator/activemq/trunk/activemq-core/maven.xml
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
    incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java

Modified: incubator/activemq/trunk/activemq-core/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/maven.xml?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/maven.xml (original)
+++ incubator/activemq/trunk/activemq-core/maven.xml Fri Feb 24 10:45:01 2006
@@ -110,10 +110,12 @@
       <classpath refid="openwire.classpath" />
       <sysproperty key="openwire.version" value="${openwire.version}" />
       <arg value="src/main/java/org/apache/activemq/command" />
+      <arg value="src/gram/script/GenerateJavaMarshalling.groovy" />
       <arg value="src/gram/script/GenerateJavaTests.groovy" />
-      <arg value="src/gram/script/GenerateCSharpClasses.groovy" />
       <arg value="src/gram/script/GenerateCSharpMarshalling.groovy" />
-      <arg value="src/gram/script/GenerateJavaMarshalling.groovy" />
+      <arg value="src/gram/script/GenerateCSharpClasses.groovy" />
+      <arg value="src/gram/script/GenerateCppHeaders.groovy" />
+      <arg value="src/gram/script/GenerateCppClasses.groovy" />
       <arg value="src/gram/script/GenerateCMarshalling.groovy" />
     </java>
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java Fri Feb 24 10:45:01 2006
@@ -30,14 +30,13 @@
     public static final byte DATA_STRUCTURE_TYPE = CommandTypes.WIREFORMAT_INFO;
     static final private byte MAGIC[] = new byte[] { 'A', 'c', 't', 'i', 'v', 'e', 'M', 'Q' };
 
-    static final public long STACK_TRACE_MASK = 0x00000001;
-    static final public long TCP_NO_DELAY_MASK = 0x00000002;
-    static final public long CACHE_MASK = 0x00000004;
-    static final public long COMPRESSION_MASK = 0x00000008;
-
     protected int version;
     protected byte magic[] = MAGIC;
-    protected int options;
+
+    private boolean stackTraceEnabled;
+    private boolean tcpNoDelayEnabled;
+    private boolean cacheEnabled;
+    private boolean compressionEnabled;
 
     public byte getDataStructureType() {
         return DATA_STRUCTURE_TYPE;
@@ -114,51 +113,45 @@
     /**
      * @openwire:property version=1
      */
-    public int getOptions() {
-        return options;
+    public boolean isCacheEnabled() {
+        return cacheEnabled;
     }
 
-    public void setOptions(int options) {
-        this.options = options;
+    public void setCacheEnabled(boolean cacheEnabled) {
+        this.cacheEnabled = cacheEnabled;
     }
 
-    public boolean isStackTraceEnabled() {
-        return (options & STACK_TRACE_MASK) != 0;
+    /**
+     * @openwire:property version=1
+     */
+    public boolean isCompressionEnabled() {
+        return compressionEnabled;
     }
 
-    public void setStackTraceEnabled(boolean enable) {
-        if (enable) {
-            options |= STACK_TRACE_MASK;
-        }
-        else {
-            options &= ~STACK_TRACE_MASK;
-        }
+    public void setCompressionEnabled(boolean compressionEnabled) {
+        this.compressionEnabled = compressionEnabled;
     }
 
-    public boolean isTcpNoDelayEnabled() {
-        return (options & TCP_NO_DELAY_MASK) != 0;
+    /**
+     * @openwire:property version=1
+     */
+    public boolean isStackTraceEnabled() {
+        return stackTraceEnabled;
     }
 
-    public void setTcpNoDelayEnabled(boolean enable) {
-        if (enable) {
-            options |= TCP_NO_DELAY_MASK;
-        }
-        else {
-            options &= ~TCP_NO_DELAY_MASK;
-        }
+    public void setStackTraceEnabled(boolean stackTraceEnabled) {
+        this.stackTraceEnabled = stackTraceEnabled;
     }
 
-    public boolean isCacheEnabled() {
-        return (options & CACHE_MASK) != 0;
+    /**
+     * @openwire:property version=1
+     */
+    public boolean isTcpNoDelayEnabled() {
+        return tcpNoDelayEnabled;
     }
 
-    public void setCacheEnabled(boolean enable) {
-        if (enable) {
-            options |= CACHE_MASK;
-        }
-        else {
-            options &= ~CACHE_MASK;
-        }
+    public void setTcpNoDelayEnabled(boolean tcpNoDelayEnabled) {
+        this.tcpNoDelayEnabled = tcpNoDelayEnabled;
     }
 
     public Response visit(CommandVisitor visitor) throws Throwable {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQBytesMessage
+ * Marshalling code for Open Wire Format for ActiveMQBytesMessageMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQDestination
+ * Marshalling code for Open Wire Format for ActiveMQDestinationMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,7 +64,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += writeString(info.getPhysicalName(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQMapMessage
+ * Marshalling code for Open Wire Format for ActiveMQMapMessageMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQMessage
+ * Marshalling code for Open Wire Format for ActiveMQMessageMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQObjectMessage
+ * Marshalling code for Open Wire Format for ActiveMQObjectMessageMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQQueue
+ * Marshalling code for Open Wire Format for ActiveMQQueueMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQStreamMessage
+ * Marshalling code for Open Wire Format for ActiveMQStreamMessageMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQTempDestination
+ * Marshalling code for Open Wire Format for ActiveMQTempDestinationMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -58,7 +58,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQTempQueue
+ * Marshalling code for Open Wire Format for ActiveMQTempQueueMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQTempTopic
+ * Marshalling code for Open Wire Format for ActiveMQTempTopicMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQTextMessage
+ * Marshalling code for Open Wire Format for ActiveMQTextMessageMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ActiveMQTopic
+ * Marshalling code for Open Wire Format for ActiveMQTopicMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for BaseCommand
+ * Marshalling code for Open Wire Format for BaseCommandMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -63,10 +63,9 @@
         BaseCommand info = (BaseCommand)o;
 
         int rc = super.marshal1(wireFormat, o, bs);
-        
-        bs.writeBoolean(info.isResponseRequired());
+                bs.writeBoolean(info.isResponseRequired());
 
-        return rc+2;
+        return rc + 1;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for BrokerId
+ * Marshalling code for Open Wire Format for BrokerIdMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -79,7 +79,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += writeString(info.getValue(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for BrokerInfo
+ * Marshalling code for Open Wire Format for BrokerInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,20 +64,20 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         BrokerInfo info = (BrokerInfo)o;
-        info.setBrokerId((org.apache.activemq.command.BrokerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setBrokerId((BrokerId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setBrokerURL(readString(dataIn, bs));
-        
-		        if( bs.readBoolean() ) {
-		            short size = dataIn.readShort();
-		            org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size];
-		            for( int i=0; i < size; i++ ) {
-		                value[i] = (org.apache.activemq.command.BrokerInfo)unmarsalNestedObject(wireFormat,dataIn, bs);
-		            }
-		            info.setPeerBrokerInfos(value);
-		        } else {
-		            info.setPeerBrokerInfos(null);
-		        }
-        			
+
+        if (bs.readBoolean()) {
+            short size = dataIn.readShort();
+            BrokerInfo value[] = new BrokerInfo[size];
+            for( int i=0; i < size; i++ ) {
+                value[i] = (BrokerInfo) unmarsalNestedObject(wireFormat,dataIn, bs);
+            }
+            info.setPeerBrokerInfos(value);
+        }
+        else {
+            info.setPeerBrokerInfos(null);
+        }
         info.setBrokerName(readString(dataIn, bs));
         info.setSlaveBroker(bs.readBoolean());
 
@@ -98,7 +98,7 @@
         rc += writeString(info.getBrokerName(), bs);
         bs.writeBoolean(info.isSlaveBroker());
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionErrorMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ConnectionError
+ * Marshalling code for Open Wire Format for ConnectionErrorMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,8 +64,8 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         ConnectionError info = (ConnectionError)o;
-        info.setException((java.lang.Throwable) unmarsalThrowable(wireFormat, dataIn, bs));
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setException((Throwable) unmarsalThrowable(wireFormat, dataIn, bs));
+        info.setConnectionId((ConnectionId) unmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -81,7 +81,7 @@
         rc += marshalThrowable(wireFormat, info.getException(), bs);
         rc += marshal1NestedObject(wireFormat, info.getConnectionId(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ConnectionId
+ * Marshalling code for Open Wire Format for ConnectionIdMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -79,7 +79,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += writeString(info.getValue(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ConnectionInfo
+ * Marshalling code for Open Wire Format for ConnectionInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,22 +64,22 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         ConnectionInfo info = (ConnectionInfo)o;
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setClientId(readString(dataIn, bs));
         info.setPassword(readString(dataIn, bs));
         info.setUserName(readString(dataIn, bs));
-        
-		        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)unmarsalNestedObject(wireFormat,dataIn, bs);
-		            }
-		            info.setBrokerPath(value);
-		        } else {
-		            info.setBrokerPath(null);
-		        }
-        			
+
+        if (bs.readBoolean()) {
+            short size = dataIn.readShort();
+            BrokerId value[] = new BrokerId[size];
+            for( int i=0; i < size; i++ ) {
+                value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
 
     }
 
@@ -98,7 +98,7 @@
         rc += writeString(info.getUserName(), bs);
         rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ConsumerId
+ * Marshalling code for Open Wire Format for ConsumerIdMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -83,7 +83,7 @@
         rc+=marshal1Long(wireFormat, info.getSessionId(), bs);
         rc+=marshal1Long(wireFormat, info.getValue(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ConsumerInfo
+ * Marshalling code for Open Wire Format for ConsumerInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,9 +64,9 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setBrowser(bs.readBoolean());
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setPrefetchSize(dataIn.readInt());
         info.setDispatchAsync(bs.readBoolean());
         info.setSelector(readString(dataIn, bs));
@@ -75,18 +75,18 @@
         info.setExclusive(bs.readBoolean());
         info.setRetroactive(bs.readBoolean());
         info.setPriority(dataIn.readByte());
-        
-		        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)unmarsalNestedObject(wireFormat,dataIn, bs);
-		            }
-		            info.setBrokerPath(value);
-		        } else {
-		            info.setBrokerPath(null);
-		        }
-        			
+
+        if (bs.readBoolean()) {
+            short size = dataIn.readShort();
+            BrokerId value[] = new BrokerId[size];
+            for( int i=0; i < size; i++ ) {
+                value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
         info.setNetworkSubscription(bs.readBoolean());
 
     }
@@ -103,18 +103,16 @@
         rc += marshal1CachedObject(wireFormat, info.getConsumerId(), bs);
         bs.writeBoolean(info.isBrowser());
         rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
-        
-        bs.writeBoolean(info.isDispatchAsync());
+                bs.writeBoolean(info.isDispatchAsync());
         rc += writeString(info.getSelector(), bs);
         rc += writeString(info.getSubcriptionName(), bs);
         bs.writeBoolean(info.isNoLocal());
         bs.writeBoolean(info.isExclusive());
         bs.writeBoolean(info.isRetroactive());
-        
-        rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
+                rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
         bs.writeBoolean(info.isNetworkSubscription());
 
-        return rc+5;
+        return rc + 2;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ControlCommand
+ * Marshalling code for Open Wire Format for ControlCommandMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -79,7 +79,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += writeString(info.getCommand(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for DataArrayResponse
+ * Marshalling code for Open Wire Format for DataArrayResponseMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,18 +64,18 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         DataArrayResponse info = (DataArrayResponse)o;
-        
-		        if( bs.readBoolean() ) {
-		            short size = dataIn.readShort();
-		            org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size];
-		            for( int i=0; i < size; i++ ) {
-		                value[i] = (org.apache.activemq.command.DataStructure)unmarsalNestedObject(wireFormat,dataIn, bs);
-		            }
-		            info.setData(value);
-		        } else {
-		            info.setData(null);
-		        }
-        			
+
+        if (bs.readBoolean()) {
+            short size = dataIn.readShort();
+            DataStructure value[] = new DataStructure[size];
+            for( int i=0; i < size; i++ ) {
+                value[i] = (DataStructure) unmarsalNestedObject(wireFormat,dataIn, bs);
+            }
+            info.setData(value);
+        }
+        else {
+            info.setData(null);
+        }
 
     }
 
@@ -90,7 +90,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += marshalObjectArray(wireFormat, info.getData(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for DataResponse
+ * Marshalling code for Open Wire Format for DataResponseMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,7 +64,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         DataResponse info = (DataResponse)o;
-        info.setData((org.apache.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setData((DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -79,7 +79,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += marshal1NestedObject(wireFormat, info.getData(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for DestinationInfo
+ * Marshalling code for Open Wire Format for DestinationInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,22 +64,22 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setOperationType(dataIn.readByte());
         info.setTimeout(unmarshalLong(wireFormat, dataIn, bs));
-        
-		        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)unmarsalNestedObject(wireFormat,dataIn, bs);
-		            }
-		            info.setBrokerPath(value);
-		        } else {
-		            info.setBrokerPath(null);
-		        }
-        			
+
+        if (bs.readBoolean()) {
+            short size = dataIn.readShort();
+            BrokerId value[] = new BrokerId[size];
+            for( int i=0; i < size; i++ ) {
+                value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
 
     }
 
@@ -94,11 +94,10 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += marshal1CachedObject(wireFormat, info.getConnectionId(), bs);
         rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
-        
-        rc+=marshal1Long(wireFormat, info.getTimeout(), bs);
+                rc+=marshal1Long(wireFormat, info.getTimeout(), bs);
         rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
 
-        return rc+1;
+        return rc + 1;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for DiscoveryEvent
+ * Marshalling code for Open Wire Format for DiscoveryEventMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -81,7 +81,7 @@
         rc += writeString(info.getServiceName(), bs);
         rc += writeString(info.getBrokerName(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ExceptionResponse
+ * Marshalling code for Open Wire Format for ExceptionResponseMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,7 +64,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         ExceptionResponse info = (ExceptionResponse)o;
-        info.setException((java.lang.Throwable) unmarsalThrowable(wireFormat, dataIn, bs));
+        info.setException((Throwable) unmarsalThrowable(wireFormat, dataIn, bs));
 
     }
 
@@ -79,7 +79,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += marshalThrowable(wireFormat, info.getException(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for FlushCommand
+ * Marshalling code for Open Wire Format for FlushCommandMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for IntegerResponse
+ * Marshalling code for Open Wire Format for IntegerResponseMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -78,8 +78,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
         
-
-        return rc+4;
+        return rc + 1;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for JournalQueueAck
+ * Marshalling code for Open Wire Format for JournalQueueAckMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,8 +64,8 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setMessageAck((org.apache.activemq.command.MessageAck) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageAck((MessageAck) unmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -81,7 +81,7 @@
         rc += marshal1NestedObject(wireFormat, info.getDestination(), bs);
         rc += marshal1NestedObject(wireFormat, info.getMessageAck(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for JournalTopicAck
+ * Marshalling code for Open Wire Format for JournalTopicAckMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,12 +64,12 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setMessageSequenceId(unmarshalLong(wireFormat, dataIn, bs));
         info.setSubscritionName(readString(dataIn, bs));
         info.setClientId(readString(dataIn, bs));
-        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -89,7 +89,7 @@
         rc += writeString(info.getClientId(), bs);
         rc += marshal1NestedObject(wireFormat, info.getTransactionId(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for JournalTrace
+ * Marshalling code for Open Wire Format for JournalTraceMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -79,7 +79,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += writeString(info.getMessage(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for JournalTransaction
+ * Marshalling code for Open Wire Format for JournalTransactionMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,7 +64,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setType(dataIn.readByte());
         info.setWasPrepared(bs.readBoolean());
 
@@ -80,10 +80,9 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
         rc += marshal1NestedObject(wireFormat, info.getTransactionId(), bs);
-        
-        bs.writeBoolean(info.getWasPrepared());
+                bs.writeBoolean(info.getWasPrepared());
 
-        return rc+1;
+        return rc + 1;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for KeepAliveInfo
+ * Marshalling code for Open Wire Format for KeepAliveInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for LocalTransactionId
+ * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -65,7 +65,7 @@
 
         LocalTransactionId info = (LocalTransactionId)o;
         info.setValue(unmarshalLong(wireFormat, dataIn, bs));
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -81,7 +81,7 @@
         rc+=marshal1Long(wireFormat, info.getValue(), bs);
         rc += marshal1CachedObject(wireFormat, info.getConnectionId(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for MessageAck
+ * Marshalling code for Open Wire Format for MessageAckMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,12 +64,12 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         MessageAck info = (MessageAck)o;
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setAckType(dataIn.readByte());
-        info.setFirstMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setLastMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setFirstMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setLastMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setMessageCount(dataIn.readInt());
 
     }
@@ -86,12 +86,10 @@
         rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
         rc += marshal1CachedObject(wireFormat, info.getTransactionId(), bs);
         rc += marshal1CachedObject(wireFormat, info.getConsumerId(), bs);
-        
-        rc += marshal1NestedObject(wireFormat, info.getFirstMessageId(), bs);
+                rc += marshal1NestedObject(wireFormat, info.getFirstMessageId(), bs);
         rc += marshal1NestedObject(wireFormat, info.getLastMessageId(), bs);
         
-
-        return rc+5;
+        return rc + 2;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for MessageDispatch
+ * Marshalling code for Open Wire Format for MessageDispatchMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,9 +64,9 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-        info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessage((org.apache.activemq.command.Message) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setMessage((Message) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setRedeliveryCounter(dataIn.readInt());
 
     }
@@ -84,8 +84,7 @@
         rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
         rc += marshal1NestedObject(wireFormat, info.getMessage(), bs);
         
-
-        return rc+4;
+        return rc + 1;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for MessageDispatchNotification
+ * Marshalling code for Open Wire Format for MessageDispatchNotificationMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,10 +64,10 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setDeliverySequenceId(unmarshalLong(wireFormat, dataIn, bs));
-        info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -85,7 +85,7 @@
         rc+=marshal1Long(wireFormat, info.getDeliverySequenceId(), bs);
         rc += marshal1NestedObject(wireFormat, info.getMessageId(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for MessageId
+ * Marshalling code for Open Wire Format for MessageIdMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,7 +64,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setProducerSequenceId(unmarshalLong(wireFormat, dataIn, bs));
         info.setBrokerSequenceId(unmarshalLong(wireFormat, dataIn, bs));
 
@@ -83,7 +83,7 @@
         rc+=marshal1Long(wireFormat, info.getProducerSequenceId(), bs);
         rc+=marshal1Long(wireFormat, info.getBrokerSequenceId(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for Message
+ * Marshalling code for Open Wire Format for MessageMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -52,57 +52,53 @@
 
         info.beforeUnmarshall(wireFormat);
         
-        info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setOriginalDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setMessageId((MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setOriginalTransactionId((TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setGroupID(readString(dataIn, bs));
         info.setGroupSequence(dataIn.readInt());
         info.setCorrelationId(readString(dataIn, bs));
         info.setPersistent(bs.readBoolean());
         info.setExpiration(unmarshalLong(wireFormat, dataIn, bs));
         info.setPriority(dataIn.readByte());
-        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setReplyTo((ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setTimestamp(unmarshalLong(wireFormat, dataIn, bs));
         info.setType(readString(dataIn, bs));
-        
-    		if( bs.readBoolean() ) {
-        		int size = dataIn.readInt();
-        		byte data[] = new byte[size];
-        		dataIn.readFully(data);
-        		info.setContent(new org.activeio.ByteSequence(data,0,size));
-    		} else {
-        		info.setContent(null);
-    		}
-    		
-        
-    		if( bs.readBoolean() ) {
-        		int size = dataIn.readInt();
-        		byte data[] = new byte[size];
-        		dataIn.readFully(data);
-        		info.setMarshalledProperties(new org.activeio.ByteSequence(data,0,size));
-    		} else {
-        		info.setMarshalledProperties(null);
-    		}
-    		
-        info.setDataStructure((org.apache.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        if( bs.readBoolean() ) {
+            int size = dataIn.readInt();
+            byte data[] = new byte[size];
+            dataIn.readFully(data);
+            info.setContent(new org.activeio.ByteSequence(data,0,size));
+            } else {
+            info.setContent(null);
+        }
+        if( bs.readBoolean() ) {
+            int size = dataIn.readInt();
+            byte data[] = new byte[size];
+            dataIn.readFully(data);
+            info.setMarshalledProperties(new org.activeio.ByteSequence(data,0,size));
+            } else {
+            info.setMarshalledProperties(null);
+        }
+        info.setDataStructure((DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTargetConsumerId((ConsumerId) unmarsalCachedObject(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)unmarsalNestedObject(wireFormat,dataIn, bs);
-		            }
-		            info.setBrokerPath(value);
-		        } else {
-		            info.setBrokerPath(null);
-		        }
-        			
+
+        if (bs.readBoolean()) {
+            short size = dataIn.readShort();
+            BrokerId value[] = new BrokerId[size];
+            for( int i=0; i < size; i++ ) {
+                value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
         info.setArrival(unmarshalLong(wireFormat, dataIn, bs));
         info.setUserID(readString(dataIn, bs));
         info.setRecievedByDFBridge(bs.readBoolean());
@@ -129,32 +125,25 @@
         rc += marshal1NestedObject(wireFormat, info.getMessageId(), bs);
         rc += marshal1CachedObject(wireFormat, info.getOriginalTransactionId(), bs);
         rc += writeString(info.getGroupID(), bs);
-        
-        rc += writeString(info.getCorrelationId(), bs);
+                rc += writeString(info.getCorrelationId(), bs);
         bs.writeBoolean(info.isPersistent());
         rc+=marshal1Long(wireFormat, info.getExpiration(), bs);
-        
-        rc += marshal1NestedObject(wireFormat, info.getReplyTo(), bs);
+                rc += marshal1NestedObject(wireFormat, info.getReplyTo(), bs);
         rc+=marshal1Long(wireFormat, info.getTimestamp(), bs);
         rc += writeString(info.getType(), bs);
-        
-		bs.writeBoolean(info.getContent()!=null);
-		rc += info.getContent()==null ? 0 : info.getContent().getLength()+4;
-		
-        
-		bs.writeBoolean(info.getMarshalledProperties()!=null);
-		rc += info.getMarshalledProperties()==null ? 0 : info.getMarshalledProperties().getLength()+4;
-		
+        bs.writeBoolean(info.getContent()!=null);
+        rc += info.getContent()==null ? 0 : info.getContent().getLength()+4;
+        bs.writeBoolean(info.getMarshalledProperties()!=null);
+        rc += info.getMarshalledProperties()==null ? 0 : info.getMarshalledProperties().getLength()+4;
         rc += marshal1NestedObject(wireFormat, info.getDataStructure(), bs);
         rc += marshal1CachedObject(wireFormat, info.getTargetConsumerId(), bs);
         bs.writeBoolean(info.isCompressed());
-        
-        rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
+                rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
         rc+=marshal1Long(wireFormat, info.getArrival(), bs);
         rc += writeString(info.getUserID(), bs);
         bs.writeBoolean(info.isRecievedByDFBridge());
 
-        return rc+9;
+        return rc + 3;
     }
 
     /**
@@ -183,20 +172,16 @@
         marshal2NestedObject(wireFormat, info.getReplyTo(), dataOut, bs);
         marshal2Long(wireFormat, info.getTimestamp(), dataOut, bs);
         writeString(info.getType(), dataOut, bs);
-        
-		if(bs.readBoolean()) { 
-             org.activeio.ByteSequence data = info.getContent();
-			dataOut.writeInt(data.getLength());
-			dataOut.write(data.getData(), data.getOffset(), data.getLength());
-		}
-		
-        
-		if(bs.readBoolean()) { 
-             org.activeio.ByteSequence data = info.getMarshalledProperties();
-			dataOut.writeInt(data.getLength());
-			dataOut.write(data.getData(), data.getOffset(), data.getLength());
-		}
-		
+        if(bs.readBoolean()) {
+           org.activeio.ByteSequence data = info.getContent();
+           dataOut.writeInt(data.getLength());
+           dataOut.write(data.getData(), data.getOffset(), data.getLength());
+        }
+        if(bs.readBoolean()) {
+           org.activeio.ByteSequence data = info.getMarshalledProperties();
+           dataOut.writeInt(data.getLength());
+           dataOut.write(data.getData(), data.getOffset(), data.getLength());
+        }
         marshal2NestedObject(wireFormat, info.getDataStructure(), dataOut, bs);
         marshal2CachedObject(wireFormat, info.getTargetConsumerId(), dataOut, bs);
         bs.readBoolean();

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ProducerId
+ * Marshalling code for Open Wire Format for ProducerIdMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -83,7 +83,7 @@
         rc+=marshal1Long(wireFormat, info.getValue(), bs);
         rc+=marshal1Long(wireFormat, info.getSessionId(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ProducerInfo
+ * Marshalling code for Open Wire Format for ProducerInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,20 +64,20 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-        info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
-        
-		        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)unmarsalNestedObject(wireFormat,dataIn, bs);
-		            }
-		            info.setBrokerPath(value);
-		        } else {
-		            info.setBrokerPath(null);
-		        }
-        			
+        info.setProducerId((ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+
+        if (bs.readBoolean()) {
+            short size = dataIn.readShort();
+            BrokerId value[] = new BrokerId[size];
+            for( int i=0; i < size; i++ ) {
+                value[i] = (BrokerId) unmarsalNestedObject(wireFormat,dataIn, bs);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
 
     }
 
@@ -94,7 +94,7 @@
         rc += marshal1CachedObject(wireFormat, info.getDestination(), bs);
         rc += marshalObjectArray(wireFormat, info.getBrokerPath(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for RemoveInfo
+ * Marshalling code for Open Wire Format for RemoveInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,7 +64,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-        info.setObjectId((org.apache.activemq.command.DataStructure) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setObjectId((DataStructure) unmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -79,7 +79,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += marshal1CachedObject(wireFormat, info.getObjectId(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for RemoveSubscriptionInfo
+ * Marshalling code for Open Wire Format for RemoveSubscriptionInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,7 +64,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setSubcriptionName(readString(dataIn, bs));
         info.setClientId(readString(dataIn, bs));
 
@@ -83,7 +83,7 @@
         rc += writeString(info.getSubcriptionName(), bs);
         rc += writeString(info.getClientId(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for Response
+ * Marshalling code for Open Wire Format for ResponseMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -78,8 +78,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
         
-
-        return rc+2;
+        return rc + 1;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for SessionId
+ * Marshalling code for Open Wire Format for SessionIdMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -81,7 +81,7 @@
         rc += writeString(info.getConnectionId(), bs);
         rc+=marshal1Long(wireFormat, info.getValue(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for SessionInfo
+ * Marshalling code for Open Wire Format for SessionInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -64,7 +64,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         SessionInfo info = (SessionInfo)o;
-        info.setSessionId((org.apache.activemq.command.SessionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setSessionId((SessionId) unmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -79,7 +79,7 @@
         int rc = super.marshal1(wireFormat, o, bs);
         rc += marshal1CachedObject(wireFormat, info.getSessionId(), bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java?rev=380778&r1=380777&r2=380778&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java Fri Feb 24 10:45:01 2006
@@ -26,7 +26,7 @@
 
 
 /**
- * Marshalling code for Open Wire Format for ShutdownInfo
+ * Marshalling code for Open Wire Format for ShutdownInfoMarshaller
  *
  *
  * NOTE!: This file is auto generated - do not modify!
@@ -73,7 +73,7 @@
 
         int rc = super.marshal1(wireFormat, o, bs);
 
-        return rc+0;
+        return rc + 0;
     }
 
     /**



Mime
View raw message