activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject [22/41] activemq-openwire git commit: OPENWIRE-19
Date Tue, 01 Dec 2015 19:17:41 GMT
http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/MessageMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/MessageMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/MessageMarshaller.java
deleted file mode 100644
index 2002de9..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/MessageMarshaller.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.BrokerId;
-import org.apache.activemq.openwire.commands.ConsumerId;
-import org.apache.activemq.openwire.commands.Message;
-import org.apache.activemq.openwire.commands.MessageId;
-import org.apache.activemq.openwire.commands.OpenWireDestination;
-import org.apache.activemq.openwire.commands.ProducerId;
-import org.apache.activemq.openwire.commands.TransactionId;
-
-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
-     */
-    @Override
-    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((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((OpenWireDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setOriginalDestination((OpenWireDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setOriginalTransactionId((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((OpenWireDestination) 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(tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setTargetConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setCompressed(bs.readBoolean());
-        info.setRedeliveryCounter(dataIn.readInt());
-
-        if (bs.readBoolean()) {
-            short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
-            for (int i = 0; i < size; i++) {
-                value[i] = (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();
-            BrokerId value[] = new BrokerId[size];
-            for (int i = 0; i < size; i++) {
-                value[i] = (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
-     */
-    @Override
-    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, info.getProducerId(), bs);
-        rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
-        rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs);
-        rc += tightMarshalCachedObject1(wireFormat, info.getOriginalDestination(), bs);
-        rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs);
-        rc += tightMarshalCachedObject1(wireFormat, 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, 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, info.getDataStructure(), bs);
-        rc += tightMarshalCachedObject1(wireFormat, 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
-     */
-    @Override
-    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, info.getProducerId(), dataOut, bs);
-        tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
-        tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
-        tightMarshalCachedObject2(wireFormat, info.getOriginalDestination(), dataOut, bs);
-        tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs);
-        tightMarshalCachedObject2(wireFormat, 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, 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, info.getDataStructure(), dataOut, bs);
-        tightMarshalCachedObject2(wireFormat, 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
-     */
-    @Override
-    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((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((OpenWireDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setOriginalDestination((OpenWireDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setOriginalTransactionId((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((OpenWireDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setTimestamp(looseUnmarshalLong(wireFormat, dataIn));
-        info.setType(looseUnmarshalString(dataIn));
-        info.setContent(looseUnmarshalByteSequence(dataIn));
-        info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));
-        info.setDataStructure(looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setTargetConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setCompressed(dataIn.readBoolean());
-        info.setRedeliveryCounter(dataIn.readInt());
-
-        if (dataIn.readBoolean()) {
-            short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
-            for (int i = 0; i < size; i++) {
-                value[i] = (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();
-            BrokerId value[] = new BrokerId[size];
-            for (int i = 0; i < size; i++) {
-                value[i] = (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
-     */
-    @Override
-    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, info.getProducerId(), dataOut);
-        looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
-        looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut);
-        looseMarshalCachedObject(wireFormat, info.getOriginalDestination(), dataOut);
-        looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
-        looseMarshalCachedObject(wireFormat, 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, info.getReplyTo(), dataOut);
-        looseMarshalLong(wireFormat, info.getTimestamp(), dataOut);
-        looseMarshalString(info.getType(), dataOut);
-        looseMarshalByteSequence(wireFormat, info.getContent(), dataOut);
-        looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
-        looseMarshalNestedObject(wireFormat, info.getDataStructure(), dataOut);
-        looseMarshalCachedObject(wireFormat, 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);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/MessagePullMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/MessagePullMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/MessagePullMarshaller.java
deleted file mode 100644
index 5a722d6..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/MessagePullMarshaller.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.ConsumerId;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.MessageId;
-import org.apache.activemq.openwire.commands.MessagePull;
-import org.apache.activemq.openwire.commands.OpenWireDestination;
-
-public class MessagePullMarshaller extends BaseCommandMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return MessagePull.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new MessagePull();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
-        MessagePull info = (MessagePull) o;
-        info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((OpenWireDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs));
-        info.setCorrelationId(tightUnmarshalString(dataIn, bs));
-        info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        MessagePull info = (MessagePull) o;
-
-        int rc = super.tightMarshal1(wireFormat, o, bs);
-        rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
-        rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
-        rc += tightMarshalLong1(wireFormat, info.getTimeout(), bs);
-        rc += tightMarshalString1(info.getCorrelationId(), bs);
-        rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, dataOut, bs);
-
-        MessagePull info = (MessagePull) o;
-        tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
-        tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
-        tightMarshalLong2(wireFormat, info.getTimeout(), dataOut, bs);
-        tightMarshalString2(info.getCorrelationId(), dataOut, bs);
-        tightMarshalNestedObject2(wireFormat, info.getMessageId(), 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-
-        MessagePull info = (MessagePull) o;
-        info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((OpenWireDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setTimeout(looseUnmarshalLong(wireFormat, dataIn));
-        info.setCorrelationId(looseUnmarshalString(dataIn));
-        info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        MessagePull info = (MessagePull) o;
-
-        super.looseMarshal(wireFormat, o, dataOut);
-        looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
-        looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
-        looseMarshalLong(wireFormat, info.getTimeout(), dataOut);
-        looseMarshalString(info.getCorrelationId(), dataOut);
-        looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/NetworkBridgeFilterMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/NetworkBridgeFilterMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/NetworkBridgeFilterMarshaller.java
deleted file mode 100644
index 989ec67..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/NetworkBridgeFilterMarshaller.java
+++ /dev/null
@@ -1 +0,0 @@
-/**
 * 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.codec.v9;

import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;

import org.apache.activemq.openwire.codec.BaseDataStreamMarshaller;
 import org.apache.activemq.openwire.codec.BooleanStream;
import org.apache.activemq.openwire.codec.OpenWireFormat;
import org.apache.activemq.openwire.commands.BrokerId;
import org.apache.activemq.openwire.commands.DataStructure;
import org.apache.activemq.openwire.commands.NetworkBridgeFilter;

public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    @Override
    public byte getDataStructureType() {
        return NetworkBridgeFilter.DATA_STRUCTURE_TYPE;
    }

    /**
     * @return a new object instance
     */
    @Override
    public DataStructure createObject() {
        return new NetworkBridgeFilter();
    }

    /**
     * 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
 
     */
    @Override
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
        info.setNetworkTTL(dataIn.readInt());
        info.setNetworkBrokerId((BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
    }

    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    @Override
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
        NetworkBridgeFilter info = (NetworkBridgeFilter)o;

        int rc = super.tightMarshal1(wireFormat, o, bs);
        rc += tightMarshalCachedObject1(wireFormat, info.getNetworkBrokerId(), bs);

        return rc + 4;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stre
 am
     * @throws IOException thrown if an error occurs
     */
    @Override
    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
        dataOut.writeInt(info.getNetworkTTL());
        tightMarshalCachedObject2(wireFormat, info.getNetworkBrokerId(), 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
     */
    @Override
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
        info.setNetworkTTL(dataIn.readInt());
        info.setNetworkBrokerId
 ((BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn));
    }

    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    @Override
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
        NetworkBridgeFilter info = (NetworkBridgeFilter)o;

        super.looseMarshal(wireFormat, o, dataOut);
        dataOut.writeInt(info.getNetworkTTL());
        looseMarshalCachedObject(wireFormat, info.getNetworkBrokerId(), dataOut);
    }
}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireBlobMessageMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireBlobMessageMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireBlobMessageMarshaller.java
deleted file mode 100644
index 8ac12d9..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireBlobMessageMarshaller.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireBlobMessage;
-
-public class OpenWireBlobMessageMarshaller extends OpenWireMessageMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireBlobMessage.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireBlobMessage();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
-        OpenWireBlobMessage info = (OpenWireBlobMessage) o;
-        info.setRemoteBlobUrl(tightUnmarshalString(dataIn, bs));
-        info.setMimeType(tightUnmarshalString(dataIn, bs));
-        info.setDeletedByBroker(bs.readBoolean());
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        OpenWireBlobMessage info = (OpenWireBlobMessage) o;
-
-        int rc = super.tightMarshal1(wireFormat, o, bs);
-        rc += tightMarshalString1(info.getRemoteBlobUrl(), bs);
-        rc += tightMarshalString1(info.getMimeType(), bs);
-        bs.writeBoolean(info.isDeletedByBroker());
-
-        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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, dataOut, bs);
-
-        OpenWireBlobMessage info = (OpenWireBlobMessage) o;
-        tightMarshalString2(info.getRemoteBlobUrl(), dataOut, bs);
-        tightMarshalString2(info.getMimeType(), dataOut, bs);
-        bs.readBoolean();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-
-        OpenWireBlobMessage info = (OpenWireBlobMessage) o;
-        info.setRemoteBlobUrl(looseUnmarshalString(dataIn));
-        info.setMimeType(looseUnmarshalString(dataIn));
-        info.setDeletedByBroker(dataIn.readBoolean());
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        OpenWireBlobMessage info = (OpenWireBlobMessage) o;
-
-        super.looseMarshal(wireFormat, o, dataOut);
-        looseMarshalString(info.getRemoteBlobUrl(), dataOut);
-        looseMarshalString(info.getMimeType(), dataOut);
-        dataOut.writeBoolean(info.isDeletedByBroker());
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireBytesMessageMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireBytesMessageMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireBytesMessageMarshaller.java
deleted file mode 100644
index 143b49b..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireBytesMessageMarshaller.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireBytesMessage;
-
-public class OpenWireBytesMessageMarshaller extends OpenWireMessageMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireBytesMessage.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireBytesMessage();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireDestinationMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireDestinationMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireDestinationMarshaller.java
deleted file mode 100644
index f470695..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireDestinationMarshaller.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BaseDataStreamMarshaller;
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.OpenWireDestination;
-
-public abstract class OpenWireDestinationMarshaller extends BaseDataStreamMarshaller {
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-
-        OpenWireDestination info = (OpenWireDestination) o;
-        info.setPhysicalName(tightUnmarshalString(dataIn, bs));
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        OpenWireDestination info = (OpenWireDestination) o;
-
-        int rc = super.tightMarshal1(wireFormat, o, bs);
-        rc += tightMarshalString1(info.getPhysicalName(), 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, dataOut, bs);
-
-        OpenWireDestination info = (OpenWireDestination) o;
-        tightMarshalString2(info.getPhysicalName(), 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-
-        OpenWireDestination info = (OpenWireDestination) o;
-        info.setPhysicalName(looseUnmarshalString(dataIn));
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        OpenWireDestination info = (OpenWireDestination) o;
-
-        super.looseMarshal(wireFormat, o, dataOut);
-        looseMarshalString(info.getPhysicalName(), dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireMapMessageMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireMapMessageMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireMapMessageMarshaller.java
deleted file mode 100644
index 4ddee53..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireMapMessageMarshaller.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireMapMessage;
-
-public class OpenWireMapMessageMarshaller extends OpenWireMessageMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireMapMessage.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireMapMessage();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireMessageMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireMessageMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireMessageMarshaller.java
deleted file mode 100644
index ffe4b5f..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireMessageMarshaller.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireMessage;
-
-public class OpenWireMessageMarshaller extends MessageMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireMessage.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireMessage();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireObjectMessageMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireObjectMessageMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireObjectMessageMarshaller.java
deleted file mode 100644
index 00bd49a..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireObjectMessageMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireObjectMessage;
-
-public class OpenWireObjectMessageMarshaller extends OpenWireMessageMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireObjectMessage.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireObjectMessage();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireQueueMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireQueueMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireQueueMarshaller.java
deleted file mode 100644
index 367a678..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireQueueMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireQueue;
-
-public class OpenWireQueueMarshaller extends OpenWireDestinationMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireQueue.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireQueue();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireStreamMessageMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireStreamMessageMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireStreamMessageMarshaller.java
deleted file mode 100644
index 3ab8536..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireStreamMessageMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireStreamMessage;
-
-public class OpenWireStreamMessageMarshaller extends OpenWireMessageMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireStreamMessage.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireStreamMessage();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempDestinationMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempDestinationMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempDestinationMarshaller.java
deleted file mode 100644
index 1795d2f..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempDestinationMarshaller.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-
-public abstract class OpenWireTempDestinationMarshaller extends OpenWireDestinationMarshaller {
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempQueueMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempQueueMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempQueueMarshaller.java
deleted file mode 100644
index 21a4ea7..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempQueueMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireTempQueue;
-
-public class OpenWireTempQueueMarshaller extends OpenWireTempDestinationMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireTempQueue.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireTempQueue();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempTopicMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempTopicMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempTopicMarshaller.java
deleted file mode 100644
index e403e02..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTempTopicMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireTempTopic;
-
-public class OpenWireTempTopicMarshaller extends OpenWireTempDestinationMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireTempTopic.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireTempTopic();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTextMessageMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTextMessageMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTextMessageMarshaller.java
deleted file mode 100644
index 8a003e7..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTextMessageMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireTextMessage;
-
-public class OpenWireTextMessageMarshaller extends OpenWireMessageMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireTextMessage.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireTextMessage();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTopicMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTopicMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTopicMarshaller.java
deleted file mode 100644
index b97e003..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/OpenWireTopicMarshaller.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.OpenWireTopic;
-
-public class OpenWireTopicMarshaller extends OpenWireDestinationMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return OpenWireTopic.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    public DataStructure createObject() {
-        return new OpenWireTopic();
-    }
-
-    /**
-     * 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
-     */
-    @Override
-    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException {
-        super.tightUnmarshal(wireFormat, o, dataIn, bs);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {
-        int rc = super.tightMarshal1(wireFormat, o, 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
-     */
-    @Override
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
-        super.tightMarshal2(wireFormat, o, 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
-     */
-    @Override
-    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn) throws IOException {
-        super.looseUnmarshal(wireFormat, o, dataIn);
-    }
-
-    /**
-     * Write the booleans that this object uses to a BooleanStream
-     */
-    @Override
-    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutput dataOut) throws IOException {
-        super.looseMarshal(wireFormat, o, dataOut);
-    }
-}

http://git-wip-us.apache.org/repos/asf/activemq-openwire/blob/0c90d2e3/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/PartialCommandMarshaller.java
----------------------------------------------------------------------
diff --git a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/PartialCommandMarshaller.java b/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/PartialCommandMarshaller.java
deleted file mode 100644
index 2f98bec..0000000
--- a/openwire-core/src/main/java/org/apache/activemq/openwire/codec/v9/PartialCommandMarshaller.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * 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.codec.v9;
-
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-
-import org.apache.activemq.openwire.codec.BaseDataStreamMarshaller;
-import org.apache.activemq.openwire.codec.BooleanStream;
-import org.apache.activemq.openwire.codec.OpenWireFormat;
-import org.apache.activemq.openwire.commands.DataStructure;
-import org.apache.activemq.openwire.commands.PartialCommand;
-
-public class PartialCommandMarshaller extends BaseDataStreamMarshaller {
-
-    /**
-     * Return the type of Data Structure we marshal
-     *
-     * @return short representation of the type data structure
-     */
-    @Override
-    public byte getDataStructureType() {
-        return PartialCommand.DATA_STRUCTURE_TYPE;
-    }
-
-    /**
-     * @return a new object instance
-     */
-    @Override
-    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
-     */
-    @Override
-    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
-     */
-    @Override
-    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
-     */
-    @Override
-    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
-     */
-    @Override
-    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
-     */
-    @Override
-    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);
-    }
-}


Mime
View raw message