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 B9D409E84 for ; Thu, 26 Jan 2012 16:16:49 +0000 (UTC) Received: (qmail 74807 invoked by uid 500); 26 Jan 2012 16:16:49 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 74736 invoked by uid 500); 26 Jan 2012 16:16:49 -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 74714 invoked by uid 99); 26 Jan 2012 16:16:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jan 2012 16:16:49 +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:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9C7272388C27 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 [15/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.9C7272388C27@eris.apache.org> Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/DestinationInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/DestinationInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/DestinationInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/DestinationInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 DestinationInfoMarshaller extends BaseCommandMarshaller { @@ -66,8 +62,8 @@ public class DestinationInfoMarshaller e super.tightUnmarshal(wireFormat, o, dataIn, bs); DestinationInfo info = (DestinationInfo)o; - info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setOperationType(dataIn.readByte()); info.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs)); @@ -96,7 +92,7 @@ public class DestinationInfoMarshaller e int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs); - rc+=tightMarshalLong1(wireFormat, info.getTimeout(), bs); + rc += tightMarshalLong1(wireFormat, info.getTimeout(), bs); rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs); return rc + 1; @@ -132,8 +128,8 @@ public class DestinationInfoMarshaller e super.looseUnmarshal(wireFormat, o, dataIn); DestinationInfo info = (DestinationInfo)o; - info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setOperationType(dataIn.readByte()); info.setTimeout(looseUnmarshalLong(wireFormat, dataIn)); @@ -141,7 +137,7 @@ public class DestinationInfoMarshaller e 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); + value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/DiscoveryEventMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/DiscoveryEventMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/DiscoveryEventMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/DiscoveryEventMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 DiscoveryEventMarshaller extends BaseDataStreamMarshaller { Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ExceptionResponseMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ExceptionResponseMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ExceptionResponseMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ExceptionResponseMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 ExceptionResponseMarshaller extends ResponseMarshaller { @@ -66,7 +62,7 @@ public class ExceptionResponseMarshaller super.tightUnmarshal(wireFormat, o, dataIn, bs); ExceptionResponse info = (ExceptionResponse)o; - info.setException((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); + info.setException((java.lang.Throwable)tightUnmarsalThrowable(wireFormat, dataIn, bs)); } @@ -110,7 +106,7 @@ public class ExceptionResponseMarshaller super.looseUnmarshal(wireFormat, o, dataIn); ExceptionResponse info = (ExceptionResponse)o; - info.setException((java.lang.Throwable) looseUnmarsalThrowable(wireFormat, dataIn)); + info.setException((java.lang.Throwable)looseUnmarsalThrowable(wireFormat, dataIn)); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/FlushCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/FlushCommandMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/FlushCommandMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/FlushCommandMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 FlushCommandMarshaller extends BaseCommandMarshaller { Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/IntegerResponseMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/IntegerResponseMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/IntegerResponseMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/IntegerResponseMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 IntegerResponseMarshaller extends ResponseMarshaller { Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalQueueAckMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalQueueAckMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalQueueAckMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalQueueAckMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 JournalQueueAckMarshaller extends BaseDataStreamMarshaller { @@ -66,8 +62,8 @@ public class JournalQueueAckMarshaller e super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalQueueAck info = (JournalQueueAck)o; - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setMessageAck((org.apache.activemq.apollo.openwire.command.MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageAck((org.apache.activemq.apollo.openwire.command.MessageAck)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } @@ -113,8 +109,8 @@ public class JournalQueueAckMarshaller e super.looseUnmarshal(wireFormat, o, dataIn); JournalQueueAck info = (JournalQueueAck)o; - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn)); - info.setMessageAck((org.apache.activemq.apollo.openwire.command.MessageAck) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setMessageAck((org.apache.activemq.apollo.openwire.command.MessageAck)looseUnmarsalNestedObject(wireFormat, dataIn)); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTopicAckMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTopicAckMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTopicAckMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTopicAckMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 JournalTopicAckMarshaller extends BaseDataStreamMarshaller { @@ -66,12 +62,12 @@ public class JournalTopicAckMarshaller e super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTopicAck info = (JournalTopicAck)o; - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setMessageSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setSubscritionName(tightUnmarshalString(dataIn, bs)); info.setClientId(tightUnmarshalString(dataIn, bs)); - info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } @@ -86,7 +82,7 @@ public class JournalTopicAckMarshaller e 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 += tightMarshalLong1(wireFormat, info.getMessageSequenceId(), bs); rc += tightMarshalString1(info.getSubscritionName(), bs); rc += tightMarshalString1(info.getClientId(), bs); rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs); @@ -125,12 +121,12 @@ public class JournalTopicAckMarshaller e super.looseUnmarshal(wireFormat, o, dataIn); JournalTopicAck info = (JournalTopicAck)o; - info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn)); - info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn)); info.setMessageSequenceId(looseUnmarshalLong(wireFormat, dataIn)); info.setSubscritionName(looseUnmarshalString(dataIn)); info.setClientId(looseUnmarshalString(dataIn)); - info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)looseUnmarsalNestedObject(wireFormat, dataIn)); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTraceMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTraceMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTraceMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTraceMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 JournalTraceMarshaller extends BaseDataStreamMarshaller { Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTransactionMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTransactionMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTransactionMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/JournalTransactionMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 JournalTransactionMarshaller extends BaseDataStreamMarshaller { @@ -66,7 +62,7 @@ public class JournalTransactionMarshalle super.tightUnmarshal(wireFormat, o, dataIn, bs); JournalTransaction info = (JournalTransaction)o; - info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setType(dataIn.readByte()); info.setWasPrepared(bs.readBoolean()); @@ -115,7 +111,7 @@ public class JournalTransactionMarshalle super.looseUnmarshal(wireFormat, o, dataIn); JournalTransaction info = (JournalTransaction)o; - info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)looseUnmarsalNestedObject(wireFormat, dataIn)); info.setType(dataIn.readByte()); info.setWasPrepared(dataIn.readBoolean()); Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/KeepAliveInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/KeepAliveInfoMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/KeepAliveInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/KeepAliveInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 KeepAliveInfoMarshaller extends BaseCommandMarshaller { Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/LastPartialCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/LastPartialCommandMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/LastPartialCommandMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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/v7/LocalTransactionIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/LocalTransactionIdMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/LocalTransactionIdMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 LocalTransactionIdMarshaller extends TransactionIdMarshaller { @@ -67,7 +63,7 @@ public class LocalTransactionIdMarshalle LocalTransactionId info = (LocalTransactionId)o; info.setValue(tightUnmarshalLong(wireFormat, dataIn, bs)); - 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)); } @@ -80,7 +76,7 @@ public class LocalTransactionIdMarshalle LocalTransactionId info = (LocalTransactionId)o; int rc = super.tightMarshal1(wireFormat, o, bs); - rc+=tightMarshalLong1(wireFormat, info.getValue(), bs); + rc += tightMarshalLong1(wireFormat, info.getValue(), bs); rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs); return rc + 0; @@ -114,7 +110,7 @@ public class LocalTransactionIdMarshalle LocalTransactionId info = (LocalTransactionId)o; info.setValue(looseUnmarshalLong(wireFormat, dataIn)); - info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.apollo.openwire.command.ConnectionId)looseUnmarsalCachedObject(wireFormat, dataIn)); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MarshallerFactory.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/MarshallerFactory.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MarshallerFactory.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -26,9 +25,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. * * */ Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageAckMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/MessageAckMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageAckMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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,14 +62,14 @@ 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()); - info.setPoisonCause((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs)); + info.setPoisonCause((java.lang.Throwable)tightUnmarsalThrowable(wireFormat, dataIn, bs)); } @@ -129,14 +125,14 @@ 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()); - info.setPoisonCause((java.lang.Throwable) looseUnmarsalThrowable(wireFormat, dataIn)); + info.setPoisonCause((java.lang.Throwable)looseUnmarsalThrowable(wireFormat, dataIn)); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageDispatchMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/MessageDispatchMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageDispatchMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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()); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageDispatchNotificationMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/MessageDispatchNotificationMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageDispatchNotificationMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 MessageDispatchNotificationMarshaller extends BaseCommandMarshaller { @@ -66,10 +62,10 @@ public class MessageDispatchNotification super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageDispatchNotification info = (MessageDispatchNotification)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.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.setDeliverySequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); - info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } @@ -84,7 +80,7 @@ public class MessageDispatchNotification 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 += tightMarshalLong1(wireFormat, info.getDeliverySequenceId(), bs); rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); return rc + 0; @@ -119,10 +115,10 @@ public class MessageDispatchNotification super.looseUnmarshal(wireFormat, o, dataIn); MessageDispatchNotification info = (MessageDispatchNotification)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.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setDeliverySequenceId(looseUnmarshalLong(wireFormat, dataIn)); - info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn)); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/MessageIdMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageIdMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 MessageIdMarshaller extends BaseDataStreamMarshaller { @@ -66,7 +62,7 @@ public class MessageIdMarshaller extends 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)); @@ -82,8 +78,8 @@ public class MessageIdMarshaller extends 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 += tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs); + rc += tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs); return rc + 0; } @@ -116,7 +112,7 @@ 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)); Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/MessageMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessageMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 MessageMarshaller extends BaseCommandMarshaller { @@ -54,25 +50,25 @@ public abstract class MessageMarshaller 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)); - info.setOriginalDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); - info.setOriginalTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + 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)); + info.setOriginalDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setOriginalTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setGroupID(tightUnmarshalString(dataIn, bs)); info.setGroupSequence(dataIn.readInt()); info.setCorrelationId(tightUnmarshalString(dataIn, bs)); info.setPersistent(bs.readBoolean()); info.setExpiration(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setPriority(dataIn.readByte()); - info.setReplyTo((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + 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(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.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()); info.setRedeliveryCounter(dataIn.readInt()); @@ -130,9 +126,9 @@ public abstract class MessageMarshaller rc += tightMarshalString1(info.getGroupID(), bs); rc += tightMarshalString1(info.getCorrelationId(), bs); bs.writeBoolean(info.isPersistent()); - rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs); + rc += tightMarshalLong1(wireFormat, info.getExpiration(), bs); rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs); - rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs); + rc += tightMarshalLong1(wireFormat, info.getTimestamp(), bs); rc += tightMarshalString1(info.getType(), bs); rc += tightMarshalBuffer1(info.getContent(), bs); rc += tightMarshalBuffer1(info.getMarshalledProperties(), bs); @@ -140,13 +136,13 @@ public abstract class MessageMarshaller rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs); bs.writeBoolean(info.isCompressed()); rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs); - rc+=tightMarshalLong1(wireFormat, info.getArrival(), bs); + rc += tightMarshalLong1(wireFormat, info.getArrival(), bs); rc += tightMarshalString1(info.getUserID(), bs); bs.writeBoolean(info.isRecievedByDFBridge()); bs.writeBoolean(info.isDroppable()); rc += tightMarshalObjectArray1(wireFormat, info.getCluster(), bs); - rc+=tightMarshalLong1(wireFormat, info.getBrokerInTime(), bs); - rc+=tightMarshalLong1(wireFormat, info.getBrokerOutTime(), bs); + rc += tightMarshalLong1(wireFormat, info.getBrokerInTime(), bs); + rc += tightMarshalLong1(wireFormat, info.getBrokerOutTime(), bs); return rc + 9; } @@ -210,25 +206,25 @@ public abstract class MessageMarshaller 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)); - info.setOriginalDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); - info.setOriginalTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn)); + 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)); + info.setOriginalDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setOriginalTransactionId((org.apache.activemq.apollo.openwire.command.TransactionId)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setGroupID(looseUnmarshalString(dataIn)); info.setGroupSequence(dataIn.readInt()); info.setCorrelationId(looseUnmarshalString(dataIn)); info.setPersistent(dataIn.readBoolean()); info.setExpiration(looseUnmarshalLong(wireFormat, dataIn)); info.setPriority(dataIn.readByte()); - info.setReplyTo((org.apache.activemq.apollo.openwire.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setReplyTo((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalNestedObject(wireFormat, dataIn)); info.setTimestamp(looseUnmarshalLong(wireFormat, dataIn)); info.setType(looseUnmarshalString(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.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()); info.setRedeliveryCounter(dataIn.readInt()); @@ -236,7 +232,7 @@ public abstract class MessageMarshaller 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); + value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); } @@ -252,7 +248,7 @@ public abstract class MessageMarshaller 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); + value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)looseUnmarsalNestedObject(wireFormat,dataIn); } info.setCluster(value); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessagePullMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessagePullMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessagePullMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/MessagePullMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 MessagePullMarshaller extends BaseCommandMarshaller { @@ -66,11 +62,11 @@ public class MessagePullMarshaller exten super.tightUnmarshal(wireFormat, o, dataIn, bs); MessagePull info = (MessagePull)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.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.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setCorrelationId(tightUnmarshalString(dataIn, bs)); - info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } @@ -85,7 +81,7 @@ public class MessagePullMarshaller exten 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.getTimeout(), bs); + rc += tightMarshalLong1(wireFormat, info.getTimeout(), bs); rc += tightMarshalString1(info.getCorrelationId(), bs); rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs); @@ -122,11 +118,11 @@ public class MessagePullMarshaller exten super.looseUnmarshal(wireFormat, o, dataIn); MessagePull info = (MessagePull)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.setConsumerId((org.apache.activemq.apollo.openwire.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); info.setTimeout(looseUnmarshalLong(wireFormat, dataIn)); info.setCorrelationId(looseUnmarshalString(dataIn)); - info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setMessageId((org.apache.activemq.apollo.openwire.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn)); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/NetworkBridgeFilterMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/NetworkBridgeFilterMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/NetworkBridgeFilterMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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/v7/PartialCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/PartialCommandMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/PartialCommandMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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/v7/ProducerAckMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ProducerAckMarshaller.java?rev=1236269&r1=1236268&r2=1236269&view=diff ============================================================================== --- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ProducerAckMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ProducerAckMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 ProducerAckMarshaller extends BaseCommandMarshaller { @@ -66,7 +62,7 @@ public class ProducerAckMarshaller exten super.tightUnmarshal(wireFormat, o, dataIn, bs); ProducerAck info = (ProducerAck)o; - info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setSize(dataIn.readInt()); } @@ -112,7 +108,7 @@ public class ProducerAckMarshaller exten super.looseUnmarshal(wireFormat, o, dataIn); ProducerAck info = (ProducerAck)o; - info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId) looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId)looseUnmarsalNestedObject(wireFormat, dataIn)); info.setSize(dataIn.readInt()); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ProducerIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/ProducerIdMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ProducerIdMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 ProducerIdMarshaller extends BaseDataStreamMarshaller { @@ -82,8 +78,8 @@ public class ProducerIdMarshaller extend 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 += tightMarshalLong1(wireFormat, info.getValue(), bs); + rc += tightMarshalLong1(wireFormat, info.getSessionId(), bs); return rc + 0; } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ProducerInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/ProducerInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/ProducerInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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 ProducerInfoMarshaller extends BaseCommandMarshaller { @@ -66,8 +62,8 @@ public class ProducerInfoMarshaller exte super.tightUnmarshal(wireFormat, o, dataIn, bs); ProducerInfo info = (ProducerInfo)o; - 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.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)); if (bs.readBoolean()) { short size = dataIn.readShort(); @@ -132,14 +128,14 @@ public class ProducerInfoMarshaller exte super.looseUnmarshal(wireFormat, o, dataIn); ProducerInfo info = (ProducerInfo)o; - 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.setProducerId((org.apache.activemq.apollo.openwire.command.ProducerId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.apollo.openwire.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); 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); + value[i] = (org.apache.activemq.apollo.openwire.command.BrokerId)looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/RemoveInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/RemoveInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/RemoveInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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)); info.setLastDeliveredSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); } @@ -81,7 +77,7 @@ public class RemoveInfoMarshaller extend int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getObjectId(), bs); - rc+=tightMarshalLong1(wireFormat, info.getLastDeliveredSequenceId(), bs); + rc += tightMarshalLong1(wireFormat, info.getLastDeliveredSequenceId(), bs); return rc + 0; } @@ -113,7 +109,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)); info.setLastDeliveredSequenceId(looseUnmarshalLong(wireFormat, dataIn)); } Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/RemoveSubscriptionInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/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/v7/RemoveSubscriptionInfoMarshaller.java (original) +++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/codec/v7/RemoveSubscriptionInfoMarshaller.java Thu Jan 26 16:15:05 2012 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -32,11 +31,8 @@ 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));