Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 113759E58 for ; Thu, 26 Jan 2012 16:16:27 +0000 (UTC) Received: (qmail 74211 invoked by uid 500); 26 Jan 2012 16:16:26 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 74113 invoked by uid 500); 26 Jan 2012 16:16:26 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 74001 invoked by uid 99); 26 Jan 2012 16:16:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2012 16:16:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2012 16:16:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 71DD62388A66 for ; Thu, 26 Jan 2012 16:15:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1236269 [3/18] - in /activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire: codec/ codec/v1/ codec/v2/ codec/v3/ codec/v4/ codec/v5/ codec/v6/ codec/v7/ codec/v8/ command/ Date: Thu, 26 Jan 2012 16:15:20 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120126161545.71DD62388A66@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/LastPartialCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/LastPartialCommandMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/LastPartialCommandMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/LastPartialCommandMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.LastPartialCommand; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class LastPartialCommandMarshaller extends PartialCommandMarshaller { Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/LocalTransactionIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/LocalTransactionIdMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/LocalTransactionIdMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/LocalTransactionIdMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,29 +21,29 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.LocalTransactionId; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; + + /** - * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller NOTE!: - * This file is auto generated - do not modify! if you need to make a change, - * please see the modify the groovy scripts in the under src/gram/script and - * then use maven openwire:generate to regenerate this file. - * + * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller + * + * + * NOTE!: This file is auto generated - do not modify! + * Modify the 'apollo-openwire-generator' module instead. + * */ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return LocalTransactionId.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -53,7 +53,7 @@ public class LocalTransactionIdMarshalle /** * 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 @@ -67,6 +67,7 @@ public class LocalTransactionIdMarshalle } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -83,7 +84,7 @@ public class LocalTransactionIdMarshalle /** * 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 @@ -99,7 +100,7 @@ public class LocalTransactionIdMarshalle /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -113,6 +114,7 @@ public class LocalTransactionIdMarshalle } + /** * Write the booleans that this object uses to a BooleanStream */ Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/LocalTransactionIdMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MarshallerFactory.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MarshallerFactory.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MarshallerFactory.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MarshallerFactory.java Thu Jan 26 16:15:05 2012 @@ -21,84 +21,83 @@ import org.apache.activemq.apollo.openwi import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; /** - * MarshallerFactory for Open Wire Format. 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. + * MarshallerFactory for Open Wire Format. + * + * + * NOTE!: This file is auto generated - do not modify! + * Modify the 'apollo-openwire-generator' module instead. + * * */ -public final class MarshallerFactory { +public class MarshallerFactory { /** * Creates a Map of command type -> Marshallers */ - private static final DataStreamMarshaller MARSHALLER[] = new DataStreamMarshaller[256]; + static final private DataStreamMarshaller marshaller[] = new DataStreamMarshaller[256]; static { - add(new LocalTransactionIdMarshaller()); - add(new PartialCommandMarshaller()); - add(new IntegerResponseMarshaller()); - add(new ActiveMQQueueMarshaller()); + add(new ActiveMQBytesMessageMarshaller()); + add(new ActiveMQMapMessageMarshaller()); + add(new ActiveMQMessageMarshaller()); add(new ActiveMQObjectMessageMarshaller()); - add(new ConnectionIdMarshaller()); - add(new ConnectionInfoMarshaller()); - add(new ProducerInfoMarshaller()); - add(new MessageDispatchNotificationMarshaller()); - add(new SessionInfoMarshaller()); - add(new TransactionInfoMarshaller()); + add(new ActiveMQQueueMarshaller()); add(new ActiveMQStreamMessageMarshaller()); - add(new MessageAckMarshaller()); - add(new ProducerIdMarshaller()); - add(new MessageIdMarshaller()); add(new ActiveMQTempQueueMarshaller()); - add(new RemoveSubscriptionInfoMarshaller()); - add(new SessionIdMarshaller()); - add(new DataArrayResponseMarshaller()); - add(new JournalQueueAckMarshaller()); - add(new ResponseMarshaller()); - add(new ConnectionErrorMarshaller()); - add(new ConsumerInfoMarshaller()); - add(new XATransactionIdMarshaller()); - add(new JournalTraceMarshaller()); - add(new ConsumerIdMarshaller()); - add(new ActiveMQTextMessageMarshaller()); - add(new SubscriptionInfoMarshaller()); - add(new JournalTransactionMarshaller()); - add(new ControlCommandMarshaller()); - add(new LastPartialCommandMarshaller()); - add(new NetworkBridgeFilterMarshaller()); - add(new ActiveMQBytesMessageMarshaller()); - add(new WireFormatInfoMarshaller()); add(new ActiveMQTempTopicMarshaller()); - add(new DiscoveryEventMarshaller()); - add(new ReplayCommandMarshaller()); + add(new ActiveMQTextMessageMarshaller()); add(new ActiveMQTopicMarshaller()); + add(new BrokerIdMarshaller()); add(new BrokerInfoMarshaller()); - add(new DestinationInfoMarshaller()); - add(new ShutdownInfoMarshaller()); - add(new DataResponseMarshaller()); add(new ConnectionControlMarshaller()); - add(new KeepAliveInfoMarshaller()); - add(new FlushCommandMarshaller()); + add(new ConnectionErrorMarshaller()); + add(new ConnectionIdMarshaller()); + add(new ConnectionInfoMarshaller()); add(new ConsumerControlMarshaller()); + add(new ConsumerIdMarshaller()); + add(new ConsumerInfoMarshaller()); + add(new ControlCommandMarshaller()); + add(new DataArrayResponseMarshaller()); + add(new DataResponseMarshaller()); + add(new DestinationInfoMarshaller()); + add(new DiscoveryEventMarshaller()); + add(new ExceptionResponseMarshaller()); + add(new FlushCommandMarshaller()); + add(new IntegerResponseMarshaller()); + add(new JournalQueueAckMarshaller()); add(new JournalTopicAckMarshaller()); - add(new BrokerIdMarshaller()); + add(new JournalTraceMarshaller()); + add(new JournalTransactionMarshaller()); + add(new KeepAliveInfoMarshaller()); + add(new LastPartialCommandMarshaller()); + add(new LocalTransactionIdMarshaller()); + add(new MessageAckMarshaller()); add(new MessageDispatchMarshaller()); - add(new ActiveMQMapMessageMarshaller()); - add(new ActiveMQMessageMarshaller()); + add(new MessageDispatchNotificationMarshaller()); + add(new MessageIdMarshaller()); + add(new NetworkBridgeFilterMarshaller()); + add(new PartialCommandMarshaller()); + add(new ProducerIdMarshaller()); + add(new ProducerInfoMarshaller()); add(new RemoveInfoMarshaller()); - add(new ExceptionResponseMarshaller()); - - } + add(new RemoveSubscriptionInfoMarshaller()); + add(new ReplayCommandMarshaller()); + add(new ResponseMarshaller()); + add(new SessionIdMarshaller()); + add(new SessionInfoMarshaller()); + add(new ShutdownInfoMarshaller()); + add(new SubscriptionInfoMarshaller()); + add(new TransactionInfoMarshaller()); + add(new WireFormatInfoMarshaller()); + add(new XATransactionIdMarshaller()); - private MarshallerFactory() { } - private static void add(DataStreamMarshaller dsm) { - MARSHALLER[dsm.getDataStructureType()] = dsm; + static private void add(DataStreamMarshaller dsm) { + marshaller[dsm.getDataStructureType()] = dsm; } - - public static DataStreamMarshaller[] createMarshallerMap(OpenWireFormat wireFormat) { - return MARSHALLER; + + static public DataStreamMarshaller[] createMarshallerMap(OpenWireFormat wireFormat) { + return marshaller; } } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageAckMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageAckMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageAckMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageAckMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.MessageAck; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class MessageAckMarshaller extends BaseCommandMarshaller { @@ -66,12 +62,12 @@ public class MessageAckMarshaller extend super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageAck info = (MessageAck)o; - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setAckType(dataIn.readByte()); - info.setFirstMessageId((org.apache.activemq.apollo.openwire.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setLastMessageId((org.apache.activemq.apollo.openwire.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setFirstMessageId((org.apache.activemq.apollo.openwire.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setLastMessageId((org.apache.activemq.apollo.openwire.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageCount(dataIn.readInt()); } @@ -126,12 +122,12 @@ public class MessageAckMarshaller extend super.looseUnmarshal(wireFormat, o, dataIn); MessageAck info = (MessageAck)o; - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setAckType(dataIn.readByte()); - info.setFirstMessageId((org.apache.activemq.apollo.openwire.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); - info.setLastMessageId((org.apache.activemq.apollo.openwire.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setFirstMessageId((org.apache.activemq.apollo.openwire.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setLastMessageId((org.apache.activemq.apollo.openwire.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn)); info.setMessageCount(dataIn.readInt()); } Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageAckMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageDispatchMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageDispatchMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageDispatchMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageDispatchMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.MessageDispatch; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class MessageDispatchMarshaller extends BaseCommandMarshaller { @@ -66,9 +62,9 @@ public class MessageDispatchMarshaller e super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageDispatch info = (MessageDispatch)o; - info.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setMessage((org.apache.activemq.apollo.openwire.command.Message) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setMessage((org.apache.activemq.apollo.openwire.command.Message)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setRedeliveryCounter(dataIn.readInt()); } @@ -118,9 +114,9 @@ public class MessageDispatchMarshaller e super.looseUnmarshal(wireFormat, o, dataIn); MessageDispatch info = (MessageDispatch)o; - info.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setMessage((org.apache.activemq.apollo.openwire.command.Message) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setMessage((org.apache.activemq.apollo.openwire.command.Message)looseUnmarsalNestedObject(wireFormat, dataIn)); info.setRedeliveryCounter(dataIn.readInt()); } Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageDispatchMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageDispatchNotificationMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageDispatchNotificationMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageDispatchNotificationMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageDispatchNotificationMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,30 +21,29 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.MessageDispatchNotification; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; + + /** - * Marshalling code for Open Wire Format for - * MessageDispatchNotificationMarshaller NOTE!: This file is auto generated - do - * not modify! if you need to make a change, please see the modify the groovy - * scripts in the under src/gram/script and then use maven openwire:generate to - * regenerate this file. - * + * Marshalling code for Open Wire Format for MessageDispatchNotificationMarshaller + * + * + * NOTE!: This file is auto generated - do not modify! + * Modify the 'apollo-openwire-generator' module instead. + * */ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return MessageDispatchNotification.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -54,7 +53,7 @@ public class MessageDispatchNotification /** * 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 @@ -70,6 +69,7 @@ public class MessageDispatchNotification } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -88,7 +88,7 @@ public class MessageDispatchNotification /** * Write a object instance to data output stream - * + * * @param o the instance to be marshaled * @param dataOut the output stream * @throws IOException thrown if an error occurs @@ -106,7 +106,7 @@ public class MessageDispatchNotification /** * 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 @@ -122,6 +122,7 @@ public class MessageDispatchNotification } + /** * Write the booleans that this object uses to a BooleanStream */ Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageIdMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageIdMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageIdMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,31 +21,29 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.MessageId; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; + + /** * Marshalling code for Open Wire Format for MessageIdMarshaller - * - * - * NOTE!: This file is auto generated - do not modify! if you need to make a - * change, please see the modify the groovy scripts in the under src/gram/script - * and then use maven openwire:generate to regenerate this file. - * + * + * + * NOTE!: This file is auto generated - do not modify! + * Modify the 'apollo-openwire-generator' module instead. + * */ public class MessageIdMarshaller extends BaseDataStreamMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return MessageId.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -55,23 +53,22 @@ public class MessageIdMarshaller extends /** * 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 { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageId info = (MessageId)o; - info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId)tightUnmarsalCachedObject(wireFormat, - dataIn, bs)); + info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -89,13 +86,12 @@ public class MessageIdMarshaller extends /** * 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 { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); MessageId info = (MessageId)o; @@ -107,7 +103,7 @@ public class MessageIdMarshaller extends /** * 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 @@ -116,13 +112,13 @@ public class MessageIdMarshaller extends super.looseUnmarshal(wireFormat, o, dataIn); MessageId info = (MessageId)o; - info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId)looseUnmarsalCachedObject(wireFormat, - dataIn)); + info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn)); info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn)); } + /** * Write the booleans that this object uses to a BooleanStream */ Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageIdMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,23 +21,24 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.Message; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.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. - * + * Marshalling code for Open Wire Format for MessageMarshaller + * + * + * NOTE!: This file is auto generated - do not modify! + * Modify the 'apollo-openwire-generator' module instead. + * */ 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 @@ -48,7 +49,7 @@ public abstract class MessageMarshaller Message info = (Message)o; info.beforeUnmarshall(wireFormat); - + info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); @@ -64,8 +65,8 @@ public abstract class MessageMarshaller info.setReplyTo((org.apache.activemq.apollo.openwire.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.setContent(tightUnmarshalBuffer(dataIn, bs)); + info.setMarshalledProperties(tightUnmarshalBuffer(dataIn, bs)); info.setDataStructure((org.apache.activemq.apollo.openwire.command.DataStructure)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setTargetConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setCompressed(bs.readBoolean()); @@ -74,11 +75,12 @@ public abstract class MessageMarshaller if (bs.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.apollo.openwire.command.BrokerId value[] = new org.apache.activemq.apollo.openwire.command.BrokerId[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)tightUnmarsalNestedObject(wireFormat, dataIn, bs); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); - } else { + } + else { info.setBrokerPath(null); } info.setArrival(tightUnmarshalLong(wireFormat, dataIn, bs)); @@ -89,6 +91,7 @@ public abstract class MessageMarshaller } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -112,8 +115,8 @@ public abstract class MessageMarshaller 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 += tightMarshalBuffer1(info.getContent(), bs); + rc += tightMarshalBuffer1(info.getMarshalledProperties(), bs); rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs); rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs); bs.writeBoolean(info.isCompressed()); @@ -127,7 +130,7 @@ public abstract class MessageMarshaller /** * 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 @@ -151,8 +154,8 @@ public abstract class MessageMarshaller 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); + tightMarshalBuffer2(info.getContent(), dataOut, bs); + tightMarshalBuffer2(info.getMarshalledProperties(), dataOut, bs); tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs); tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs); bs.readBoolean(); @@ -168,7 +171,7 @@ public abstract class MessageMarshaller /** * 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 @@ -179,7 +182,7 @@ public abstract class MessageMarshaller Message info = (Message)o; info.beforeUnmarshall(wireFormat); - + info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)looseUnmarsalCachedObject(wireFormat, dataIn)); @@ -195,8 +198,8 @@ public abstract class MessageMarshaller info.setReplyTo((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalNestedObject(wireFormat, dataIn)); info.setTimestamp(looseUnmarshalLong(wireFormat, dataIn)); info.setType(looseUnmarshalString(dataIn)); - info.setContent(looseUnmarshalByteSequence(dataIn)); - info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn)); + info.setContent(looseUnmarshalBuffer(dataIn)); + info.setMarshalledProperties(looseUnmarshalBuffer(dataIn)); info.setDataStructure((org.apache.activemq.apollo.openwire.command.DataStructure)looseUnmarsalNestedObject(wireFormat, dataIn)); info.setTargetConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setCompressed(dataIn.readBoolean()); @@ -205,11 +208,12 @@ public abstract class MessageMarshaller if (dataIn.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.apollo.openwire.command.BrokerId value[] = new org.apache.activemq.apollo.openwire.command.BrokerId[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)looseUnmarsalNestedObject(wireFormat, dataIn); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); - } else { + } + else { info.setBrokerPath(null); } info.setArrival(looseUnmarshalLong(wireFormat, dataIn)); @@ -220,6 +224,7 @@ public abstract class MessageMarshaller } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -245,8 +250,8 @@ public abstract class MessageMarshaller 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); + looseMarshalBuffer(wireFormat, info.getContent(), dataOut); + looseMarshalBuffer(wireFormat, info.getMarshalledProperties(), dataOut); looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut); looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut); dataOut.writeBoolean(info.isCompressed()); Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/MessageMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/NetworkBridgeFilterMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/NetworkBridgeFilterMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/NetworkBridgeFilterMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/NetworkBridgeFilterMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.NetworkBridgeFilter; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { @@ -67,7 +63,7 @@ public class NetworkBridgeFilterMarshall NetworkBridgeFilter info = (NetworkBridgeFilter)o; info.setNetworkTTL(dataIn.readInt()); - info.setNetworkBrokerId((org.apache.activemq.apollo.openwire.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setNetworkBrokerId((org.apache.activemq.apollo.openwire.command.BrokerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } @@ -113,7 +109,7 @@ public class NetworkBridgeFilterMarshall NetworkBridgeFilter info = (NetworkBridgeFilter)o; info.setNetworkTTL(dataIn.readInt()); - info.setNetworkBrokerId((org.apache.activemq.apollo.openwire.command.BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setNetworkBrokerId((org.apache.activemq.apollo.openwire.command.BrokerId)looseUnmarsalCachedObject(wireFormat, dataIn)); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/PartialCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/PartialCommandMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/PartialCommandMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/PartialCommandMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.PartialCommand; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class PartialCommandMarshaller extends BaseDataStreamMarshaller { Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerIdMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerIdMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerIdMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,31 +21,29 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.ProducerId; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; + + /** * Marshalling code for Open Wire Format for ProducerIdMarshaller - * - * - * NOTE!: This file is auto generated - do not modify! if you need to make a - * change, please see the modify the groovy scripts in the under src/gram/script - * and then use maven openwire:generate to regenerate this file. - * + * + * + * NOTE!: This file is auto generated - do not modify! + * Modify the 'apollo-openwire-generator' module instead. + * */ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return ProducerId.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -55,13 +53,12 @@ public class ProducerIdMarshaller extend /** * 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 { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ProducerId info = (ProducerId)o; @@ -71,6 +68,7 @@ public class ProducerIdMarshaller extend } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -88,13 +86,12 @@ public class ProducerIdMarshaller extend /** * 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 { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ProducerId info = (ProducerId)o; @@ -106,7 +103,7 @@ public class ProducerIdMarshaller extend /** * 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 @@ -121,6 +118,7 @@ public class ProducerIdMarshaller extend } + /** * Write the booleans that this object uses to a BooleanStream */ Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerIdMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,29 +21,29 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.ProducerInfo; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; + + /** - * Marshalling code for Open Wire Format for ProducerInfoMarshaller NOTE!: This - * file is auto generated - do not modify! if you need to make a change, please - * see the modify the groovy scripts in the under src/gram/script and then use - * maven openwire:generate to regenerate this file. - * + * Marshalling code for Open Wire Format for ProducerInfoMarshaller + * + * + * NOTE!: This file is auto generated - do not modify! + * Modify the 'apollo-openwire-generator' module instead. + * */ public class ProducerInfoMarshaller extends BaseCommandMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return ProducerInfo.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -53,7 +53,7 @@ public class ProducerInfoMarshaller exte /** * 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 @@ -68,16 +68,18 @@ public class ProducerInfoMarshaller exte if (bs.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.apollo.openwire.command.BrokerId value[] = new org.apache.activemq.apollo.openwire.command.BrokerId[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)tightUnmarsalNestedObject(wireFormat, dataIn, bs); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); - } else { + } + else { info.setBrokerPath(null); } } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -95,7 +97,7 @@ public class ProducerInfoMarshaller exte /** * 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 @@ -112,7 +114,7 @@ public class ProducerInfoMarshaller exte /** * 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 @@ -127,16 +129,18 @@ public class ProducerInfoMarshaller exte if (dataIn.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.apollo.openwire.command.BrokerId value[] = new org.apache.activemq.apollo.openwire.command.BrokerId[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)looseUnmarsalNestedObject(wireFormat, dataIn); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); - } else { + } + else { info.setBrokerPath(null); } } + /** * Write the booleans that this object uses to a BooleanStream */ Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ProducerInfoMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.RemoveInfo; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class RemoveInfoMarshaller extends BaseCommandMarshaller { @@ -66,7 +62,7 @@ public class RemoveInfoMarshaller extend super.tightUnmarshal(wireFormat, o, dataIn, bs); RemoveInfo info = (RemoveInfo)o; - info.setObjectId((org.apache.activemq.apollo.openwire.command.DataStructure) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setObjectId((org.apache.activemq.apollo.openwire.command.DataStructure)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } @@ -110,7 +106,7 @@ public class RemoveInfoMarshaller extend super.looseUnmarshal(wireFormat, o, dataIn); RemoveInfo info = (RemoveInfo)o; - info.setObjectId((org.apache.activemq.apollo.openwire.command.DataStructure) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setObjectId((org.apache.activemq.apollo.openwire.command.DataStructure)looseUnmarsalCachedObject(wireFormat, dataIn)); } Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveInfoMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveSubscriptionInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveSubscriptionInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveSubscriptionInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveSubscriptionInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.RemoveSubscriptionInfo; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class RemoveSubscriptionInfoMarshaller extends BaseCommandMarshaller { @@ -66,7 +62,7 @@ public class RemoveSubscriptionInfoMarsh super.tightUnmarshal(wireFormat, o, dataIn, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; - info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setSubscriptionName(tightUnmarshalString(dataIn, bs)); info.setClientId(tightUnmarshalString(dataIn, bs)); @@ -116,7 +112,7 @@ public class RemoveSubscriptionInfoMarsh super.looseUnmarshal(wireFormat, o, dataIn); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; - info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setSubscriptionName(looseUnmarshalString(dataIn)); info.setClientId(looseUnmarshalString(dataIn)); Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/RemoveSubscriptionInfoMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ReplayCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ReplayCommandMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ReplayCommandMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ReplayCommandMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.ReplayCommand; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class ReplayCommandMarshaller extends BaseCommandMarshaller { Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ResponseMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ResponseMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ResponseMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ResponseMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.Response; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class ResponseMarshaller extends BaseCommandMarshaller { Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ResponseMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionIdMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionIdMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionIdMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,31 +21,29 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.SessionId; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; + + /** * Marshalling code for Open Wire Format for SessionIdMarshaller - * - * - * 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. - * + * + * + * NOTE!: This file is auto generated - do not modify! + * Modify the 'apollo-openwire-generator' module instead. + * */ public class SessionIdMarshaller extends BaseDataStreamMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return SessionId.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -55,13 +53,12 @@ public class SessionIdMarshaller extends /** * 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 { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); SessionId info = (SessionId)o; @@ -70,6 +67,7 @@ public class SessionIdMarshaller extends } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -86,13 +84,12 @@ public class SessionIdMarshaller extends /** * 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 { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); SessionId info = (SessionId)o; @@ -103,7 +100,7 @@ public class SessionIdMarshaller extends /** * 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 @@ -117,6 +114,7 @@ public class SessionIdMarshaller extends } + /** * Write the booleans that this object uses to a BooleanStream */ Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionIdMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.SessionInfo; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class SessionInfoMarshaller extends BaseCommandMarshaller { @@ -66,7 +62,7 @@ public class SessionInfoMarshaller exten super.tightUnmarshal(wireFormat, o, dataIn, bs); SessionInfo info = (SessionInfo)o; - info.setSessionId((org.apache.activemq.apollo.openwire.command.SessionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setSessionId((org.apache.activemq.apollo.openwire.command.SessionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } @@ -110,7 +106,7 @@ public class SessionInfoMarshaller exten super.looseUnmarshal(wireFormat, o, dataIn); SessionInfo info = (SessionInfo)o; - info.setSessionId((org.apache.activemq.apollo.openwire.command.SessionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setSessionId((org.apache.activemq.apollo.openwire.command.SessionId)looseUnmarsalCachedObject(wireFormat, dataIn)); } Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SessionInfoMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ShutdownInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ShutdownInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ShutdownInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ShutdownInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.ShutdownInfo; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class ShutdownInfoMarshaller extends BaseCommandMarshaller { Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/ShutdownInfoMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SubscriptionInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SubscriptionInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SubscriptionInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SubscriptionInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.SubscriptionInfo; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class SubscriptionInfoMarshaller extends BaseDataStreamMarshaller { @@ -67,7 +63,7 @@ public class SubscriptionInfoMarshaller SubscriptionInfo info = (SubscriptionInfo)o; info.setClientId(tightUnmarshalString(dataIn, bs)); - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setSelector(tightUnmarshalString(dataIn, bs)); info.setSubscriptionName(tightUnmarshalString(dataIn, bs)); @@ -120,7 +116,7 @@ public class SubscriptionInfoMarshaller SubscriptionInfo info = (SubscriptionInfo)o; info.setClientId(looseUnmarshalString(dataIn)); - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setSelector(looseUnmarshalString(dataIn)); info.setSubscriptionName(looseUnmarshalString(dataIn)); Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/SubscriptionInfoMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionIdMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionIdMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionIdMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,8 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -31,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public abstract class TransactionIdMarshaller extends BaseDataStreamMarshaller { Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionIdMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.TransactionInfo; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class TransactionInfoMarshaller extends BaseCommandMarshaller { @@ -66,8 +62,8 @@ public class TransactionInfoMarshaller e super.tightUnmarshal(wireFormat, o, dataIn, bs); TransactionInfo info = (TransactionInfo)o; - info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setType(dataIn.readByte()); } @@ -115,8 +111,8 @@ public class TransactionInfoMarshaller e super.looseUnmarshal(wireFormat, o, dataIn); TransactionInfo info = (TransactionInfo)o; - info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setType(dataIn.readByte()); } Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/TransactionInfoMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/WireFormatInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/WireFormatInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/WireFormatInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/WireFormatInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.WireFormatInfo; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class WireFormatInfoMarshaller extends BaseDataStreamMarshaller { @@ -71,7 +67,7 @@ public class WireFormatInfoMarshaller ex info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8)); info.setVersion(dataIn.readInt()); - info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs)); + info.setMarshalledProperties(tightUnmarshalBuffer(dataIn, bs)); info.afterUnmarshall(wireFormat); @@ -89,7 +85,7 @@ public class WireFormatInfoMarshaller ex int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8); - rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs); + rc += tightMarshalBuffer1(info.getMarshalledProperties(), bs); return rc + 4; } @@ -107,7 +103,7 @@ public class WireFormatInfoMarshaller ex WireFormatInfo info = (WireFormatInfo)o; tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8); dataOut.writeInt(info.getVersion()); - tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs); + tightMarshalBuffer2(info.getMarshalledProperties(), dataOut, bs); info.afterMarshall(wireFormat); @@ -129,7 +125,7 @@ public class WireFormatInfoMarshaller ex info.setMagic(looseUnmarshalConstByteArray(dataIn, 8)); info.setVersion(dataIn.readInt()); - info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn)); + info.setMarshalledProperties(looseUnmarshalBuffer(dataIn)); info.afterUnmarshall(wireFormat); @@ -148,7 +144,7 @@ public class WireFormatInfoMarshaller ex super.looseMarshal(wireFormat, o, dataOut); looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8); dataOut.writeInt(info.getVersion()); - looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut); + looseMarshalBuffer(wireFormat, info.getMarshalledProperties(), dataOut); } } Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/WireFormatInfoMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/XATransactionIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/XATransactionIdMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/XATransactionIdMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/XATransactionIdMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.command.XATransactionId; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class XATransactionIdMarshaller extends TransactionIdMarshaller { Propchange: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v1/XATransactionIdMarshaller.java ('svn:executable' removed) Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v2/ActiveMQBytesMessageMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v2/ActiveMQBytesMessageMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v2/ActiveMQBytesMessageMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v2/ActiveMQBytesMessageMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,10 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.ActiveMQBytesMessage; -import org.apache.activemq.apollo.openwire.command.DataStructure; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -33,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public class ActiveMQBytesMessageMarshaller extends ActiveMQMessageMarshaller { Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v2/ActiveMQDestinationMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v2/ActiveMQDestinationMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v2/ActiveMQDestinationMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v2/ActiveMQDestinationMarshaller.java Thu Jan 26 16:15:05 2012 @@ -21,9 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.apollo.openwire.command.ActiveMQDestination; -import org.apache.activemq.apollo.openwire.codec.BooleanStream; -import org.apache.activemq.apollo.openwire.codec.OpenWireFormat; +import org.apache.activemq.apollo.openwire.codec.*; +import org.apache.activemq.apollo.openwire.command.*; @@ -32,9 +31,7 @@ import org.apache.activemq.apollo.openwi * * * 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. + * Modify the 'apollo-openwire-generator' module instead. * */ public abstract class ActiveMQDestinationMarshaller extends BaseDataStreamMarshaller {