You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2025/02/04 00:20:06 UTC

(activemq) branch activemq-6.1.x updated: Fix line endings in openwire generated files

This is an automated email from the ASF dual-hosted git repository.

mattrpav pushed a commit to branch activemq-6.1.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-6.1.x by this push:
     new b61a7a928b Fix line endings in openwire generated files
b61a7a928b is described below

commit b61a7a928b2dabccf0bb8637f13bb9678898b2a6
Author: Matt Pavlovich <ma...@apache.org>
AuthorDate: Mon Feb 3 17:52:46 2025 -0600

    Fix line endings in openwire generated files
    
    (cherry picked from commit c45a9d99da19068d9e8f2faa3ff58c1d1d89982f)
---
 .../openwire/v9/ConnectionControlMarshaller.java   | 171 ++++++++++-
 .../activemq/openwire/v9/MessageMarshaller.java    | 313 ++++++++++++++++++++-
 .../openwire/v9/PartialCommandMarshaller.java      | 135 ++++++++-
 .../openwire/v9/WireFormatInfoMarshaller.java      | 156 +++++++++-
 .../openwire/v9/XATransactionIdMarshaller.java     | 140 ++++++++-
 .../activemq/openwire/v7/MessageMarshaller.java    | 313 ++++++++++++++++++++-
 .../openwire/v7/PartialCommandMarshaller.java      | 135 ++++++++-
 .../openwire/v7/WireFormatInfoMarshaller.java      | 156 +++++++++-
 .../openwire/v7/XATransactionIdMarshaller.java     | 140 ++++++++-
 .../openwire/v8/ConnectionControlMarshaller.java   | 171 ++++++++++-
 .../activemq/openwire/v8/MessageMarshaller.java    | 313 ++++++++++++++++++++-
 .../openwire/v8/PartialCommandMarshaller.java      | 135 ++++++++-
 .../openwire/v8/WireFormatInfoMarshaller.java      | 156 +++++++++-
 .../openwire/v8/XATransactionIdMarshaller.java     | 140 ++++++++-
 14 files changed, 2560 insertions(+), 14 deletions(-)

diff --git a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java
index 8236f9bb76..b28b191605 100644
--- a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java
+++ b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/ConnectionControlMarshaller.java
@@ -1 +1,170 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v9;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for ConnectionControlMarshaller  *  *  * 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.  *  *   */ public class ConnectionControlMarshaller extends BaseCommandMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return ConnectionControl.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new ConnectionControl();     }      /**      * 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      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          ConnectionControl info = (ConnectionControl)o;         info.setClose(bs.readBoolean());         info.setExit(bs.readBoolean());         info.setFaultTolerant(bs.readBoolean());         info.setResume(bs.readBoolean());         info.setSuspend(bs.readBoolean());         info.setConnectedBrokers(tightUnmarshalString(dataIn, bs));         info.setReconnectTo(tightUnmarshalString(dataIn, bs));         info.setRebalanceConnection(bs.readBoolean());         info.setToken(tightUnmarshalByteArray(dataIn, bs));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          ConnectionControl info = (ConnectionControl)o;          int r
 c = super.tightMarshal1(wireFormat, o, bs);         bs.writeBoolean(info.isClose());         bs.writeBoolean(info.isExit());         bs.writeBoolean(info.isFaultTolerant());         bs.writeBoolean(info.isResume());         bs.writeBoolean(info.isSuspend());         rc += tightMarshalString1(info.getConnectedBrokers(), bs);         rc += tightMarshalString1(info.getReconnectTo(), bs);         bs.writeBoolean(info.isRebalanceConnection());         rc += tightMarshalByteArray1(info.getToken(), 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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          ConnectionControl info = (ConnectionControl)o;         bs.
 readBoolean();         bs.readBoolean();         bs.readBoolean();         bs.readBoolean();         bs.readBoolean();         tightMarshalString2(info.getConnectedBrokers(), dataOut, bs);         tightMarshalString2(info.getReconnectTo(), dataOut, bs);         bs.readBoolean();         tightMarshalByteArray2(info.getToken(), dataOut, bs);      }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          ConnectionControl info = (ConnectionControl)o;         info.setClose(dataIn.readBoolean());         info.setExit(dataIn.readBoolean());         info.setFaultTolerant(dataIn.readBoolean());         info.setResume(dataIn.readBoolean());         info.setSusp
 end(dataIn.readBoolean());         info.setConnectedBrokers(looseUnmarshalString(dataIn));         info.setReconnectTo(looseUnmarshalString(dataIn));         info.setRebalanceConnection(dataIn.readBoolean());         info.setToken(looseUnmarshalByteArray(dataIn));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          ConnectionControl info = (ConnectionControl)o;          super.looseMarshal(wireFormat, o, dataOut);         dataOut.writeBoolean(info.isClose());         dataOut.writeBoolean(info.isExit());         dataOut.writeBoolean(info.isFaultTolerant());         dataOut.writeBoolean(info.isResume());         dataOut.writeBoolean(info.isSuspend());         looseMarshalString(info.getConnectedBrokers(), dataOut);         looseMarshalString(info.getReconnectTo(), dataOut);         dataOut.writeBoolean(info.isRebalanceConnection());
          looseMarshalByteArray(wireFormat, info.getToken(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v9;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for ConnectionControlMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class ConnectionControlMarshaller extends BaseCommandMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return ConnectionControl.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new ConnectionControl();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        ConnectionControl info = (ConnectionControl)o;
+        info.setClose(bs.readBoolean());
+        info.setExit(bs.readBoolean());
+        info.setFaultTolerant(bs.readBoolean());
+        info.setResume(bs.readBoolean());
+        info.setSuspend(bs.readBoolean());
+        info.setConnectedBrokers(tightUnmarshalString(dataIn, bs));
+        info.setReconnectTo(tightUnmarshalString(dataIn, bs));
+        info.setRebalanceConnection(bs.readBoolean());
+        info.setToken(tightUnmarshalByteArray(dataIn, bs));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        ConnectionControl info = (ConnectionControl)o;
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        bs.writeBoolean(info.isClose());
+        bs.writeBoolean(info.isExit());
+        bs.writeBoolean(info.isFaultTolerant());
+        bs.writeBoolean(info.isResume());
+        bs.writeBoolean(info.isSuspend());
+        rc += tightMarshalString1(info.getConnectedBrokers(), bs);
+        rc += tightMarshalString1(info.getReconnectTo(), bs);
+        bs.writeBoolean(info.isRebalanceConnection());
+        rc += tightMarshalByteArray1(info.getToken(), 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        ConnectionControl info = (ConnectionControl)o;
+        bs.readBoolean();
+        bs.readBoolean();
+        bs.readBoolean();
+        bs.readBoolean();
+        bs.readBoolean();
+        tightMarshalString2(info.getConnectedBrokers(), dataOut, bs);
+        tightMarshalString2(info.getReconnectTo(), dataOut, bs);
+        bs.readBoolean();
+        tightMarshalByteArray2(info.getToken(), dataOut, bs);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        ConnectionControl info = (ConnectionControl)o;
+        info.setClose(dataIn.readBoolean());
+        info.setExit(dataIn.readBoolean());
+        info.setFaultTolerant(dataIn.readBoolean());
+        info.setResume(dataIn.readBoolean());
+        info.setSuspend(dataIn.readBoolean());
+        info.setConnectedBrokers(looseUnmarshalString(dataIn));
+        info.setReconnectTo(looseUnmarshalString(dataIn));
+        info.setRebalanceConnection(dataIn.readBoolean());
+        info.setToken(looseUnmarshalByteArray(dataIn));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        ConnectionControl info = (ConnectionControl)o;
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        dataOut.writeBoolean(info.isClose());
+        dataOut.writeBoolean(info.isExit());
+        dataOut.writeBoolean(info.isFaultTolerant());
+        dataOut.writeBoolean(info.isResume());
+        dataOut.writeBoolean(info.isSuspend());
+        looseMarshalString(info.getConnectedBrokers(), dataOut);
+        looseMarshalString(info.getReconnectTo(), dataOut);
+        dataOut.writeBoolean(info.isRebalanceConnection());
+        looseMarshalByteArray(wireFormat, info.getToken(), dataOut);
+
+    }
+}
+
diff --git a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java
index 087375d84f..b39ce065a0 100644
--- a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java
+++ b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/MessageMarshaller.java
@@ -1 +1,312 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v9;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * 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.  *  *   */ 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      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          Message info = (Message)o;          info.beforeUnmarshall(wireFormat);                  info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedO
 bject(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(dat
 aIn.readByte());         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.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);             }             info.setBrokerPath(value);         }         else {             info.setBrokerPath(null);         }         info.setArrival(tightUnmarshalLong(wireFormat, dataIn, bs));         info.setUserID(tightUnmarshalString(dataIn, bs));         info.setRecievedByDFBridge(bs.readBoolean());         info.setDroppable(bs.readBoolean());          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);             }             info.setCluster(value);         }         else {             info.setCluster(null);         }         info.setBrokerInTime(tightUnmarshalLong(wireFormat, dataIn, 
 bs));         info.setBrokerOutTime(tightUnmarshalLong(wireFormat, dataIn, bs));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          Message info = (Message)o;          info.beforeMarshall(wireFormat);          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs);         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataS
 tructure)info.getOriginalTransactionId(), bs);         rc += tightMarshalString1(info.getGroupID(), bs);         rc += tightMarshalString1(info.getCorrelationId(), bs);         bs.writeBoolean(info.isPersistent());         rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs);         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs);         rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs);         rc += tightMarshalString1(info.getType(), bs);         rc += tightMarshalByteSequence1(info.getContent(), bs);         rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs);         bs.writeBoolean(info.isCompressed());         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);         rc+=tightMarshalLong1(wireFor
 mat, 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);          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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          Message info = (Message)o;         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);         tightMarshalCachedObject2
 (wireFormat, (DataStructure)info.getDestination(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs);         tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs);         tightMarshalString2(info.getGroupID(), dataOut, bs);         dataOut.writeInt(info.getGroupSequence());         tightMarshalString2(info.getCorrelationId(), dataOut, bs);         bs.readBoolean();         tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs);         dataOut.writeByte(info.getPriority());         tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs);         tightMarshalString2(i
 nfo.getType(), dataOut, bs);         tightMarshalByteSequence2(info.getContent(), dataOut, bs);         tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);         tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs);         bs.readBoolean();         dataOut.writeInt(info.getRedeliveryCounter());         tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getArrival(), dataOut, bs);         tightMarshalString2(info.getUserID(), dataOut, bs);         bs.readBoolean();         bs.readBoolean();         tightMarshalObjectArray2(wireFormat, info.getCluster(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getBrokerInTime(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getBrokerOutTime(), dataOut, bs);          info.afterMarshall(wireFormat);  
     }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          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.setMess
 ageId((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.setTimestamp(looseUnmarshalLong(wireFormat, dataIn));         info.setType(looseUnmarshalString(dataIn));         info.setContent(looseUnmarshalByteSequence(dataIn));         info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));         info.setDataStructure((org.apache.activemq.command.DataStruct
 ure) 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);             }             info.setBrokerPath(value);         }         else {             info.setBrokerPath(null);         }         info.setArrival(looseUnmarshalLong(wireFormat, dataIn));         info.setUserID(looseUnmarshalString(dataIn));         info.setRecievedByDFBridge(dataIn.readBoolean());         info.setDroppable(dataIn.readBoolean());          if (dataIn.re
 adBoolean()) {             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);             }             info.setCluster(value);         }         else {             info.setCluster(null);         }         info.setBrokerInTime(looseUnmarshalLong(wireFormat, dataIn));         info.setBrokerOutTime(looseUnmarshalLong(wireFormat, dataIn));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          Message info = (Message)o;          info.beforeMarshall(wireFormat);          super.looseMarshal(wireFormat, o, dataOut);         looseMarshalCachedObject(wireFor
 mat, (DataStructure)info.getProducerId(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut);         looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut);         looseMarshalString(info.getGroupID(), dataOut);         dataOut.writeInt(info.getGroupSequence());         looseMarshalString(info.getCorrelationId(), dataOut);         dataOut.writeBoolean(info.isPersistent());         looseMarshalLong(wireFormat, info.getExpiration(), dataOut);         dataOut.writeByte(info.getPriority());         looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut);         looseMarshalLong(wireFormat, 
 info.getTimestamp(), dataOut);         looseMarshalString(info.getType(), dataOut);         looseMarshalByteSequence(wireFormat, info.getContent(), dataOut);         looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);         looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut);         dataOut.writeBoolean(info.isCompressed());         dataOut.writeInt(info.getRedeliveryCounter());         looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);         looseMarshalLong(wireFormat, info.getArrival(), dataOut);         looseMarshalString(info.getUserID(), dataOut);         dataOut.writeBoolean(info.isRecievedByDFBridge());         dataOut.writeBoolean(info.isDroppable());         looseMarshalObjectArray(wireFormat, info.getCluster(), dataOut);         looseMarshalLong(wireFormat, info.getBrokerInTime(), dataOut);    
      looseMarshalLong(wireFormat, info.getBrokerOutTime(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v9;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * 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.
+ *
+ * 
+ */
+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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        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.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.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.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);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
+        info.setArrival(tightUnmarshalLong(wireFormat, dataIn, bs));
+        info.setUserID(tightUnmarshalString(dataIn, bs));
+        info.setRecievedByDFBridge(bs.readBoolean());
+        info.setDroppable(bs.readBoolean());
+
+        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);
+            }
+            info.setCluster(value);
+        }
+        else {
+            info.setCluster(null);
+        }
+        info.setBrokerInTime(tightUnmarshalLong(wireFormat, dataIn, bs));
+        info.setBrokerOutTime(tightUnmarshalLong(wireFormat, dataIn, bs));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        Message info = (Message)o;
+
+        info.beforeMarshall(wireFormat);
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalTransactionId(), bs);
+        rc += tightMarshalString1(info.getGroupID(), bs);
+        rc += tightMarshalString1(info.getCorrelationId(), bs);
+        bs.writeBoolean(info.isPersistent());
+        rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs);
+        rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs);
+        rc += tightMarshalString1(info.getType(), bs);
+        rc += tightMarshalByteSequence1(info.getContent(), bs);
+        rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs);
+        bs.writeBoolean(info.isCompressed());
+        rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), 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);
+
+        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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        Message info = (Message)o;
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs);
+        tightMarshalString2(info.getGroupID(), dataOut, bs);
+        dataOut.writeInt(info.getGroupSequence());
+        tightMarshalString2(info.getCorrelationId(), dataOut, bs);
+        bs.readBoolean();
+        tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs);
+        dataOut.writeByte(info.getPriority());
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs);
+        tightMarshalString2(info.getType(), dataOut, bs);
+        tightMarshalByteSequence2(info.getContent(), dataOut, bs);
+        tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs);
+        bs.readBoolean();
+        dataOut.writeInt(info.getRedeliveryCounter());
+        tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getArrival(), dataOut, bs);
+        tightMarshalString2(info.getUserID(), dataOut, bs);
+        bs.readBoolean();
+        bs.readBoolean();
+        tightMarshalObjectArray2(wireFormat, info.getCluster(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getBrokerInTime(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getBrokerOutTime(), dataOut, bs);
+
+        info.afterMarshall(wireFormat);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        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.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.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.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);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
+        info.setArrival(looseUnmarshalLong(wireFormat, dataIn));
+        info.setUserID(looseUnmarshalString(dataIn));
+        info.setRecievedByDFBridge(dataIn.readBoolean());
+        info.setDroppable(dataIn.readBoolean());
+
+        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);
+            }
+            info.setCluster(value);
+        }
+        else {
+            info.setCluster(null);
+        }
+        info.setBrokerInTime(looseUnmarshalLong(wireFormat, dataIn));
+        info.setBrokerOutTime(looseUnmarshalLong(wireFormat, dataIn));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        Message info = (Message)o;
+
+        info.beforeMarshall(wireFormat);
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut);
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut);
+        looseMarshalString(info.getGroupID(), dataOut);
+        dataOut.writeInt(info.getGroupSequence());
+        looseMarshalString(info.getCorrelationId(), dataOut);
+        dataOut.writeBoolean(info.isPersistent());
+        looseMarshalLong(wireFormat, info.getExpiration(), dataOut);
+        dataOut.writeByte(info.getPriority());
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut);
+        looseMarshalLong(wireFormat, info.getTimestamp(), dataOut);
+        looseMarshalString(info.getType(), dataOut);
+        looseMarshalByteSequence(wireFormat, info.getContent(), dataOut);
+        looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut);
+        dataOut.writeBoolean(info.isCompressed());
+        dataOut.writeInt(info.getRedeliveryCounter());
+        looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
+        looseMarshalLong(wireFormat, info.getArrival(), dataOut);
+        looseMarshalString(info.getUserID(), dataOut);
+        dataOut.writeBoolean(info.isRecievedByDFBridge());
+        dataOut.writeBoolean(info.isDroppable());
+        looseMarshalObjectArray(wireFormat, info.getCluster(), dataOut);
+        looseMarshalLong(wireFormat, info.getBrokerInTime(), dataOut);
+        looseMarshalLong(wireFormat, info.getBrokerOutTime(), dataOut);
+
+    }
+}
+
diff --git a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java
index 4d035b0f4f..d4445bdd4b 100644
--- a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java
+++ b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/PartialCommandMarshaller.java
@@ -1 +1,134 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v9;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for PartialCommandMarshaller  *  *  * 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.  *  *   */ public class PartialCommandMarshaller extends BaseDataStreamMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return PartialCommand.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new PartialCommand();     }      /**      * 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      * @throw
 s IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          PartialCommand info = (PartialCommand)o;         info.setCommandId(dataIn.readInt());         info.setData(tightUnmarshalByteArray(dataIn, bs));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          PartialCommand info = (PartialCommand)o;          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalByteArray1(info.getData(), bs);          return rc + 4;     }      /**      * 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      */     public void tightMarshal2(O
 penWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          PartialCommand info = (PartialCommand)o;         dataOut.writeInt(info.getCommandId());         tightMarshalByteArray2(info.getData(), dataOut, bs);      }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          PartialCommand info = (PartialCommand)o;         info.setCommandId(dataIn.readInt());         info.setData(looseUnmarshalByteArray(dataIn));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat
 , Object o, DataOutput dataOut) throws IOException {          PartialCommand info = (PartialCommand)o;          super.looseMarshal(wireFormat, o, dataOut);         dataOut.writeInt(info.getCommandId());         looseMarshalByteArray(wireFormat, info.getData(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v9;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for PartialCommandMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class PartialCommandMarshaller extends BaseDataStreamMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return PartialCommand.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new PartialCommand();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        PartialCommand info = (PartialCommand)o;
+        info.setCommandId(dataIn.readInt());
+        info.setData(tightUnmarshalByteArray(dataIn, bs));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        PartialCommand info = (PartialCommand)o;
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalByteArray1(info.getData(), bs);
+
+        return rc + 4;
+    }
+
+    /**
+     * 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        PartialCommand info = (PartialCommand)o;
+        dataOut.writeInt(info.getCommandId());
+        tightMarshalByteArray2(info.getData(), dataOut, bs);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        PartialCommand info = (PartialCommand)o;
+        info.setCommandId(dataIn.readInt());
+        info.setData(looseUnmarshalByteArray(dataIn));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        PartialCommand info = (PartialCommand)o;
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        dataOut.writeInt(info.getCommandId());
+        looseMarshalByteArray(wireFormat, info.getData(), dataOut);
+
+    }
+}
+
diff --git a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java
index f8b3f97d74..005afb59f1 100644
--- a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java
+++ b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/WireFormatInfoMarshaller.java
@@ -1 +1,155 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v9;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for WireFormatInfoMarshaller  *  *  * 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.  *  *   */ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return WireFormatInfo.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new WireFormatInfo();     }      /**      * 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      * @throw
 s IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          WireFormatInfo info = (WireFormatInfo)o;          info.beforeUnmarshall(wireFormat);                  info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8));         info.setVersion(dataIn.readInt());         info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          WireFormatInfo info = (WireFormatInfo)o;          info.beforeMarshall(wireFormat);          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8);         rc += tightMarshalByteSequence1(info
 .getMarshalledProperties(), bs);          return rc + 4;     }      /**      * 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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          WireFormatInfo info = (WireFormatInfo)o;         tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8);         dataOut.writeInt(info.getVersion());         tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);          info.afterMarshall(wireFormat);      }      /**      * 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      */     public void loo
 seUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          WireFormatInfo info = (WireFormatInfo)o;          info.beforeUnmarshall(wireFormat);                  info.setMagic(looseUnmarshalConstByteArray(dataIn, 8));         info.setVersion(dataIn.readInt());         info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          WireFormatInfo info = (WireFormatInfo)o;          info.beforeMarshall(wireFormat);          super.looseMarshal(wireFormat, o, dataOut);         looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8);         dataOut.writeInt(info.getVersion());         looseMarshalByteSequence(wireFormat, info.getMarshalled
 Properties(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v9;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for WireFormatInfoMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return WireFormatInfo.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new WireFormatInfo();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
+        info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8));
+        info.setVersion(dataIn.readInt());
+        info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeMarshall(wireFormat);
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8);
+        rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
+
+        return rc + 4;
+    }
+
+    /**
+     * 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        WireFormatInfo info = (WireFormatInfo)o;
+        tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8);
+        dataOut.writeInt(info.getVersion());
+        tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
+
+        info.afterMarshall(wireFormat);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
+        info.setMagic(looseUnmarshalConstByteArray(dataIn, 8));
+        info.setVersion(dataIn.readInt());
+        info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeMarshall(wireFormat);
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8);
+        dataOut.writeInt(info.getVersion());
+        looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
+
+    }
+}
+
diff --git a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java
index 693b5fec23..525fda5765 100644
--- a/activemq-client/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java
+++ b/activemq-client/src/main/java/org/apache/activemq/openwire/v9/XATransactionIdMarshaller.java
@@ -1 +1,139 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v9;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for XATransactionIdMarshaller  *  *  * 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.  *  *   */ public class XATransactionIdMarshaller extends TransactionIdMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return XATransactionId.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new XATransactionId();     }      /**      * 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      * @th
 rows IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          XATransactionId info = (XATransactionId)o;         info.setFormatId(dataIn.readInt());         info.setGlobalTransactionId(tightUnmarshalByteArray(dataIn, bs));         info.setBranchQualifier(tightUnmarshalByteArray(dataIn, bs));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          XATransactionId info = (XATransactionId)o;          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalByteArray1(info.getGlobalTransactionId(), bs);         rc += tightMarshalByteArray1(info.getBranchQualifier(), bs);          return rc + 4;     }      /**      * 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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          XATransactionId info = (XATransactionId)o;         dataOut.writeInt(info.getFormatId());         tightMarshalByteArray2(info.getGlobalTransactionId(), dataOut, bs);         tightMarshalByteArray2(info.getBranchQualifier(), dataOut, bs);      }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          XATransactionId info = (
 XATransactionId)o;         info.setFormatId(dataIn.readInt());         info.setGlobalTransactionId(looseUnmarshalByteArray(dataIn));         info.setBranchQualifier(looseUnmarshalByteArray(dataIn));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          XATransactionId info = (XATransactionId)o;          super.looseMarshal(wireFormat, o, dataOut);         dataOut.writeInt(info.getFormatId());         looseMarshalByteArray(wireFormat, info.getGlobalTransactionId(), dataOut);         looseMarshalByteArray(wireFormat, info.getBranchQualifier(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v9;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for XATransactionIdMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class XATransactionIdMarshaller extends TransactionIdMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return XATransactionId.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new XATransactionId();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        XATransactionId info = (XATransactionId)o;
+        info.setFormatId(dataIn.readInt());
+        info.setGlobalTransactionId(tightUnmarshalByteArray(dataIn, bs));
+        info.setBranchQualifier(tightUnmarshalByteArray(dataIn, bs));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        XATransactionId info = (XATransactionId)o;
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalByteArray1(info.getGlobalTransactionId(), bs);
+        rc += tightMarshalByteArray1(info.getBranchQualifier(), bs);
+
+        return rc + 4;
+    }
+
+    /**
+     * 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        XATransactionId info = (XATransactionId)o;
+        dataOut.writeInt(info.getFormatId());
+        tightMarshalByteArray2(info.getGlobalTransactionId(), dataOut, bs);
+        tightMarshalByteArray2(info.getBranchQualifier(), dataOut, bs);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        XATransactionId info = (XATransactionId)o;
+        info.setFormatId(dataIn.readInt());
+        info.setGlobalTransactionId(looseUnmarshalByteArray(dataIn));
+        info.setBranchQualifier(looseUnmarshalByteArray(dataIn));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        XATransactionId info = (XATransactionId)o;
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        dataOut.writeInt(info.getFormatId());
+        looseMarshalByteArray(wireFormat, info.getGlobalTransactionId(), dataOut);
+        looseMarshalByteArray(wireFormat, info.getBranchQualifier(), dataOut);
+
+    }
+}
+
diff --git a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java
index 60658c9eff..2e05c4c684 100644
--- a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java
+++ b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/MessageMarshaller.java
@@ -1 +1,312 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v7;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * 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.  *  *   */ 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      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          Message info = (Message)o;          info.beforeUnmarshall(wireFormat);                  info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedO
 bject(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(dat
 aIn.readByte());         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.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);             }             info.setBrokerPath(value);         }         else {             info.setBrokerPath(null);         }         info.setArrival(tightUnmarshalLong(wireFormat, dataIn, bs));         info.setUserID(tightUnmarshalString(dataIn, bs));         info.setRecievedByDFBridge(bs.readBoolean());         info.setDroppable(bs.readBoolean());          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);             }             info.setCluster(value);         }         else {             info.setCluster(null);         }         info.setBrokerInTime(tightUnmarshalLong(wireFormat, dataIn, 
 bs));         info.setBrokerOutTime(tightUnmarshalLong(wireFormat, dataIn, bs));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          Message info = (Message)o;          info.beforeMarshall(wireFormat);          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs);         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataS
 tructure)info.getOriginalTransactionId(), bs);         rc += tightMarshalString1(info.getGroupID(), bs);         rc += tightMarshalString1(info.getCorrelationId(), bs);         bs.writeBoolean(info.isPersistent());         rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs);         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs);         rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs);         rc += tightMarshalString1(info.getType(), bs);         rc += tightMarshalByteSequence1(info.getContent(), bs);         rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs);         bs.writeBoolean(info.isCompressed());         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);         rc+=tightMarshalLong1(wireFor
 mat, 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);          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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          Message info = (Message)o;         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);         tightMarshalCachedObject2
 (wireFormat, (DataStructure)info.getDestination(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs);         tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs);         tightMarshalString2(info.getGroupID(), dataOut, bs);         dataOut.writeInt(info.getGroupSequence());         tightMarshalString2(info.getCorrelationId(), dataOut, bs);         bs.readBoolean();         tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs);         dataOut.writeByte(info.getPriority());         tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs);         tightMarshalString2(i
 nfo.getType(), dataOut, bs);         tightMarshalByteSequence2(info.getContent(), dataOut, bs);         tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);         tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs);         bs.readBoolean();         dataOut.writeInt(info.getRedeliveryCounter());         tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getArrival(), dataOut, bs);         tightMarshalString2(info.getUserID(), dataOut, bs);         bs.readBoolean();         bs.readBoolean();         tightMarshalObjectArray2(wireFormat, info.getCluster(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getBrokerInTime(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getBrokerOutTime(), dataOut, bs);          info.afterMarshall(wireFormat);  
     }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          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.setMess
 ageId((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.setTimestamp(looseUnmarshalLong(wireFormat, dataIn));         info.setType(looseUnmarshalString(dataIn));         info.setContent(looseUnmarshalByteSequence(dataIn));         info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));         info.setDataStructure((org.apache.activemq.command.DataStruct
 ure) 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);             }             info.setBrokerPath(value);         }         else {             info.setBrokerPath(null);         }         info.setArrival(looseUnmarshalLong(wireFormat, dataIn));         info.setUserID(looseUnmarshalString(dataIn));         info.setRecievedByDFBridge(dataIn.readBoolean());         info.setDroppable(dataIn.readBoolean());          if (dataIn.re
 adBoolean()) {             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);             }             info.setCluster(value);         }         else {             info.setCluster(null);         }         info.setBrokerInTime(looseUnmarshalLong(wireFormat, dataIn));         info.setBrokerOutTime(looseUnmarshalLong(wireFormat, dataIn));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          Message info = (Message)o;          info.beforeMarshall(wireFormat);          super.looseMarshal(wireFormat, o, dataOut);         looseMarshalCachedObject(wireFor
 mat, (DataStructure)info.getProducerId(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut);         looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut);         looseMarshalString(info.getGroupID(), dataOut);         dataOut.writeInt(info.getGroupSequence());         looseMarshalString(info.getCorrelationId(), dataOut);         dataOut.writeBoolean(info.isPersistent());         looseMarshalLong(wireFormat, info.getExpiration(), dataOut);         dataOut.writeByte(info.getPriority());         looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut);         looseMarshalLong(wireFormat, 
 info.getTimestamp(), dataOut);         looseMarshalString(info.getType(), dataOut);         looseMarshalByteSequence(wireFormat, info.getContent(), dataOut);         looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);         looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut);         dataOut.writeBoolean(info.isCompressed());         dataOut.writeInt(info.getRedeliveryCounter());         looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);         looseMarshalLong(wireFormat, info.getArrival(), dataOut);         looseMarshalString(info.getUserID(), dataOut);         dataOut.writeBoolean(info.isRecievedByDFBridge());         dataOut.writeBoolean(info.isDroppable());         looseMarshalObjectArray(wireFormat, info.getCluster(), dataOut);         looseMarshalLong(wireFormat, info.getBrokerInTime(), dataOut);    
      looseMarshalLong(wireFormat, info.getBrokerOutTime(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v7;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * 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.
+ *
+ * 
+ */
+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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        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.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.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.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);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
+        info.setArrival(tightUnmarshalLong(wireFormat, dataIn, bs));
+        info.setUserID(tightUnmarshalString(dataIn, bs));
+        info.setRecievedByDFBridge(bs.readBoolean());
+        info.setDroppable(bs.readBoolean());
+
+        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);
+            }
+            info.setCluster(value);
+        }
+        else {
+            info.setCluster(null);
+        }
+        info.setBrokerInTime(tightUnmarshalLong(wireFormat, dataIn, bs));
+        info.setBrokerOutTime(tightUnmarshalLong(wireFormat, dataIn, bs));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        Message info = (Message)o;
+
+        info.beforeMarshall(wireFormat);
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalTransactionId(), bs);
+        rc += tightMarshalString1(info.getGroupID(), bs);
+        rc += tightMarshalString1(info.getCorrelationId(), bs);
+        bs.writeBoolean(info.isPersistent());
+        rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs);
+        rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs);
+        rc += tightMarshalString1(info.getType(), bs);
+        rc += tightMarshalByteSequence1(info.getContent(), bs);
+        rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs);
+        bs.writeBoolean(info.isCompressed());
+        rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), 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);
+
+        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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        Message info = (Message)o;
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs);
+        tightMarshalString2(info.getGroupID(), dataOut, bs);
+        dataOut.writeInt(info.getGroupSequence());
+        tightMarshalString2(info.getCorrelationId(), dataOut, bs);
+        bs.readBoolean();
+        tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs);
+        dataOut.writeByte(info.getPriority());
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs);
+        tightMarshalString2(info.getType(), dataOut, bs);
+        tightMarshalByteSequence2(info.getContent(), dataOut, bs);
+        tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs);
+        bs.readBoolean();
+        dataOut.writeInt(info.getRedeliveryCounter());
+        tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getArrival(), dataOut, bs);
+        tightMarshalString2(info.getUserID(), dataOut, bs);
+        bs.readBoolean();
+        bs.readBoolean();
+        tightMarshalObjectArray2(wireFormat, info.getCluster(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getBrokerInTime(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getBrokerOutTime(), dataOut, bs);
+
+        info.afterMarshall(wireFormat);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        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.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.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.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);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
+        info.setArrival(looseUnmarshalLong(wireFormat, dataIn));
+        info.setUserID(looseUnmarshalString(dataIn));
+        info.setRecievedByDFBridge(dataIn.readBoolean());
+        info.setDroppable(dataIn.readBoolean());
+
+        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);
+            }
+            info.setCluster(value);
+        }
+        else {
+            info.setCluster(null);
+        }
+        info.setBrokerInTime(looseUnmarshalLong(wireFormat, dataIn));
+        info.setBrokerOutTime(looseUnmarshalLong(wireFormat, dataIn));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        Message info = (Message)o;
+
+        info.beforeMarshall(wireFormat);
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut);
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut);
+        looseMarshalString(info.getGroupID(), dataOut);
+        dataOut.writeInt(info.getGroupSequence());
+        looseMarshalString(info.getCorrelationId(), dataOut);
+        dataOut.writeBoolean(info.isPersistent());
+        looseMarshalLong(wireFormat, info.getExpiration(), dataOut);
+        dataOut.writeByte(info.getPriority());
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut);
+        looseMarshalLong(wireFormat, info.getTimestamp(), dataOut);
+        looseMarshalString(info.getType(), dataOut);
+        looseMarshalByteSequence(wireFormat, info.getContent(), dataOut);
+        looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut);
+        dataOut.writeBoolean(info.isCompressed());
+        dataOut.writeInt(info.getRedeliveryCounter());
+        looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
+        looseMarshalLong(wireFormat, info.getArrival(), dataOut);
+        looseMarshalString(info.getUserID(), dataOut);
+        dataOut.writeBoolean(info.isRecievedByDFBridge());
+        dataOut.writeBoolean(info.isDroppable());
+        looseMarshalObjectArray(wireFormat, info.getCluster(), dataOut);
+        looseMarshalLong(wireFormat, info.getBrokerInTime(), dataOut);
+        looseMarshalLong(wireFormat, info.getBrokerOutTime(), dataOut);
+
+    }
+}
+
diff --git a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java
index a613c25edc..8a4c8fac01 100644
--- a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java
+++ b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/PartialCommandMarshaller.java
@@ -1 +1,134 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v7;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for PartialCommandMarshaller  *  *  * 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.  *  *   */ public class PartialCommandMarshaller extends BaseDataStreamMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return PartialCommand.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new PartialCommand();     }      /**      * 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      * @throw
 s IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          PartialCommand info = (PartialCommand)o;         info.setCommandId(dataIn.readInt());         info.setData(tightUnmarshalByteArray(dataIn, bs));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          PartialCommand info = (PartialCommand)o;          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalByteArray1(info.getData(), bs);          return rc + 4;     }      /**      * 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      */     public void tightMarshal2(O
 penWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          PartialCommand info = (PartialCommand)o;         dataOut.writeInt(info.getCommandId());         tightMarshalByteArray2(info.getData(), dataOut, bs);      }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          PartialCommand info = (PartialCommand)o;         info.setCommandId(dataIn.readInt());         info.setData(looseUnmarshalByteArray(dataIn));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat
 , Object o, DataOutput dataOut) throws IOException {          PartialCommand info = (PartialCommand)o;          super.looseMarshal(wireFormat, o, dataOut);         dataOut.writeInt(info.getCommandId());         looseMarshalByteArray(wireFormat, info.getData(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v7;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for PartialCommandMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class PartialCommandMarshaller extends BaseDataStreamMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return PartialCommand.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new PartialCommand();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        PartialCommand info = (PartialCommand)o;
+        info.setCommandId(dataIn.readInt());
+        info.setData(tightUnmarshalByteArray(dataIn, bs));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        PartialCommand info = (PartialCommand)o;
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalByteArray1(info.getData(), bs);
+
+        return rc + 4;
+    }
+
+    /**
+     * 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        PartialCommand info = (PartialCommand)o;
+        dataOut.writeInt(info.getCommandId());
+        tightMarshalByteArray2(info.getData(), dataOut, bs);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        PartialCommand info = (PartialCommand)o;
+        info.setCommandId(dataIn.readInt());
+        info.setData(looseUnmarshalByteArray(dataIn));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        PartialCommand info = (PartialCommand)o;
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        dataOut.writeInt(info.getCommandId());
+        looseMarshalByteArray(wireFormat, info.getData(), dataOut);
+
+    }
+}
+
diff --git a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java
index c880ce95fe..9e4c12c470 100644
--- a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java
+++ b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/WireFormatInfoMarshaller.java
@@ -1 +1,155 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v7;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for WireFormatInfoMarshaller  *  *  * 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.  *  *   */ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return WireFormatInfo.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new WireFormatInfo();     }      /**      * 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      * @throw
 s IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          WireFormatInfo info = (WireFormatInfo)o;          info.beforeUnmarshall(wireFormat);                  info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8));         info.setVersion(dataIn.readInt());         info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          WireFormatInfo info = (WireFormatInfo)o;          info.beforeMarshall(wireFormat);          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8);         rc += tightMarshalByteSequence1(info
 .getMarshalledProperties(), bs);          return rc + 4;     }      /**      * 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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          WireFormatInfo info = (WireFormatInfo)o;         tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8);         dataOut.writeInt(info.getVersion());         tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);          info.afterMarshall(wireFormat);      }      /**      * 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      */     public void loo
 seUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          WireFormatInfo info = (WireFormatInfo)o;          info.beforeUnmarshall(wireFormat);                  info.setMagic(looseUnmarshalConstByteArray(dataIn, 8));         info.setVersion(dataIn.readInt());         info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          WireFormatInfo info = (WireFormatInfo)o;          info.beforeMarshall(wireFormat);          super.looseMarshal(wireFormat, o, dataOut);         looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8);         dataOut.writeInt(info.getVersion());         looseMarshalByteSequence(wireFormat, info.getMarshalled
 Properties(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v7;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for WireFormatInfoMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return WireFormatInfo.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new WireFormatInfo();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
+        info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8));
+        info.setVersion(dataIn.readInt());
+        info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeMarshall(wireFormat);
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8);
+        rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
+
+        return rc + 4;
+    }
+
+    /**
+     * 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        WireFormatInfo info = (WireFormatInfo)o;
+        tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8);
+        dataOut.writeInt(info.getVersion());
+        tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
+
+        info.afterMarshall(wireFormat);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
+        info.setMagic(looseUnmarshalConstByteArray(dataIn, 8));
+        info.setVersion(dataIn.readInt());
+        info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeMarshall(wireFormat);
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8);
+        dataOut.writeInt(info.getVersion());
+        looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
+
+    }
+}
+
diff --git a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java
index 1422c45733..3a02551a4c 100644
--- a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java
+++ b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v7/XATransactionIdMarshaller.java
@@ -1 +1,139 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v7;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for XATransactionIdMarshaller  *  *  * 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.  *  *   */ public class XATransactionIdMarshaller extends TransactionIdMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return XATransactionId.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new XATransactionId();     }      /**      * 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      * @th
 rows IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          XATransactionId info = (XATransactionId)o;         info.setFormatId(dataIn.readInt());         info.setGlobalTransactionId(tightUnmarshalByteArray(dataIn, bs));         info.setBranchQualifier(tightUnmarshalByteArray(dataIn, bs));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          XATransactionId info = (XATransactionId)o;          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalByteArray1(info.getGlobalTransactionId(), bs);         rc += tightMarshalByteArray1(info.getBranchQualifier(), bs);          return rc + 4;     }      /**      * 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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          XATransactionId info = (XATransactionId)o;         dataOut.writeInt(info.getFormatId());         tightMarshalByteArray2(info.getGlobalTransactionId(), dataOut, bs);         tightMarshalByteArray2(info.getBranchQualifier(), dataOut, bs);      }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          XATransactionId info = (
 XATransactionId)o;         info.setFormatId(dataIn.readInt());         info.setGlobalTransactionId(looseUnmarshalByteArray(dataIn));         info.setBranchQualifier(looseUnmarshalByteArray(dataIn));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          XATransactionId info = (XATransactionId)o;          super.looseMarshal(wireFormat, o, dataOut);         dataOut.writeInt(info.getFormatId());         looseMarshalByteArray(wireFormat, info.getGlobalTransactionId(), dataOut);         looseMarshalByteArray(wireFormat, info.getBranchQualifier(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v7;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for XATransactionIdMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class XATransactionIdMarshaller extends TransactionIdMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return XATransactionId.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new XATransactionId();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        XATransactionId info = (XATransactionId)o;
+        info.setFormatId(dataIn.readInt());
+        info.setGlobalTransactionId(tightUnmarshalByteArray(dataIn, bs));
+        info.setBranchQualifier(tightUnmarshalByteArray(dataIn, bs));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        XATransactionId info = (XATransactionId)o;
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalByteArray1(info.getGlobalTransactionId(), bs);
+        rc += tightMarshalByteArray1(info.getBranchQualifier(), bs);
+
+        return rc + 4;
+    }
+
+    /**
+     * 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        XATransactionId info = (XATransactionId)o;
+        dataOut.writeInt(info.getFormatId());
+        tightMarshalByteArray2(info.getGlobalTransactionId(), dataOut, bs);
+        tightMarshalByteArray2(info.getBranchQualifier(), dataOut, bs);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        XATransactionId info = (XATransactionId)o;
+        info.setFormatId(dataIn.readInt());
+        info.setGlobalTransactionId(looseUnmarshalByteArray(dataIn));
+        info.setBranchQualifier(looseUnmarshalByteArray(dataIn));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        XATransactionId info = (XATransactionId)o;
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        dataOut.writeInt(info.getFormatId());
+        looseMarshalByteArray(wireFormat, info.getGlobalTransactionId(), dataOut);
+        looseMarshalByteArray(wireFormat, info.getBranchQualifier(), dataOut);
+
+    }
+}
+
diff --git a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java
index 73c3ad30d4..32c5dd5b7e 100644
--- a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java
+++ b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/ConnectionControlMarshaller.java
@@ -1 +1,170 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v8;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for ConnectionControlMarshaller  *  *  * 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.  *  *  */ public class ConnectionControlMarshaller extends BaseCommandMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return ConnectionControl.DATA_STRUCTURE_TYPE;     }      /**      * @return a new object instance      */     public DataStructure createObject() {         return new ConnectionControl();     }      /**      * 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      * @th
 rows IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          ConnectionControl info = (ConnectionControl)o;         info.setClose(bs.readBoolean());         info.setExit(bs.readBoolean());         info.setFaultTolerant(bs.readBoolean());         info.setResume(bs.readBoolean());         info.setSuspend(bs.readBoolean());         info.setConnectedBrokers(tightUnmarshalString(dataIn, bs));         info.setReconnectTo(tightUnmarshalString(dataIn, bs));         info.setRebalanceConnection(bs.readBoolean());         info.setToken(tightUnmarshalByteArray(dataIn, bs));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          ConnectionControl info = (ConnectionControl)o;          int rc = su
 per.tightMarshal1(wireFormat, o, bs);         bs.writeBoolean(info.isClose());         bs.writeBoolean(info.isExit());         bs.writeBoolean(info.isFaultTolerant());         bs.writeBoolean(info.isResume());         bs.writeBoolean(info.isSuspend());         rc += tightMarshalString1(info.getConnectedBrokers(), bs);         rc += tightMarshalString1(info.getReconnectTo(), bs);         bs.writeBoolean(info.isRebalanceConnection());         rc += tightMarshalByteArray1(info.getToken(), 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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          ConnectionControl info = (ConnectionControl)o;         bs.readBo
 olean();         bs.readBoolean();         bs.readBoolean();         bs.readBoolean();         bs.readBoolean();         tightMarshalString2(info.getConnectedBrokers(), dataOut, bs);         tightMarshalString2(info.getReconnectTo(), dataOut, bs);         bs.readBoolean();         tightMarshalByteArray2(info.getToken(), dataOut, bs);      }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          ConnectionControl info = (ConnectionControl)o;         info.setClose(dataIn.readBoolean());         info.setExit(dataIn.readBoolean());         info.setFaultTolerant(dataIn.readBoolean());         info.setResume(dataIn.readBoolean());         info.setSuspend(da
 taIn.readBoolean());         info.setConnectedBrokers(looseUnmarshalString(dataIn));         info.setReconnectTo(looseUnmarshalString(dataIn));         info.setRebalanceConnection(dataIn.readBoolean());         info.setToken(looseUnmarshalByteArray(dataIn));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          ConnectionControl info = (ConnectionControl)o;          super.looseMarshal(wireFormat, o, dataOut);         dataOut.writeBoolean(info.isClose());         dataOut.writeBoolean(info.isExit());         dataOut.writeBoolean(info.isFaultTolerant());         dataOut.writeBoolean(info.isResume());         dataOut.writeBoolean(info.isSuspend());         looseMarshalString(info.getConnectedBrokers(), dataOut);         looseMarshalString(info.getReconnectTo(), dataOut);         dataOut.writeBoolean(info.isRebalanceConnection());      
    looseMarshalByteArray(wireFormat, info.getToken(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v8;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for ConnectionControlMarshaller
+ *
+ *
+ * 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.
+ *
+ *
+ */
+public class ConnectionControlMarshaller extends BaseCommandMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return ConnectionControl.DATA_STRUCTURE_TYPE;
+    }
+
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new ConnectionControl();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        ConnectionControl info = (ConnectionControl)o;
+        info.setClose(bs.readBoolean());
+        info.setExit(bs.readBoolean());
+        info.setFaultTolerant(bs.readBoolean());
+        info.setResume(bs.readBoolean());
+        info.setSuspend(bs.readBoolean());
+        info.setConnectedBrokers(tightUnmarshalString(dataIn, bs));
+        info.setReconnectTo(tightUnmarshalString(dataIn, bs));
+        info.setRebalanceConnection(bs.readBoolean());
+        info.setToken(tightUnmarshalByteArray(dataIn, bs));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        ConnectionControl info = (ConnectionControl)o;
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        bs.writeBoolean(info.isClose());
+        bs.writeBoolean(info.isExit());
+        bs.writeBoolean(info.isFaultTolerant());
+        bs.writeBoolean(info.isResume());
+        bs.writeBoolean(info.isSuspend());
+        rc += tightMarshalString1(info.getConnectedBrokers(), bs);
+        rc += tightMarshalString1(info.getReconnectTo(), bs);
+        bs.writeBoolean(info.isRebalanceConnection());
+        rc += tightMarshalByteArray1(info.getToken(), 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        ConnectionControl info = (ConnectionControl)o;
+        bs.readBoolean();
+        bs.readBoolean();
+        bs.readBoolean();
+        bs.readBoolean();
+        bs.readBoolean();
+        tightMarshalString2(info.getConnectedBrokers(), dataOut, bs);
+        tightMarshalString2(info.getReconnectTo(), dataOut, bs);
+        bs.readBoolean();
+        tightMarshalByteArray2(info.getToken(), dataOut, bs);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        ConnectionControl info = (ConnectionControl)o;
+        info.setClose(dataIn.readBoolean());
+        info.setExit(dataIn.readBoolean());
+        info.setFaultTolerant(dataIn.readBoolean());
+        info.setResume(dataIn.readBoolean());
+        info.setSuspend(dataIn.readBoolean());
+        info.setConnectedBrokers(looseUnmarshalString(dataIn));
+        info.setReconnectTo(looseUnmarshalString(dataIn));
+        info.setRebalanceConnection(dataIn.readBoolean());
+        info.setToken(looseUnmarshalByteArray(dataIn));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        ConnectionControl info = (ConnectionControl)o;
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        dataOut.writeBoolean(info.isClose());
+        dataOut.writeBoolean(info.isExit());
+        dataOut.writeBoolean(info.isFaultTolerant());
+        dataOut.writeBoolean(info.isResume());
+        dataOut.writeBoolean(info.isSuspend());
+        looseMarshalString(info.getConnectedBrokers(), dataOut);
+        looseMarshalString(info.getReconnectTo(), dataOut);
+        dataOut.writeBoolean(info.isRebalanceConnection());
+        looseMarshalByteArray(wireFormat, info.getToken(), dataOut);
+
+    }
+}
+
diff --git a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java
index aa1bd3045c..f6e5f3d5fa 100644
--- a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java
+++ b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/MessageMarshaller.java
@@ -1 +1,312 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v8;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * 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.  *  *   */ 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      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          Message info = (Message)o;          info.beforeUnmarshall(wireFormat);                  info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedO
 bject(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(dat
 aIn.readByte());         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.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);             }             info.setBrokerPath(value);         }         else {             info.setBrokerPath(null);         }         info.setArrival(tightUnmarshalLong(wireFormat, dataIn, bs));         info.setUserID(tightUnmarshalString(dataIn, bs));         info.setRecievedByDFBridge(bs.readBoolean());         info.setDroppable(bs.readBoolean());          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);             }             info.setCluster(value);         }         else {             info.setCluster(null);         }         info.setBrokerInTime(tightUnmarshalLong(wireFormat, dataIn, 
 bs));         info.setBrokerOutTime(tightUnmarshalLong(wireFormat, dataIn, bs));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          Message info = (Message)o;          info.beforeMarshall(wireFormat);          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs);         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataS
 tructure)info.getOriginalTransactionId(), bs);         rc += tightMarshalString1(info.getGroupID(), bs);         rc += tightMarshalString1(info.getCorrelationId(), bs);         bs.writeBoolean(info.isPersistent());         rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs);         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs);         rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs);         rc += tightMarshalString1(info.getType(), bs);         rc += tightMarshalByteSequence1(info.getContent(), bs);         rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);         rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs);         rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs);         bs.writeBoolean(info.isCompressed());         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);         rc+=tightMarshalLong1(wireFor
 mat, 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);          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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          Message info = (Message)o;         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);         tightMarshalCachedObject2
 (wireFormat, (DataStructure)info.getDestination(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs);         tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs);         tightMarshalString2(info.getGroupID(), dataOut, bs);         dataOut.writeInt(info.getGroupSequence());         tightMarshalString2(info.getCorrelationId(), dataOut, bs);         bs.readBoolean();         tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs);         dataOut.writeByte(info.getPriority());         tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs);         tightMarshalString2(i
 nfo.getType(), dataOut, bs);         tightMarshalByteSequence2(info.getContent(), dataOut, bs);         tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);         tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs);         tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs);         bs.readBoolean();         dataOut.writeInt(info.getRedeliveryCounter());         tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getArrival(), dataOut, bs);         tightMarshalString2(info.getUserID(), dataOut, bs);         bs.readBoolean();         bs.readBoolean();         tightMarshalObjectArray2(wireFormat, info.getCluster(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getBrokerInTime(), dataOut, bs);         tightMarshalLong2(wireFormat, info.getBrokerOutTime(), dataOut, bs);          info.afterMarshall(wireFormat);  
     }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          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.setMess
 ageId((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.setTimestamp(looseUnmarshalLong(wireFormat, dataIn));         info.setType(looseUnmarshalString(dataIn));         info.setContent(looseUnmarshalByteSequence(dataIn));         info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));         info.setDataStructure((org.apache.activemq.command.DataStruct
 ure) 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);             }             info.setBrokerPath(value);         }         else {             info.setBrokerPath(null);         }         info.setArrival(looseUnmarshalLong(wireFormat, dataIn));         info.setUserID(looseUnmarshalString(dataIn));         info.setRecievedByDFBridge(dataIn.readBoolean());         info.setDroppable(dataIn.readBoolean());          if (dataIn.re
 adBoolean()) {             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);             }             info.setCluster(value);         }         else {             info.setCluster(null);         }         info.setBrokerInTime(looseUnmarshalLong(wireFormat, dataIn));         info.setBrokerOutTime(looseUnmarshalLong(wireFormat, dataIn));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          Message info = (Message)o;          info.beforeMarshall(wireFormat);          super.looseMarshal(wireFormat, o, dataOut);         looseMarshalCachedObject(wireFor
 mat, (DataStructure)info.getProducerId(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut);         looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut);         looseMarshalString(info.getGroupID(), dataOut);         dataOut.writeInt(info.getGroupSequence());         looseMarshalString(info.getCorrelationId(), dataOut);         dataOut.writeBoolean(info.isPersistent());         looseMarshalLong(wireFormat, info.getExpiration(), dataOut);         dataOut.writeByte(info.getPriority());         looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut);         looseMarshalLong(wireFormat, 
 info.getTimestamp(), dataOut);         looseMarshalString(info.getType(), dataOut);         looseMarshalByteSequence(wireFormat, info.getContent(), dataOut);         looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);         looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut);         looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut);         dataOut.writeBoolean(info.isCompressed());         dataOut.writeInt(info.getRedeliveryCounter());         looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);         looseMarshalLong(wireFormat, info.getArrival(), dataOut);         looseMarshalString(info.getUserID(), dataOut);         dataOut.writeBoolean(info.isRecievedByDFBridge());         dataOut.writeBoolean(info.isDroppable());         looseMarshalObjectArray(wireFormat, info.getCluster(), dataOut);         looseMarshalLong(wireFormat, info.getBrokerInTime(), dataOut);    
      looseMarshalLong(wireFormat, info.getBrokerOutTime(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v8;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * 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.
+ *
+ * 
+ */
+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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        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.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.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.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);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
+        info.setArrival(tightUnmarshalLong(wireFormat, dataIn, bs));
+        info.setUserID(tightUnmarshalString(dataIn, bs));
+        info.setRecievedByDFBridge(bs.readBoolean());
+        info.setDroppable(bs.readBoolean());
+
+        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);
+            }
+            info.setCluster(value);
+        }
+        else {
+            info.setCluster(null);
+        }
+        info.setBrokerInTime(tightUnmarshalLong(wireFormat, dataIn, bs));
+        info.setBrokerOutTime(tightUnmarshalLong(wireFormat, dataIn, bs));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        Message info = (Message)o;
+
+        info.beforeMarshall(wireFormat);
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalTransactionId(), bs);
+        rc += tightMarshalString1(info.getGroupID(), bs);
+        rc += tightMarshalString1(info.getCorrelationId(), bs);
+        bs.writeBoolean(info.isPersistent());
+        rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs);
+        rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs);
+        rc += tightMarshalString1(info.getType(), bs);
+        rc += tightMarshalByteSequence1(info.getContent(), bs);
+        rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs);
+        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs);
+        bs.writeBoolean(info.isCompressed());
+        rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), 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);
+
+        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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        Message info = (Message)o;
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs);
+        tightMarshalString2(info.getGroupID(), dataOut, bs);
+        dataOut.writeInt(info.getGroupSequence());
+        tightMarshalString2(info.getCorrelationId(), dataOut, bs);
+        bs.readBoolean();
+        tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs);
+        dataOut.writeByte(info.getPriority());
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs);
+        tightMarshalString2(info.getType(), dataOut, bs);
+        tightMarshalByteSequence2(info.getContent(), dataOut, bs);
+        tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
+        tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs);
+        tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs);
+        bs.readBoolean();
+        dataOut.writeInt(info.getRedeliveryCounter());
+        tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getArrival(), dataOut, bs);
+        tightMarshalString2(info.getUserID(), dataOut, bs);
+        bs.readBoolean();
+        bs.readBoolean();
+        tightMarshalObjectArray2(wireFormat, info.getCluster(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getBrokerInTime(), dataOut, bs);
+        tightMarshalLong2(wireFormat, info.getBrokerOutTime(), dataOut, bs);
+
+        info.afterMarshall(wireFormat);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        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.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.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.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);
+            }
+            info.setBrokerPath(value);
+        }
+        else {
+            info.setBrokerPath(null);
+        }
+        info.setArrival(looseUnmarshalLong(wireFormat, dataIn));
+        info.setUserID(looseUnmarshalString(dataIn));
+        info.setRecievedByDFBridge(dataIn.readBoolean());
+        info.setDroppable(dataIn.readBoolean());
+
+        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);
+            }
+            info.setCluster(value);
+        }
+        else {
+            info.setCluster(null);
+        }
+        info.setBrokerInTime(looseUnmarshalLong(wireFormat, dataIn));
+        info.setBrokerOutTime(looseUnmarshalLong(wireFormat, dataIn));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        Message info = (Message)o;
+
+        info.beforeMarshall(wireFormat);
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut);
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut);
+        looseMarshalString(info.getGroupID(), dataOut);
+        dataOut.writeInt(info.getGroupSequence());
+        looseMarshalString(info.getCorrelationId(), dataOut);
+        dataOut.writeBoolean(info.isPersistent());
+        looseMarshalLong(wireFormat, info.getExpiration(), dataOut);
+        dataOut.writeByte(info.getPriority());
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut);
+        looseMarshalLong(wireFormat, info.getTimestamp(), dataOut);
+        looseMarshalString(info.getType(), dataOut);
+        looseMarshalByteSequence(wireFormat, info.getContent(), dataOut);
+        looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
+        looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut);
+        looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut);
+        dataOut.writeBoolean(info.isCompressed());
+        dataOut.writeInt(info.getRedeliveryCounter());
+        looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
+        looseMarshalLong(wireFormat, info.getArrival(), dataOut);
+        looseMarshalString(info.getUserID(), dataOut);
+        dataOut.writeBoolean(info.isRecievedByDFBridge());
+        dataOut.writeBoolean(info.isDroppable());
+        looseMarshalObjectArray(wireFormat, info.getCluster(), dataOut);
+        looseMarshalLong(wireFormat, info.getBrokerInTime(), dataOut);
+        looseMarshalLong(wireFormat, info.getBrokerOutTime(), dataOut);
+
+    }
+}
+
diff --git a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java
index 559287871b..67c4b25b31 100644
--- a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java
+++ b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/PartialCommandMarshaller.java
@@ -1 +1,134 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v8;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for PartialCommandMarshaller  *  *  * 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.  *  *   */ public class PartialCommandMarshaller extends BaseDataStreamMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return PartialCommand.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new PartialCommand();     }      /**      * 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      * @throw
 s IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          PartialCommand info = (PartialCommand)o;         info.setCommandId(dataIn.readInt());         info.setData(tightUnmarshalByteArray(dataIn, bs));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          PartialCommand info = (PartialCommand)o;          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalByteArray1(info.getData(), bs);          return rc + 4;     }      /**      * 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      */     public void tightMarshal2(O
 penWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          PartialCommand info = (PartialCommand)o;         dataOut.writeInt(info.getCommandId());         tightMarshalByteArray2(info.getData(), dataOut, bs);      }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          PartialCommand info = (PartialCommand)o;         info.setCommandId(dataIn.readInt());         info.setData(looseUnmarshalByteArray(dataIn));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat
 , Object o, DataOutput dataOut) throws IOException {          PartialCommand info = (PartialCommand)o;          super.looseMarshal(wireFormat, o, dataOut);         dataOut.writeInt(info.getCommandId());         looseMarshalByteArray(wireFormat, info.getData(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v8;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for PartialCommandMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class PartialCommandMarshaller extends BaseDataStreamMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return PartialCommand.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new PartialCommand();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        PartialCommand info = (PartialCommand)o;
+        info.setCommandId(dataIn.readInt());
+        info.setData(tightUnmarshalByteArray(dataIn, bs));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        PartialCommand info = (PartialCommand)o;
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalByteArray1(info.getData(), bs);
+
+        return rc + 4;
+    }
+
+    /**
+     * 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        PartialCommand info = (PartialCommand)o;
+        dataOut.writeInt(info.getCommandId());
+        tightMarshalByteArray2(info.getData(), dataOut, bs);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        PartialCommand info = (PartialCommand)o;
+        info.setCommandId(dataIn.readInt());
+        info.setData(looseUnmarshalByteArray(dataIn));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        PartialCommand info = (PartialCommand)o;
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        dataOut.writeInt(info.getCommandId());
+        looseMarshalByteArray(wireFormat, info.getData(), dataOut);
+
+    }
+}
+
diff --git a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java
index c6ab2c78d8..c7ea8be853 100644
--- a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java
+++ b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/WireFormatInfoMarshaller.java
@@ -1 +1,155 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v8;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for WireFormatInfoMarshaller  *  *  * 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.  *  *   */ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return WireFormatInfo.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new WireFormatInfo();     }      /**      * 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      * @throw
 s IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          WireFormatInfo info = (WireFormatInfo)o;          info.beforeUnmarshall(wireFormat);                  info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8));         info.setVersion(dataIn.readInt());         info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          WireFormatInfo info = (WireFormatInfo)o;          info.beforeMarshall(wireFormat);          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8);         rc += tightMarshalByteSequence1(info
 .getMarshalledProperties(), bs);          return rc + 4;     }      /**      * 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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          WireFormatInfo info = (WireFormatInfo)o;         tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8);         dataOut.writeInt(info.getVersion());         tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);          info.afterMarshall(wireFormat);      }      /**      * 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      */     public void loo
 seUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          WireFormatInfo info = (WireFormatInfo)o;          info.beforeUnmarshall(wireFormat);                  info.setMagic(looseUnmarshalConstByteArray(dataIn, 8));         info.setVersion(dataIn.readInt());         info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));          info.afterUnmarshall(wireFormat);      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          WireFormatInfo info = (WireFormatInfo)o;          info.beforeMarshall(wireFormat);          super.looseMarshal(wireFormat, o, dataOut);         looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8);         dataOut.writeInt(info.getVersion());         looseMarshalByteSequence(wireFormat, info.getMarshalled
 Properties(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v8;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for WireFormatInfoMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return WireFormatInfo.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new WireFormatInfo();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
+        info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8));
+        info.setVersion(dataIn.readInt());
+        info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeMarshall(wireFormat);
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8);
+        rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
+
+        return rc + 4;
+    }
+
+    /**
+     * 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        WireFormatInfo info = (WireFormatInfo)o;
+        tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8);
+        dataOut.writeInt(info.getVersion());
+        tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
+
+        info.afterMarshall(wireFormat);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
+        info.setMagic(looseUnmarshalConstByteArray(dataIn, 8));
+        info.setVersion(dataIn.readInt());
+        info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));
+
+        info.afterUnmarshall(wireFormat);
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeMarshall(wireFormat);
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8);
+        dataOut.writeInt(info.getVersion());
+        looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
+
+    }
+}
+
diff --git a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java
index 55434f9c89..002945e991 100644
--- a/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java
+++ b/activemq-openwire-legacy/src/main/java/org/apache/activemq/openwire/v8/XATransactionIdMarshaller.java
@@ -1 +1,139 @@
-/**  *  * Licensed to the Apache Software Foundation (ASF) under one or more  * contributor license agreements.  See the NOTICE file distributed with  * this work for additional information regarding copyright ownership.  * The ASF licenses this file to You under the Apache License, Version 2.0  * (the "License"); you may not use this file except in compliance with  * the License.  You may obtain a copy of the License at  *  * http://www.apache.org/licenses/LICENSE-2.0  *  * Unless required by applicable law or agreed to in writing, software  * distributed under the License is distributed on an "AS IS" BASIS,  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  * See the License for the specific language governing permissions and  * limitations under the License.  */  package org.apache.activemq.openwire.v8;  import java.io.DataInput; import java.io.DataOutput; import java.io.IOException;  import org.apache.activemq.openwire.*; import org.apache.activemq.comm
 and.*;    /**  * Marshalling code for Open Wire Format for XATransactionIdMarshaller  *  *  * 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.  *  *   */ public class XATransactionIdMarshaller extends TransactionIdMarshaller {      /**      * Return the type of Data Structure we marshal      * @return short representation of the type data structure      */     public byte getDataStructureType() {         return XATransactionId.DATA_STRUCTURE_TYPE;     }          /**      * @return a new object instance      */     public DataStructure createObject() {         return new XATransactionId();     }      /**      * 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      * @th
 rows IOException      */     public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {         super.tightUnmarshal(wireFormat, o, dataIn, bs);          XATransactionId info = (XATransactionId)o;         info.setFormatId(dataIn.readInt());         info.setGlobalTransactionId(tightUnmarshalByteArray(dataIn, bs));         info.setBranchQualifier(tightUnmarshalByteArray(dataIn, bs));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {          XATransactionId info = (XATransactionId)o;          int rc = super.tightMarshal1(wireFormat, o, bs);         rc += tightMarshalByteArray1(info.getGlobalTransactionId(), bs);         rc += tightMarshalByteArray1(info.getBranchQualifier(), bs);          return rc + 4;     }      /**      * 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      */     public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {         super.tightMarshal2(wireFormat, o, dataOut, bs);          XATransactionId info = (XATransactionId)o;         dataOut.writeInt(info.getFormatId());         tightMarshalByteArray2(info.getGlobalTransactionId(), dataOut, bs);         tightMarshalByteArray2(info.getBranchQualifier(), dataOut, bs);      }      /**      * 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      */     public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {         super.looseUnmarshal(wireFormat, o, dataIn);          XATransactionId info = (
 XATransactionId)o;         info.setFormatId(dataIn.readInt());         info.setGlobalTransactionId(looseUnmarshalByteArray(dataIn));         info.setBranchQualifier(looseUnmarshalByteArray(dataIn));      }       /**      * Write the booleans that this object uses to a BooleanStream      */     public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {          XATransactionId info = (XATransactionId)o;          super.looseMarshal(wireFormat, o, dataOut);         dataOut.writeInt(info.getFormatId());         looseMarshalByteArray(wireFormat, info.getGlobalTransactionId(), dataOut);         looseMarshalByteArray(wireFormat, info.getBranchQualifier(), dataOut);      } }
\ No newline at end of file
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.openwire.v8;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
+
+
+
+/**
+ * Marshalling code for Open Wire Format for XATransactionIdMarshaller
+ *
+ *
+ * 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.
+ *
+ * 
+ */
+public class XATransactionIdMarshaller extends TransactionIdMarshaller {
+
+    /**
+     * Return the type of Data Structure we marshal
+     * @return short representation of the type data structure
+     */
+    public byte getDataStructureType() {
+        return XATransactionId.DATA_STRUCTURE_TYPE;
+    }
+    
+    /**
+     * @return a new object instance
+     */
+    public DataStructure createObject() {
+        return new XATransactionId();
+    }
+
+    /**
+     * 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
+     */
+    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
+        super.tightUnmarshal(wireFormat, o, dataIn, bs);
+
+        XATransactionId info = (XATransactionId)o;
+        info.setFormatId(dataIn.readInt());
+        info.setGlobalTransactionId(tightUnmarshalByteArray(dataIn, bs));
+        info.setBranchQualifier(tightUnmarshalByteArray(dataIn, bs));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
+
+        XATransactionId info = (XATransactionId)o;
+
+        int rc = super.tightMarshal1(wireFormat, o, bs);
+        rc += tightMarshalByteArray1(info.getGlobalTransactionId(), bs);
+        rc += tightMarshalByteArray1(info.getBranchQualifier(), bs);
+
+        return rc + 4;
+    }
+
+    /**
+     * 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
+     */
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
+        super.tightMarshal2(wireFormat, o, dataOut, bs);
+
+        XATransactionId info = (XATransactionId)o;
+        dataOut.writeInt(info.getFormatId());
+        tightMarshalByteArray2(info.getGlobalTransactionId(), dataOut, bs);
+        tightMarshalByteArray2(info.getBranchQualifier(), dataOut, bs);
+
+    }
+
+    /**
+     * 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
+     */
+    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
+        super.looseUnmarshal(wireFormat, o, dataIn);
+
+        XATransactionId info = (XATransactionId)o;
+        info.setFormatId(dataIn.readInt());
+        info.setGlobalTransactionId(looseUnmarshalByteArray(dataIn));
+        info.setBranchQualifier(looseUnmarshalByteArray(dataIn));
+
+    }
+
+
+    /**
+     * Write the booleans that this object uses to a BooleanStream
+     */
+    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
+
+        XATransactionId info = (XATransactionId)o;
+
+        super.looseMarshal(wireFormat, o, dataOut);
+        dataOut.writeInt(info.getFormatId());
+        looseMarshalByteArray(wireFormat, info.getGlobalTransactionId(), dataOut);
+        looseMarshalByteArray(wireFormat, info.getBranchQualifier(), dataOut);
+
+    }
+}
+


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact