Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 32961 invoked from network); 28 May 2008 21:26:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 May 2008 21:26:39 -0000 Received: (qmail 64194 invoked by uid 500); 28 May 2008 21:26:41 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 64137 invoked by uid 500); 28 May 2008 21:26:40 -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 64128 invoked by uid 99); 28 May 2008 21:26:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2008 14:26:40 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 28 May 2008 21:25:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EAA462388A15; Wed, 28 May 2008 14:26:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r661094 [1/2] - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/openwire/v3/ test/java/org/apache/activemq/broker/ test/java/org/apache/activemq/network/ test/java/org/apache/activemq/transport/ test/java/org/apache/acti... Date: Wed, 28 May 2008 21:26:13 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080528212615.EAA462388A15@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Wed May 28 14:26:11 2008 New Revision: 661094 URL: http://svn.apache.org/viewvc?rev=661094&view=rev Log: Made the discovery based tests use dynacmic groups so that if multiple builds of ActiveMQ are being run in the same network, they don't conflict with each other. Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQBlobMessage; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQBytesMessage; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,9 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQDestination; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQMessage; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQObjectMessage; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQQueue; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQStreamMessage; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQTempQueue; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQTempTopic; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQTextMessage; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ActiveMQTopic; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,9 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.BaseCommand; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.BrokerId; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,32 +22,32 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.BrokerInfo; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; + + /** * Marshalling code for Open Wire Format for BrokerInfoMarshaller - * - * - * NOTE!: This file is auto generated - do not modify! if you need to make a - * change, please see the modify the groovy scripts in the under src/gram/script - * and then use maven openwire:generate to regenerate this file. - * + * + * + * NOTE!: This file is auto generated - do not modify! + * 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 BrokerInfoMarshaller extends BaseCommandMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return BrokerInfo.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -56,29 +57,27 @@ /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) - throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); BrokerInfo info = (BrokerInfo)o; - info.setBrokerId((org.apache.activemq.command.BrokerId)tightUnmarsalCachedObject(wireFormat, dataIn, - bs)); + info.setBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setBrokerURL(tightUnmarshalString(dataIn, bs)); if (bs.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.command.BrokerInfo)tightUnmarsalNestedObject(wireFormat, - dataIn, bs); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.command.BrokerInfo) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setPeerBrokerInfos(value); - } else { + } + else { info.setPeerBrokerInfos(null); } info.setBrokerName(tightUnmarshalString(dataIn, bs)); @@ -93,6 +92,7 @@ } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -110,7 +110,7 @@ bs.writeBoolean(info.isFaultTolerantConfiguration()); bs.writeBoolean(info.isDuplexConnection()); bs.writeBoolean(info.isNetworkConnection()); - rc += tightMarshalLong1(wireFormat, info.getConnectionId(), bs); + rc+=tightMarshalLong1(wireFormat, info.getConnectionId(), bs); rc += tightMarshalString1(info.getBrokerUploadUrl(), bs); rc += tightMarshalString1(info.getNetworkProperties(), bs); @@ -119,13 +119,12 @@ /** * Write a object instance to data output stream - * + * * @param o the instance to be marshaled * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) - throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); BrokerInfo info = (BrokerInfo)o; @@ -146,7 +145,7 @@ /** * 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 @@ -155,18 +154,18 @@ super.looseUnmarshal(wireFormat, o, dataIn); BrokerInfo info = (BrokerInfo)o; - info.setBrokerId((org.apache.activemq.command.BrokerId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setBrokerURL(looseUnmarshalString(dataIn)); if (dataIn.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.command.BrokerInfo)looseUnmarsalNestedObject(wireFormat, - dataIn); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.command.BrokerInfo) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setPeerBrokerInfos(value); - } else { + } + else { info.setPeerBrokerInfos(null); } info.setBrokerName(looseUnmarshalString(dataIn)); @@ -181,6 +180,7 @@ } + /** * Write the booleans that this object uses to a BooleanStream */ Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ConnectionError; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ConnectionId; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,32 +22,32 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ConnectionInfo; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; + + /** * Marshalling code for Open Wire Format for ConnectionInfoMarshaller - * - * - * NOTE!: This file is auto generated - do not modify! if you need to make a - * change, please see the modify the groovy scripts in the under src/gram/script - * and then use maven openwire:generate to regenerate this file. - * + * + * + * NOTE!: This file is auto generated - do not modify! + * 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 ConnectionInfoMarshaller extends BaseCommandMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return ConnectionInfo.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -56,18 +57,16 @@ /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) - throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConnectionInfo info = (ConnectionInfo)o; - info.setConnectionId((org.apache.activemq.command.ConnectionId)tightUnmarsalCachedObject(wireFormat, - dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setClientId(tightUnmarshalString(dataIn, bs)); info.setPassword(tightUnmarshalString(dataIn, bs)); info.setUserName(tightUnmarshalString(dataIn, bs)); @@ -75,12 +74,12 @@ if (bs.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.command.BrokerId)tightUnmarsalNestedObject(wireFormat, - dataIn, bs); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); - } else { + } + else { info.setBrokerPath(null); } info.setBrokerMasterConnector(bs.readBoolean()); @@ -89,6 +88,7 @@ } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -111,13 +111,12 @@ /** * Write a object instance to data output stream - * + * * @param o the instance to be marshaled * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) - throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConnectionInfo info = (ConnectionInfo)o; @@ -134,7 +133,7 @@ /** * 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 @@ -143,8 +142,7 @@ super.looseUnmarshal(wireFormat, o, dataIn); ConnectionInfo info = (ConnectionInfo)o; - info.setConnectionId((org.apache.activemq.command.ConnectionId)looseUnmarsalCachedObject(wireFormat, - dataIn)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setClientId(looseUnmarshalString(dataIn)); info.setPassword(looseUnmarshalString(dataIn)); info.setUserName(looseUnmarshalString(dataIn)); @@ -152,11 +150,12 @@ if (dataIn.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.command.BrokerId)looseUnmarsalNestedObject(wireFormat, dataIn); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); - } else { + } + else { info.setBrokerPath(null); } info.setBrokerMasterConnector(dataIn.readBoolean()); @@ -165,6 +164,7 @@ } + /** * Write the booleans that this object uses to a BooleanStream */ Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,32 +22,32 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ConsumerId; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; + + /** * Marshalling code for Open Wire Format for ConsumerIdMarshaller - * - * - * NOTE!: This file is auto generated - do not modify! if you need to make a - * change, please see the modify the groovy scripts in the under src/gram/script - * and then use maven openwire:generate to regenerate this file. - * + * + * + * NOTE!: This file is auto generated - do not modify! + * 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 ConsumerIdMarshaller extends BaseDataStreamMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return ConsumerId.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -56,13 +57,12 @@ /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) - throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConsumerId info = (ConsumerId)o; @@ -72,6 +72,7 @@ } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -81,21 +82,20 @@ int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalString1(info.getConnectionId(), bs); - rc += tightMarshalLong1(wireFormat, info.getSessionId(), bs); - rc += tightMarshalLong1(wireFormat, info.getValue(), bs); + rc+=tightMarshalLong1(wireFormat, info.getSessionId(), bs); + rc+=tightMarshalLong1(wireFormat, info.getValue(), bs); return rc + 0; } /** * Write a object instance to data output stream - * + * * @param o the instance to be marshaled * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) - throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConsumerId info = (ConsumerId)o; @@ -107,7 +107,7 @@ /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -122,6 +122,7 @@ } + /** * Write the booleans that this object uses to a BooleanStream */ Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,32 +22,32 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ConsumerInfo; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; + + /** * Marshalling code for Open Wire Format for ConsumerInfoMarshaller - * - * - * NOTE!: This file is auto generated - do not modify! if you need to make a - * change, please see the modify the groovy scripts in the under src/gram/script - * and then use maven openwire:generate to regenerate this file. - * + * + * + * NOTE!: This file is auto generated - do not modify! + * 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 ConsumerInfoMarshaller extends BaseCommandMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return ConsumerInfo.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -56,24 +57,18 @@ /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) - throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); ConsumerInfo info = (ConsumerInfo)o; - info.setConsumerId((org.apache.activemq.command.ConsumerId)tightUnmarsalCachedObject(wireFormat, - dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setBrowser(bs.readBoolean()); - info - .setDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalCachedObject( - wireFormat, - dataIn, - bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setPrefetchSize(dataIn.readInt()); info.setMaximumPendingMessageLimit(dataIn.readInt()); info.setDispatchAsync(bs.readBoolean()); @@ -87,25 +82,22 @@ if (bs.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.command.BrokerId)tightUnmarsalNestedObject(wireFormat, - dataIn, bs); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setBrokerPath(value); - } else { + } + else { info.setBrokerPath(null); } - info - .setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression)tightUnmarsalNestedObject( - wireFormat, - dataIn, - bs)); + info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); info.setNetworkSubscription(bs.readBoolean()); info.setOptimizedAcknowledge(bs.readBoolean()); info.setNoRangeAcks(bs.readBoolean()); } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -134,13 +126,12 @@ /** * Write a object instance to data output stream - * + * * @param o the instance to be marshaled * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) - throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); ConsumerInfo info = (ConsumerInfo)o; @@ -166,7 +157,7 @@ /** * 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 @@ -175,13 +166,9 @@ super.looseUnmarshal(wireFormat, o, dataIn); ConsumerInfo info = (ConsumerInfo)o; - info.setConsumerId((org.apache.activemq.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, - dataIn)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setBrowser(dataIn.readBoolean()); - info - .setDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalCachedObject( - wireFormat, - dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setPrefetchSize(dataIn.readInt()); info.setMaximumPendingMessageLimit(dataIn.readInt()); info.setDispatchAsync(dataIn.readBoolean()); @@ -195,23 +182,22 @@ if (dataIn.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.command.BrokerId)looseUnmarsalNestedObject(wireFormat, dataIn); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setBrokerPath(value); - } else { + } + else { info.setBrokerPath(null); } - info - .setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression)looseUnmarsalNestedObject( - wireFormat, - dataIn)); + info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) looseUnmarsalNestedObject(wireFormat, dataIn)); info.setNetworkSubscription(dataIn.readBoolean()); info.setOptimizedAcknowledge(dataIn.readBoolean()); info.setNoRangeAcks(dataIn.readBoolean()); } + /** * Write the booleans that this object uses to a BooleanStream */ Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.ControlCommand; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,32 +22,32 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataArrayResponse; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; + + /** * Marshalling code for Open Wire Format for DataArrayResponseMarshaller - * - * - * NOTE!: This file is auto generated - do not modify! if you need to make a - * change, please see the modify the groovy scripts in the under src/gram/script - * and then use maven openwire:generate to regenerate this file. - * + * + * + * NOTE!: This file is auto generated - do not modify! + * 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 DataArrayResponseMarshaller extends ResponseMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return DataArrayResponse.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -56,13 +57,12 @@ /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) - throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); DataArrayResponse info = (DataArrayResponse)o; @@ -70,17 +70,18 @@ if (bs.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.command.DataStructure)tightUnmarsalNestedObject(wireFormat, - dataIn, bs); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs); } info.setData(value); - } else { + } + else { info.setData(null); } } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -96,13 +97,12 @@ /** * Write a object instance to data output stream - * + * * @param o the instance to be marshaled * @param dataOut the output stream * @throws IOException thrown if an error occurs */ - public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) - throws IOException { + public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException { super.tightMarshal2(wireFormat, o, dataOut, bs); DataArrayResponse info = (DataArrayResponse)o; @@ -112,7 +112,7 @@ /** * 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 @@ -125,17 +125,18 @@ if (dataIn.readBoolean()) { short size = dataIn.readShort(); org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size]; - for (int i = 0; i < size; i++) { - value[i] = (org.apache.activemq.command.DataStructure)looseUnmarsalNestedObject(wireFormat, - dataIn); + for( int i=0; i < size; i++ ) { + value[i] = (org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat,dataIn); } info.setData(value); - } else { + } + else { info.setData(null); } } + /** * Write the booleans that this object uses to a BooleanStream */ Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataResponse; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.DiscoveryEvent; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.ExceptionResponse; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.FlushCommand; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.IntegerResponse; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.JournalQueueAck; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.JournalTrace; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.JournalTransaction; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.KeepAliveInfo; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,10 +22,8 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.LastPartialCommand; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java Wed May 28 14:26:11 2008 @@ -1,4 +1,5 @@ /** + * * 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. @@ -6,7 +7,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, @@ -21,30 +22,32 @@ import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.LocalTransactionId; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; + + /** - * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller NOTE!: - * This file is auto generated - do not modify! if you need to make a change, - * please see the modify the groovy scripts in the under src/gram/script and - * then use maven openwire:generate to regenerate this file. - * + * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller + * + * + * NOTE!: This file is auto generated - do not modify! + * 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 LocalTransactionIdMarshaller extends TransactionIdMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return LocalTransactionId.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -54,7 +57,7 @@ /** * 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 @@ -64,10 +67,11 @@ LocalTransactionId info = (LocalTransactionId)o; info.setValue(tightUnmarshalLong(wireFormat, dataIn, bs)); - info.setConnectionId((org.apache.activemq.command.ConnectionId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -76,7 +80,7 @@ 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; @@ -84,7 +88,7 @@ /** * 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 @@ -100,7 +104,7 @@ /** * 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 @@ -110,10 +114,11 @@ LocalTransactionId info = (LocalTransactionId)o; info.setValue(looseUnmarshalLong(wireFormat, dataIn)); - info.setConnectionId((org.apache.activemq.command.ConnectionId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn)); } + /** * Write the booleans that this object uses to a BooleanStream */