Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 60311 invoked from network); 7 Mar 2006 04:15:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Mar 2006 04:15:59 -0000 Received: (qmail 63537 invoked by uid 500); 7 Mar 2006 04:15:57 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 63461 invoked by uid 500); 7 Mar 2006 04:15:56 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 63448 invoked by uid 99); 7 Mar 2006 04:15:56 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2006 20:15:56 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 06 Mar 2006 20:15:42 -0800 Received: (qmail 60020 invoked by uid 65534); 7 Mar 2006 04:15:21 -0000 Message-ID: <20060307041521.60019.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r383767 [2/10] - in /incubator/activemq/trunk: activemq-core/src/gram/java/org/apache/activemq/openwire/tool/ activemq-core/src/gram/script/ activemq-core/src/main/java/org/apache/activemq/command/ activemq-core/src/main/java/org/apache/act... Date: Tue, 07 Mar 2006 04:14:38 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java Mon Mar 6 20:14:27 2006 @@ -79,8 +79,8 @@ JournalQueueAck info = (JournalQueueAck)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageAck(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageAck(), bs); return rc + 0; } @@ -96,8 +96,8 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); JournalQueueAck info = (JournalQueueAck)o; - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageAck(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageAck(), dataOut, bs); } @@ -126,8 +126,8 @@ JournalQueueAck info = (JournalQueueAck)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageAck(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageAck(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java Mon Mar 6 20:14:27 2006 @@ -83,12 +83,12 @@ JournalTopicAck info = (JournalTopicAck)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); - rc+=tightMarshalLong1(wireFormat, info.getMessageSequenceId(), bs); - rc += tightMarshalString1(info.getSubscritionName(), bs); - rc += tightMarshalString1(info.getClientId(), bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); + rc+=tightMarshalLong1(wireFormat, info.getMessageSequenceId(), bs); + rc += tightMarshalString1(info.getSubscritionName(), bs); + rc += tightMarshalString1(info.getClientId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); return rc + 0; } @@ -104,12 +104,12 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTopicAck info = (JournalTopicAck)o; - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs); - tightMarshalLong2(wireFormat, info.getMessageSequenceId(), dataOut, bs); - tightMarshalString2(info.getSubscritionName(), dataOut, bs); - tightMarshalString2(info.getClientId(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getMessageSequenceId(), dataOut, bs); + tightMarshalString2(info.getSubscritionName(), dataOut, bs); + tightMarshalString2(info.getClientId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); } @@ -142,12 +142,12 @@ JournalTopicAck info = (JournalTopicAck)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut); - looseMarshalLong(wireFormat, info.getMessageSequenceId(), dataOut); - looseMarshalString(info.getSubscritionName(), dataOut); - looseMarshalString(info.getClientId(), dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut); + looseMarshalLong(wireFormat, info.getMessageSequenceId(), dataOut); + looseMarshalString(info.getSubscritionName(), dataOut); + looseMarshalString(info.getClientId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java Mon Mar 6 20:14:27 2006 @@ -78,7 +78,7 @@ JournalTrace info = (JournalTrace)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalString1(info.getMessage(), bs); + rc += tightMarshalString1(info.getMessage(), bs); return rc + 0; } @@ -94,7 +94,7 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTrace info = (JournalTrace)o; - tightMarshalString2(info.getMessage(), dataOut, bs); + tightMarshalString2(info.getMessage(), dataOut, bs); } @@ -122,7 +122,7 @@ JournalTrace info = (JournalTrace)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalString(info.getMessage(), dataOut); + looseMarshalString(info.getMessage(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java Mon Mar 6 20:14:27 2006 @@ -80,7 +80,7 @@ JournalTransaction info = (JournalTransaction)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); bs.writeBoolean(info.getWasPrepared()); return rc + 1; @@ -97,9 +97,9 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); JournalTransaction info = (JournalTransaction)o; - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); - dataOut.writeByte(info.getType()); - bs.readBoolean(); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); + dataOut.writeByte(info.getType()); + bs.readBoolean(); } @@ -129,9 +129,9 @@ JournalTransaction info = (JournalTransaction)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); - dataOut.writeByte(info.getType()); - dataOut.writeBoolean(info.getWasPrepared()); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); + dataOut.writeByte(info.getType()); + dataOut.writeBoolean(info.getWasPrepared()); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java Mon Mar 6 20:14:27 2006 @@ -79,8 +79,8 @@ LocalTransactionId info = (LocalTransactionId)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc+=tightMarshalLong1(wireFormat, info.getValue(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); + rc+=tightMarshalLong1(wireFormat, info.getValue(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); return rc + 0; } @@ -96,8 +96,8 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); LocalTransactionId info = (LocalTransactionId)o; - tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); } @@ -126,8 +126,8 @@ LocalTransactionId info = (LocalTransactionId)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalLong(wireFormat, info.getValue(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); + looseMarshalLong(wireFormat, info.getValue(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java Mon Mar 6 20:14:27 2006 @@ -84,12 +84,12 @@ MessageAck info = (MessageAck)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getFirstMessageId(), bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getLastMessageId(), bs); - + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getLastMessageId(), bs); + return rc + 5; } @@ -104,13 +104,13 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); MessageAck info = (MessageAck)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); - dataOut.writeByte(info.getAckType()); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getLastMessageId(), dataOut, bs); - dataOut.writeInt(info.getMessageCount()); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); + dataOut.writeByte(info.getAckType()); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getLastMessageId(), dataOut, bs); + dataOut.writeInt(info.getMessageCount()); } @@ -144,13 +144,13 @@ MessageAck info = (MessageAck)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); - dataOut.writeByte(info.getAckType()); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getLastMessageId(), dataOut); - dataOut.writeInt(info.getMessageCount()); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); + dataOut.writeByte(info.getAckType()); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getLastMessageId(), dataOut); + dataOut.writeInt(info.getMessageCount()); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java Mon Mar 6 20:14:27 2006 @@ -81,10 +81,10 @@ MessageDispatch info = (MessageDispatch)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessage(), bs); - + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessage(), bs); + return rc + 4; } @@ -99,10 +99,10 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); MessageDispatch info = (MessageDispatch)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessage(), dataOut, bs); - dataOut.writeInt(info.getRedeliveryCounter()); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessage(), dataOut, bs); + dataOut.writeInt(info.getRedeliveryCounter()); } @@ -133,10 +133,10 @@ MessageDispatch info = (MessageDispatch)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessage(), dataOut); - dataOut.writeInt(info.getRedeliveryCounter()); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessage(), dataOut); + dataOut.writeInt(info.getRedeliveryCounter()); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java Mon Mar 6 20:14:27 2006 @@ -81,10 +81,10 @@ MessageDispatchNotification info = (MessageDispatchNotification)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); - rc+=tightMarshalLong1(wireFormat, info.getDeliverySequenceId(), bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc+=tightMarshalLong1(wireFormat, info.getDeliverySequenceId(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); return rc + 0; } @@ -100,10 +100,10 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); MessageDispatchNotification info = (MessageDispatchNotification)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); - tightMarshalLong2(wireFormat, info.getDeliverySequenceId(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getDeliverySequenceId(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs); } @@ -134,10 +134,10 @@ MessageDispatchNotification info = (MessageDispatchNotification)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); - looseMarshalLong(wireFormat, info.getDeliverySequenceId(), dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalLong(wireFormat, info.getDeliverySequenceId(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java Mon Mar 6 20:14:27 2006 @@ -80,9 +80,9 @@ MessageId info = (MessageId)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); - rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs); - rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); + rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs); + rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs); return rc + 0; } @@ -98,9 +98,9 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); MessageId info = (MessageId)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); - tightMarshalLong2(wireFormat, info.getProducerSequenceId(), dataOut, bs); - tightMarshalLong2(wireFormat, info.getBrokerSequenceId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getProducerSequenceId(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getBrokerSequenceId(), dataOut, bs); } @@ -130,9 +130,9 @@ MessageId info = (MessageId)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); - looseMarshalLong(wireFormat, info.getProducerSequenceId(), dataOut); - looseMarshalLong(wireFormat, info.getBrokerSequenceId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); + looseMarshalLong(wireFormat, info.getProducerSequenceId(), dataOut); + looseMarshalLong(wireFormat, info.getBrokerSequenceId(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java Mon Mar 6 20:14:27 2006 @@ -105,28 +105,28 @@ info.beforeMarshall(wireFormat); int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalTransactionId(), bs); - rc += tightMarshalString1(info.getGroupID(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalTransactionId(), bs); + rc += tightMarshalString1(info.getGroupID(), bs); rc += tightMarshalString1(info.getCorrelationId(), bs); - bs.writeBoolean(info.isPersistent()); - rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs); + bs.writeBoolean(info.isPersistent()); + rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs); rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs); - rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs); - rc += tightMarshalString1(info.getType(), bs); - rc += tightMarshalByteSequence1(info.getContent(), bs); - rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs); - rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs); - bs.writeBoolean(info.isCompressed()); + rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs); + rc += tightMarshalString1(info.getType(), bs); + rc += tightMarshalByteSequence1(info.getContent(), bs); + rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs); + rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs); + bs.writeBoolean(info.isCompressed()); rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs); - rc+=tightMarshalLong1(wireFormat, info.getArrival(), bs); - rc += tightMarshalString1(info.getUserID(), bs); - bs.writeBoolean(info.isRecievedByDFBridge()); + rc+=tightMarshalLong1(wireFormat, info.getArrival(), bs); + rc += tightMarshalString1(info.getUserID(), bs); + bs.writeBoolean(info.isRecievedByDFBridge()); return rc + 9; } @@ -142,31 +142,31 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); Message info = (Message)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs); - tightMarshalString2(info.getGroupID(), dataOut, bs); - dataOut.writeInt(info.getGroupSequence()); - tightMarshalString2(info.getCorrelationId(), dataOut, bs); - bs.readBoolean(); - tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs); - dataOut.writeByte(info.getPriority()); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs); - tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs); - tightMarshalString2(info.getType(), dataOut, bs); - tightMarshalByteSequence2(info.getContent(), dataOut, bs); - tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs); - tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs); - bs.readBoolean(); - dataOut.writeInt(info.getRedeliveryCounter()); - tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs); - tightMarshalLong2(wireFormat, info.getArrival(), dataOut, bs); - tightMarshalString2(info.getUserID(), dataOut, bs); - bs.readBoolean(); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs); + tightMarshalString2(info.getGroupID(), dataOut, bs); + dataOut.writeInt(info.getGroupSequence()); + tightMarshalString2(info.getCorrelationId(), dataOut, bs); + bs.readBoolean(); + tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs); + dataOut.writeByte(info.getPriority()); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs); + tightMarshalString2(info.getType(), dataOut, bs); + tightMarshalByteSequence2(info.getContent(), dataOut, bs); + tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs); + tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs); + bs.readBoolean(); + dataOut.writeInt(info.getRedeliveryCounter()); + tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getArrival(), dataOut, bs); + tightMarshalString2(info.getUserID(), dataOut, bs); + bs.readBoolean(); info.afterMarshall(wireFormat); @@ -238,31 +238,31 @@ info.beforeMarshall(wireFormat); super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut); - looseMarshalString(info.getGroupID(), dataOut); - dataOut.writeInt(info.getGroupSequence()); - looseMarshalString(info.getCorrelationId(), dataOut); - dataOut.writeBoolean(info.isPersistent()); - looseMarshalLong(wireFormat, info.getExpiration(), dataOut); - dataOut.writeByte(info.getPriority()); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut); - looseMarshalLong(wireFormat, info.getTimestamp(), dataOut); - looseMarshalString(info.getType(), dataOut); - looseMarshalByteSequence(wireFormat, info.getContent(), dataOut); - looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut); - looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut); - dataOut.writeBoolean(info.isCompressed()); - dataOut.writeInt(info.getRedeliveryCounter()); - looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut); - looseMarshalLong(wireFormat, info.getArrival(), dataOut); - looseMarshalString(info.getUserID(), dataOut); - dataOut.writeBoolean(info.isRecievedByDFBridge()); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut); + looseMarshalString(info.getGroupID(), dataOut); + dataOut.writeInt(info.getGroupSequence()); + looseMarshalString(info.getCorrelationId(), dataOut); + dataOut.writeBoolean(info.isPersistent()); + looseMarshalLong(wireFormat, info.getExpiration(), dataOut); + dataOut.writeByte(info.getPriority()); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut); + looseMarshalLong(wireFormat, info.getTimestamp(), dataOut); + looseMarshalString(info.getType(), dataOut); + looseMarshalByteSequence(wireFormat, info.getContent(), dataOut); + looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut); + looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut); + dataOut.writeBoolean(info.isCompressed()); + dataOut.writeInt(info.getRedeliveryCounter()); + looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut); + looseMarshalLong(wireFormat, info.getArrival(), dataOut); + looseMarshalString(info.getUserID(), dataOut); + dataOut.writeBoolean(info.isRecievedByDFBridge()); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java Mon Mar 6 20:14:27 2006 @@ -1 +1,132 @@ -/** * * Copyright 2005-2006 The Apache Software Foundation * * Licensed 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.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; /** * Marshalling code for Open Wire Format for NetworkBridgeFilterMarshaller * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * @version $Revision$ */ public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { /** * Return the type of Data Structure we marshal * @return short representation of the type data structure */ public byte getDataStructureType() { return NetworkBridgeFilter.DATA_STRUCTURE_TYPE; } /** * @return a new object instance */ 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 */ public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, Bo oleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); NetworkBridgeFilter info = (NetworkBridgeFilter)o; info.setNetworkTTL(dataIn.readInt()); info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } /** * Write the booleans that this object uses to a BooleanStream */ 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, (DataStructure)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 stream * @throws IOException thrown if an error occurs */ pub lic void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); NetworkBridgeFilter info = (NetworkBridgeFilter)o; dataOut.writeInt(info.getNetworkTTL()); tightMarshalCachedObject2(wireFormat, (DataStructure)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 */ public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { super.looseUnmarshal(wireFormat, o, dataIn); NetworkBridgeFilter info = (NetworkBridgeFilter)o; info.setNetworkTTL(dataIn.readInt()); info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireF ormat, dataIn)); } /** * Write the booleans that this object uses to a BooleanStream */ public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { NetworkBridgeFilter info = (NetworkBridgeFilter)o; super.looseMarshal(wireFormat, o, dataOut); dataOut.writeInt(info.getNetworkTTL()); looseMarshalCachedObject(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut); } } \ No newline at end of file +/** + * + * Copyright 2005-2006 The Apache Software Foundation + * + * Licensed 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.v1; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; + + + +/** + * Marshalling code for Open Wire Format for NetworkBridgeFilterMarshaller + * + * + * NOTE!: This file is auto generated - do not modify! + * if you need to make a change, please see the modify the groovy scripts in the + * under src/gram/script and then use maven openwire:generate to regenerate + * this file. + * + * @version $Revision$ + */ +public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller { + + /** + * Return the type of Data Structure we marshal + * @return short representation of the type data structure + */ + public byte getDataStructureType() { + return NetworkBridgeFilter.DATA_STRUCTURE_TYPE; + } + + /** + * @return a new object instance + */ + 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 + */ + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, BooleanStream bs) throws IOException { + super.tightUnmarshal(wireFormat, o, dataIn, bs); + + NetworkBridgeFilter info = (NetworkBridgeFilter)o; + info.setNetworkTTL(dataIn.readInt()); + info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + + } + + + /** + * Write the booleans that this object uses to a BooleanStream + */ + 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, (DataStructure)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 stream + * @throws IOException thrown if an error occurs + */ + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException { + super.tightMarshal2(wireFormat, o, dataOut, bs); + + NetworkBridgeFilter info = (NetworkBridgeFilter)o; + dataOut.writeInt(info.getNetworkTTL()); + tightMarshalCachedObject2(wireFormat, (DataStructure)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 + */ + public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException { + super.looseUnmarshal(wireFormat, o, dataIn); + + NetworkBridgeFilter info = (NetworkBridgeFilter)o; + info.setNetworkTTL(dataIn.readInt()); + info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + + } + + + /** + * Write the booleans that this object uses to a BooleanStream + */ + public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException { + + NetworkBridgeFilter info = (NetworkBridgeFilter)o; + + super.looseMarshal(wireFormat, o, dataOut); + dataOut.writeInt(info.getNetworkTTL()); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut); + + } +} Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java Mon Mar 6 20:14:27 2006 @@ -80,9 +80,9 @@ ProducerId info = (ProducerId)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalString1(info.getConnectionId(), bs); - rc+=tightMarshalLong1(wireFormat, info.getValue(), bs); - rc+=tightMarshalLong1(wireFormat, info.getSessionId(), bs); + rc += tightMarshalString1(info.getConnectionId(), bs); + rc+=tightMarshalLong1(wireFormat, info.getValue(), bs); + rc+=tightMarshalLong1(wireFormat, info.getSessionId(), bs); return rc + 0; } @@ -98,9 +98,9 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); ProducerId info = (ProducerId)o; - tightMarshalString2(info.getConnectionId(), dataOut, bs); - tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs); - tightMarshalLong2(wireFormat, info.getSessionId(), dataOut, bs); + tightMarshalString2(info.getConnectionId(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getSessionId(), dataOut, bs); } @@ -130,9 +130,9 @@ ProducerId info = (ProducerId)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalString(info.getConnectionId(), dataOut); - looseMarshalLong(wireFormat, info.getValue(), dataOut); - looseMarshalLong(wireFormat, info.getSessionId(), dataOut); + looseMarshalString(info.getConnectionId(), dataOut); + looseMarshalLong(wireFormat, info.getValue(), dataOut); + looseMarshalLong(wireFormat, info.getSessionId(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java Mon Mar 6 20:14:27 2006 @@ -91,9 +91,9 @@ ProducerInfo info = (ProducerInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); - rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs); return rc + 0; } @@ -109,9 +109,9 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); ProducerInfo info = (ProducerInfo)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); - tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs); } @@ -152,9 +152,9 @@ ProducerInfo info = (ProducerInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); - looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java Mon Mar 6 20:14:27 2006 @@ -78,7 +78,7 @@ RemoveInfo info = (RemoveInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getObjectId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getObjectId(), bs); return rc + 0; } @@ -94,7 +94,7 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); RemoveInfo info = (RemoveInfo)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getObjectId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getObjectId(), dataOut, bs); } @@ -122,7 +122,7 @@ RemoveInfo info = (RemoveInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getObjectId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getObjectId(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java Mon Mar 6 20:14:27 2006 @@ -80,9 +80,9 @@ RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); - rc += tightMarshalString1(info.getSubcriptionName(), bs); - rc += tightMarshalString1(info.getClientId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); + rc += tightMarshalString1(info.getSubcriptionName(), bs); + rc += tightMarshalString1(info.getClientId(), bs); return rc + 0; } @@ -98,9 +98,9 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); - tightMarshalString2(info.getSubcriptionName(), dataOut, bs); - tightMarshalString2(info.getClientId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); + tightMarshalString2(info.getSubcriptionName(), dataOut, bs); + tightMarshalString2(info.getClientId(), dataOut, bs); } @@ -130,9 +130,9 @@ RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); - looseMarshalString(info.getSubcriptionName(), dataOut); - looseMarshalString(info.getClientId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); + looseMarshalString(info.getSubcriptionName(), dataOut); + looseMarshalString(info.getClientId(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java Mon Mar 6 20:14:27 2006 @@ -78,7 +78,7 @@ Response info = (Response)o; int rc = super.tightMarshal1(wireFormat, o, bs); - + return rc + 2; } @@ -93,7 +93,7 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); Response info = (Response)o; - dataOut.writeShort(info.getCorrelationId()); + dataOut.writeShort(info.getCorrelationId()); } @@ -121,7 +121,7 @@ Response info = (Response)o; super.looseMarshal(wireFormat, o, dataOut); - dataOut.writeShort(info.getCorrelationId()); + dataOut.writeShort(info.getCorrelationId()); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java Mon Mar 6 20:14:27 2006 @@ -79,8 +79,8 @@ SessionId info = (SessionId)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalString1(info.getConnectionId(), bs); - rc+=tightMarshalLong1(wireFormat, info.getValue(), bs); + rc += tightMarshalString1(info.getConnectionId(), bs); + rc+=tightMarshalLong1(wireFormat, info.getValue(), bs); return rc + 0; } @@ -96,8 +96,8 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); SessionId info = (SessionId)o; - tightMarshalString2(info.getConnectionId(), dataOut, bs); - tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs); + tightMarshalString2(info.getConnectionId(), dataOut, bs); + tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs); } @@ -126,8 +126,8 @@ SessionId info = (SessionId)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalString(info.getConnectionId(), dataOut); - looseMarshalLong(wireFormat, info.getValue(), dataOut); + looseMarshalString(info.getConnectionId(), dataOut); + looseMarshalLong(wireFormat, info.getValue(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java Mon Mar 6 20:14:27 2006 @@ -78,7 +78,7 @@ SessionInfo info = (SessionInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getSessionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getSessionId(), bs); return rc + 0; } @@ -94,7 +94,7 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); SessionInfo info = (SessionInfo)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getSessionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getSessionId(), dataOut, bs); } @@ -122,7 +122,7 @@ SessionInfo info = (SessionInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getSessionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getSessionId(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java Mon Mar 6 20:14:27 2006 @@ -81,10 +81,10 @@ SubscriptionInfo info = (SubscriptionInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalString1(info.getClientId(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); - rc += tightMarshalString1(info.getSelector(), bs); - rc += tightMarshalString1(info.getSubcriptionName(), bs); + rc += tightMarshalString1(info.getClientId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); + rc += tightMarshalString1(info.getSelector(), bs); + rc += tightMarshalString1(info.getSubcriptionName(), bs); return rc + 0; } @@ -100,10 +100,10 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); SubscriptionInfo info = (SubscriptionInfo)o; - tightMarshalString2(info.getClientId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); - tightMarshalString2(info.getSelector(), dataOut, bs); - tightMarshalString2(info.getSubcriptionName(), dataOut, bs); + tightMarshalString2(info.getClientId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs); + tightMarshalString2(info.getSelector(), dataOut, bs); + tightMarshalString2(info.getSubcriptionName(), dataOut, bs); } @@ -134,10 +134,10 @@ SubscriptionInfo info = (SubscriptionInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalString(info.getClientId(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); - looseMarshalString(info.getSelector(), dataOut); - looseMarshalString(info.getSubcriptionName(), dataOut); + looseMarshalString(info.getClientId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut); + looseMarshalString(info.getSelector(), dataOut); + looseMarshalString(info.getSubcriptionName(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java Mon Mar 6 20:14:27 2006 @@ -80,9 +80,9 @@ TransactionInfo info = (TransactionInfo)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); - rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); - + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); + rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); + return rc + 1; } @@ -97,9 +97,9 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); TransactionInfo info = (TransactionInfo)o; - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); - tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); - dataOut.writeByte(info.getType()); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs); + tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs); + dataOut.writeByte(info.getType()); } @@ -129,9 +129,9 @@ TransactionInfo info = (TransactionInfo)o; super.looseMarshal(wireFormat, o, dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); - looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); - dataOut.writeByte(info.getType()); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut); + looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut); + dataOut.writeByte(info.getType()); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java Mon Mar 6 20:14:27 2006 @@ -87,7 +87,7 @@ info.beforeMarshall(wireFormat); int rc = super.tightMarshal1(wireFormat, o, bs); - rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8); + rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8); rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs); return rc + 4; @@ -104,9 +104,9 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); WireFormatInfo info = (WireFormatInfo)o; - tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8); - dataOut.writeInt(info.getVersion()); - tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs); + tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8); + dataOut.writeInt(info.getVersion()); + tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs); info.afterMarshall(wireFormat); @@ -145,9 +145,9 @@ info.beforeMarshall(wireFormat); super.looseMarshal(wireFormat, o, dataOut); - looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8); - dataOut.writeInt(info.getVersion()); - looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut); + looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8); + dataOut.writeInt(info.getVersion()); + looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java Mon Mar 6 20:14:27 2006 @@ -81,7 +81,7 @@ int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalByteArray1(info.getGlobalTransactionId(), bs); - rc += tightMarshalByteArray1(info.getBranchQualifier(), bs); + rc += tightMarshalByteArray1(info.getBranchQualifier(), bs); return rc + 4; } @@ -97,9 +97,9 @@ super.tightMarshal2(wireFormat, o, dataOut, bs); XATransactionId info = (XATransactionId)o; - dataOut.writeInt(info.getFormatId()); - tightMarshalByteArray2(info.getGlobalTransactionId(), dataOut, bs); - tightMarshalByteArray2(info.getBranchQualifier(), dataOut, bs); + dataOut.writeInt(info.getFormatId()); + tightMarshalByteArray2(info.getGlobalTransactionId(), dataOut, bs); + tightMarshalByteArray2(info.getBranchQualifier(), dataOut, bs); } @@ -129,9 +129,9 @@ XATransactionId info = (XATransactionId)o; super.looseMarshal(wireFormat, o, dataOut); - dataOut.writeInt(info.getFormatId()); - looseMarshalByteArray(wireFormat, info.getGlobalTransactionId(), dataOut); - looseMarshalByteArray(wireFormat, info.getBranchQualifier(), dataOut); + dataOut.writeInt(info.getFormatId()); + looseMarshalByteArray(wireFormat, info.getGlobalTransactionId(), dataOut); + looseMarshalByteArray(wireFormat, info.getBranchQualifier(), dataOut); } } Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java?rev=383767&r1=383766&r2=383767&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java (original) +++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java Mon Mar 6 20:14:27 2006 @@ -1 +1,57 @@ -/** * * Copyright 2005-2006 The Apache Software Foundation * * Licensed 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.v1; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import org.apache.activemq.openwire.*; import org.apache.activemq.command.*; /** * Test case for the OpenWire marshalling for NetworkBridgeFilter * * * NOTE!: This file is auto generated - do not modify! * if you need to make a change, please see the modify the groovy scripts in the * under src/gram/script and then use maven openwire:generate to regenerate * this file. * * @version $Revision: $ */ public class NetworkBridgeFilterTest extends DataFileGeneratorTestSupport { public static NetworkBridgeFilterTest SINGLETON = new NetworkBridgeFilterTest(); public Object createObject() throws Exception { NetworkBridgeFilter info = new NetworkBridgeFilter(); populateObject(info); return info; } protected void populateObject(Object object) throws Exception { super.populateObject(object); NetworkBridgeFilter info = (NetworkBridgeFilter) object; info.setNetworkTTL(1); info.setNetworkBrokerId(createBrokerId("NetworkBrokerId:1")); } } \ No newline at end of file +/** + * + * Copyright 2005-2006 The Apache Software Foundation + * + * Licensed 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.v1; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; + + +/** + * Test case for the OpenWire marshalling for NetworkBridgeFilter + * + * + * NOTE!: This file is auto generated - do not modify! + * if you need to make a change, please see the modify the groovy scripts in the + * under src/gram/script and then use maven openwire:generate to regenerate + * this file. + * + * @version $Revision: $ + */ +public class NetworkBridgeFilterTest extends DataFileGeneratorTestSupport { + + + public static NetworkBridgeFilterTest SINGLETON = new NetworkBridgeFilterTest(); + + public Object createObject() throws Exception { + NetworkBridgeFilter info = new NetworkBridgeFilter(); + populateObject(info); + return info; + } + + + protected void populateObject(Object object) throws Exception { + super.populateObject(object); + NetworkBridgeFilter info = (NetworkBridgeFilter) object; + info.setNetworkTTL(1); + info.setNetworkBrokerId(createBrokerId("NetworkBrokerId:1")); + + } + }