From a2033b38177d86af077b97579f3fb869088a8bd3 Mon Sep 17 00:00:00 2001 From: "Hiram R. Chirino" Date: Wed, 28 May 2008 21:26:11 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@661094 13f79535-47bb-0310-9956-ffa450edef68 --- .../v3/ActiveMQBlobMessageMarshaller.java | 9 +- .../v3/ActiveMQBytesMessageMarshaller.java | 9 +- .../v3/ActiveMQDestinationMarshaller.java | 8 +- .../v3/ActiveMQMessageMarshaller.java | 9 +- .../v3/ActiveMQObjectMessageMarshaller.java | 9 +- .../openwire/v3/ActiveMQQueueMarshaller.java | 9 +- .../v3/ActiveMQStreamMessageMarshaller.java | 9 +- .../v3/ActiveMQTempQueueMarshaller.java | 9 +- .../v3/ActiveMQTempTopicMarshaller.java | 9 +- .../v3/ActiveMQTextMessageMarshaller.java | 9 +- .../openwire/v3/ActiveMQTopicMarshaller.java | 9 +- .../openwire/v3/BaseCommandMarshaller.java | 8 +- .../openwire/v3/BrokerIdMarshaller.java | 9 +- .../openwire/v3/BrokerInfoMarshaller.java | 64 +++++++------- .../v3/ConnectionErrorMarshaller.java | 9 +- .../openwire/v3/ConnectionIdMarshaller.java | 9 +- .../openwire/v3/ConnectionInfoMarshaller.java | 62 +++++++------- .../openwire/v3/ConsumerIdMarshaller.java | 45 +++++----- .../openwire/v3/ConsumerInfoMarshaller.java | 84 ++++++++----------- .../openwire/v3/ControlCommandMarshaller.java | 9 +- .../v3/DataArrayResponseMarshaller.java | 57 ++++++------- .../openwire/v3/DataResponseMarshaller.java | 9 +- .../openwire/v3/DiscoveryEventMarshaller.java | 9 +- .../v3/ExceptionResponseMarshaller.java | 9 +- .../openwire/v3/FlushCommandMarshaller.java | 9 +- .../v3/IntegerResponseMarshaller.java | 9 +- .../v3/JournalQueueAckMarshaller.java | 9 +- .../openwire/v3/JournalTraceMarshaller.java | 9 +- .../v3/JournalTransactionMarshaller.java | 9 +- .../openwire/v3/KeepAliveInfoMarshaller.java | 9 +- .../v3/LastPartialCommandMarshaller.java | 9 +- .../v3/LocalTransactionIdMarshaller.java | 41 +++++---- .../openwire/v3/MessageAckMarshaller.java | 9 +- ...MessageDispatchNotificationMarshaller.java | 50 ++++++----- .../openwire/v3/MessageIdMarshaller.java | 43 +++++----- .../openwire/v3/MessagePullMarshaller.java | 66 +++++++-------- .../v3/NetworkBridgeFilterMarshaller.java | 9 +- .../openwire/v3/PartialCommandMarshaller.java | 9 +- .../openwire/v3/ProducerAckMarshaller.java | 9 +- .../openwire/v3/ProducerIdMarshaller.java | 39 +++++---- .../openwire/v3/ProducerInfoMarshaller.java | 73 ++++++++-------- .../v3/RemoveSubscriptionInfoMarshaller.java | 9 +- .../openwire/v3/ReplayCommandMarshaller.java | 9 +- .../openwire/v3/ResponseMarshaller.java | 9 +- .../openwire/v3/SessionIdMarshaller.java | 43 +++++----- .../openwire/v3/SessionInfoMarshaller.java | 9 +- .../openwire/v3/ShutdownInfoMarshaller.java | 9 +- .../v3/SubscriptionInfoMarshaller.java | 9 +- .../openwire/v3/TransactionIdMarshaller.java | 7 +- .../v3/TransactionInfoMarshaller.java | 9 +- .../openwire/v3/WireFormatInfoMarshaller.java | 9 +- .../v3/XATransactionIdMarshaller.java | 9 +- .../activemq/broker/BrokerServiceTest.java | 4 +- .../activemq/network/NetworkLoadTest.java | 6 +- .../activemq/transport/TopicClusterTest.java | 5 +- .../DiscoveryTransportBrokerTest.java | 7 +- .../usecases/TwoBrokerMulticastQueueTest.java | 28 ++++--- ...stDiscoveryBrokerTopicSendReceiveTest.java | 1 + .../activemq/usecases/multicast-broker-1.xml | 6 +- .../activemq/usecases/multicast-broker-2.xml | 6 +- .../usecases/multicast-broker-auto.xml | 6 +- .../activemq/usecases/receiver-discovery.xml | 5 +- .../activemq/usecases/sender-discovery.xml | 6 +- 63 files changed, 539 insertions(+), 564 deletions(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java index 41b0c40ad6..9d009585de 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBlobMessageMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java index 79ee9670e5..2e9dea60c5 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQBytesMessageMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java index 4316c0f7c4..ca4d798892 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQDestinationMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java index 8f6ed6a9ef..d86e91a2dd 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQMessageMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java index ee685852c4..f669ac0bde 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQObjectMessageMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java index 9ee70dfd17..4fde4e1aa0 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQQueueMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java index 5090e55501..6ed283f920 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQStreamMessageMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java index 93b39e3bcd..87be623bb6 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempQueueMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java index d159f6aa0f..0a5d175796 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTempTopicMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java index cec94ba66b..da0f0194ef 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTextMessageMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java index 61694a1704..580a82cfab 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ActiveMQTopicMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java index 00b14e13bc..20cd0f6c9e 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BaseCommandMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java index 224513ab3b..64837f689d 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerIdMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java index a48055e15a..45763ecb38 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/BrokerInfoMarshaller.java @@ -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.DataInput; 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 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - 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 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -110,7 +110,7 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { 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 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { /** * 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 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -155,18 +154,18 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { 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 @@ public class BrokerInfoMarshaller extends BaseCommandMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java index 085fd55d31..b5c6be841f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionErrorMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java index 3dcc8a7024..dc4b9c3421 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionIdMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java index 21269e85ca..2beb7bbe34 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConnectionInfoMarshaller.java @@ -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.DataInput; 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 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - 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 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { 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 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -111,13 +111,12 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { /** * 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 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -143,8 +142,7 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { 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 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { 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 @@ public class ConnectionInfoMarshaller extends BaseCommandMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java index 4e3989ff12..5c56075aff 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerIdMarshaller.java @@ -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.DataInput; 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 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - 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 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -81,21 +82,20 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { 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 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -122,6 +122,7 @@ public class ConsumerIdMarshaller extends BaseDataStreamMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java index 92a6f3d886..75260ae865 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ConsumerInfoMarshaller.java @@ -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.DataInput; 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 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - 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 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { 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 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { /** * 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 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -175,13 +166,9 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { 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 @@ public class ConsumerInfoMarshaller extends BaseCommandMarshaller { 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 */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java index 77bf4af216..4488a8229d 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ControlCommandMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java index 2f901ff7a4..95b713d98f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataArrayResponseMarshaller.java @@ -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.DataInput; 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 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { /** * 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 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { 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 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { /** * 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 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { /** * 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 @@ public class DataArrayResponseMarshaller extends ResponseMarshaller { 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 */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java index c11f6535ef..6190969bbd 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DataResponseMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java index 63557b370f..fa7b3f6e1a 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/DiscoveryEventMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java index cbd7a5d89f..472e681ba7 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ExceptionResponseMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java index 40586a8e1a..ae555c26bb 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/FlushCommandMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java index ae930e2f47..2f36a4d3f8 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/IntegerResponseMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java index 1f0068fd42..b87ed44f16 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalQueueAckMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java index a0f75a5d59..1ea88263ac 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTraceMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java index c6ae15aa9f..27ca047455 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/JournalTransactionMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java index 980a6dda48..aedbf89043 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/KeepAliveInfoMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java index b7b202fbd9..18f21a778d 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LastPartialCommandMarshaller.java @@ -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.DataInput; 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.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java index ab58340b9d..2996a4a703 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/LocalTransactionIdMarshaller.java @@ -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.DataInput; 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 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { /** * 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 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { 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 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { 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 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { /** * 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 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { /** * 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 @@ public class LocalTransactionIdMarshaller extends TransactionIdMarshaller { 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 */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java index db4c9d69b5..acde8d7212 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.MessageAck; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java index 78dd49fe8b..3a40a3c93e 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java @@ -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,31 +22,32 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.MessageDispatchNotification; -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 - * MessageDispatchNotificationMarshaller NOTE!: This file is auto generated - do - * not modify! if you need to make a change, please see the modify the groovy - * scripts in the under src/gram/script and then use maven openwire:generate to - * regenerate this file. - * + * Marshalling code for Open Wire Format for MessageDispatchNotificationMarshaller + * + * + * NOTE!: This file is auto generated - do not modify! + * 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 MessageDispatchNotificationMarshaller extends BaseCommandMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return MessageDispatchNotification.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -55,7 +57,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -64,13 +66,14 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageDispatchNotification info = (MessageDispatchNotification)o; - info.setConsumerId((org.apache.activemq.command.ConsumerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); - info.setDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setDeliverySequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); - info.setMessageId((org.apache.activemq.command.MessageId)tightUnmarsalNestedObject(wireFormat, dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -81,7 +84,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller 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; @@ -89,7 +92,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller /** * 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 @@ -107,7 +110,7 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -116,13 +119,14 @@ public class MessageDispatchNotificationMarshaller extends BaseCommandMarshaller super.looseUnmarshal(wireFormat, o, dataIn); MessageDispatchNotification info = (MessageDispatchNotification)o; - info.setConsumerId((org.apache.activemq.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, dataIn)); - info.setDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setDeliverySequenceId(looseUnmarshalLong(wireFormat, dataIn)); - info.setMessageId((org.apache.activemq.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); } + /** * Write the booleans that this object uses to a BooleanStream */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java index 99ea8c12de..1065970b96 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.MessageId; -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 MessageIdMarshaller NOTE!: This - * file is auto generated - do not modify! if you need to make a change, please - * see the modify the groovy scripts in the under src/gram/script and then use - * maven openwire:generate to regenerate this file. - * + * Marshalling code for Open Wire Format for MessageIdMarshaller + * + * + * NOTE!: This file is auto generated - do not modify! + * if you need to make a change, please see the modify the groovy scripts in the + * under src/gram/script and then use maven openwire:generate to regenerate + * this file. + * * @version $Revision$ */ public class MessageIdMarshaller extends BaseDataStreamMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return MessageId.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -54,7 +57,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -63,12 +66,13 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { super.tightUnmarshal(wireFormat, o, dataIn, bs); MessageId info = (MessageId)o; - info.setProducerId((org.apache.activemq.command.ProducerId)tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setProducerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setBrokerSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs)); } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -78,15 +82,15 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { 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; } /** * 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 @@ -103,7 +107,7 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -112,12 +116,13 @@ public class MessageIdMarshaller extends BaseDataStreamMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); MessageId info = (MessageId)o; - info.setProducerId((org.apache.activemq.command.ProducerId)looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn)); info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn)); } + /** * Write the booleans that this object uses to a BooleanStream */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java index 7be7d45a03..aacd2314b2 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.MessagePull; -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 MessagePullMarshaller - * - * - * 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 MessagePullMarshaller extends BaseCommandMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return MessagePull.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -56,30 +57,24 @@ public class MessagePullMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - 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); MessagePull info = (MessagePull)o; - info.setConsumerId((org.apache.activemq.command.ConsumerId)tightUnmarsalCachedObject(wireFormat, - dataIn, bs)); - info - .setDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalCachedObject( - wireFormat, - dataIn, - bs)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); info.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs)); info.setCorrelationId(tightUnmarshalString(dataIn, bs)); - info.setMessageId((org.apache.activemq.command.MessageId)tightUnmarsalNestedObject(wireFormat, - dataIn, bs)); + info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs)); } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -90,7 +85,7 @@ public class MessagePullMarshaller extends BaseCommandMarshaller { 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); @@ -99,13 +94,12 @@ public class MessagePullMarshaller extends BaseCommandMarshaller { /** * 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); MessagePull info = (MessagePull)o; @@ -119,7 +113,7 @@ public class MessagePullMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -128,19 +122,15 @@ public class MessagePullMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); MessagePull info = (MessagePull)o; - info.setConsumerId((org.apache.activemq.command.ConsumerId)looseUnmarsalCachedObject(wireFormat, - dataIn)); - info - .setDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalCachedObject( - wireFormat, - dataIn)); + info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); info.setTimeout(looseUnmarshalLong(wireFormat, dataIn)); info.setCorrelationId(looseUnmarshalString(dataIn)); - info - .setMessageId((org.apache.activemq.command.MessageId)looseUnmarsalNestedObject(wireFormat, dataIn)); + info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn)); } + /** * Write the booleans that this object uses to a BooleanStream */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java index a646ecf73a..79017ea6e4 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.NetworkBridgeFilter; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java index 1a8f2d30bc..d3e09477f2 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.PartialCommand; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java index d81aaf0b25..01920fe2dd 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.ProducerAck; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java index 2a10812a4f..162ab32829 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.ProducerId; -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 ProducerIdMarshaller NOTE!: This - * file is auto generated - do not modify! if you need to make a change, please - * see the modify the groovy scripts in the under src/gram/script and then use - * maven openwire:generate to regenerate this file. - * + * Marshalling code for Open Wire Format for ProducerIdMarshaller + * + * + * NOTE!: This file is auto generated - do not modify! + * if you need to make a change, please see the modify the groovy scripts in the + * under src/gram/script and then use maven openwire:generate to regenerate + * this file. + * * @version $Revision$ */ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return ProducerId.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -54,7 +57,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -69,6 +72,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -78,15 +82,15 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { 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; } /** * 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 @@ -103,7 +107,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -118,6 +122,7 @@ public class ProducerIdMarshaller extends BaseDataStreamMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java index 1304315b02..6ffc54170f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.ProducerInfo; -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 ProducerInfoMarshaller - * - * - * NOTE!: This file is auto generated - do not modify! if you need to make a - * change, please see the modify the groovy scripts in the under src/gram/script - * and then use maven openwire:generate to regenerate this file. - * + * + * + * 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 ProducerInfoMarshaller extends BaseCommandMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return ProducerInfo.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -56,33 +57,27 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - 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); ProducerInfo info = (ProducerInfo)o; - info.setProducerId((org.apache.activemq.command.ProducerId)tightUnmarsalCachedObject(wireFormat, - dataIn, bs)); - info - .setDestination((org.apache.activemq.command.ActiveMQDestination)tightUnmarsalCachedObject( - wireFormat, - dataIn, - bs)); + info.setProducerId((org.apache.activemq.command.ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs)); 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.setDispatchAsync(bs.readBoolean()); @@ -90,6 +85,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -108,13 +104,12 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { /** * 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); ProducerInfo info = (ProducerInfo)o; @@ -128,7 +123,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -137,21 +132,18 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { super.looseUnmarshal(wireFormat, o, dataIn); ProducerInfo info = (ProducerInfo)o; - info.setProducerId((org.apache.activemq.command.ProducerId)looseUnmarsalCachedObject(wireFormat, - dataIn)); - info - .setDestination((org.apache.activemq.command.ActiveMQDestination)looseUnmarsalCachedObject( - wireFormat, - dataIn)); + info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn)); + info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn)); 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.setDispatchAsync(dataIn.readBoolean()); @@ -159,6 +151,7 @@ public class ProducerInfoMarshaller extends BaseCommandMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java index 3fdf356893..524f209aba 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.RemoveSubscriptionInfo; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java index 9adce220b7..b938e43f34 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.ReplayCommand; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java index e7ea8cbb3e..df6a84a540 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.Response; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java index ae3c042abf..06c18e6940 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.SessionId; -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 SessionIdMarshaller - * - * - * NOTE!: This file is auto generated - do not modify! if you need to make a - * change, please see the modify the groovy scripts in the under src/gram/script - * and then use maven openwire:generate to regenerate this file. - * + * + * + * NOTE!: This file is auto generated - do not modify! + * 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 SessionIdMarshaller extends BaseDataStreamMarshaller { /** * Return the type of Data Structure we marshal - * * @return short representation of the type data structure */ public byte getDataStructureType() { return SessionId.DATA_STRUCTURE_TYPE; } - + /** * @return a new object instance */ @@ -56,13 +57,12 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException */ - public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) - throws IOException { + public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInput dataIn, BooleanStream bs) throws IOException { super.tightUnmarshal(wireFormat, o, dataIn, bs); SessionId info = (SessionId)o; @@ -71,6 +71,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ @@ -80,20 +81,19 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { int rc = super.tightMarshal1(wireFormat, o, bs); rc += tightMarshalString1(info.getConnectionId(), bs); - rc += tightMarshalLong1(wireFormat, info.getValue(), 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); SessionId info = (SessionId)o; @@ -104,7 +104,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { /** * Un-marshal an object instance from the data input stream - * + * * @param o the object to un-marshal * @param dataIn the data input stream to build the object from * @throws IOException @@ -118,6 +118,7 @@ public class SessionIdMarshaller extends BaseDataStreamMarshaller { } + /** * Write the booleans that this object uses to a BooleanStream */ diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java index fd9ecd192c..d3ee30b3d8 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.SessionInfo; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java index cbd414bd8e..0ff6b4f568 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.ShutdownInfo; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java index 89e3df7b33..ab1ef4c57f 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.SubscriptionInfo; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java index d8ab76cac7..889e4967c8 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java @@ -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,8 +22,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java index 7acabe5930..6749ecc9b2 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.TransactionInfo; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java index d4fc1494dc..c6468c40bb 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.WireFormatInfo; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java index 1b5b65bcd9..325862efc0 100644 --- a/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java +++ b/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java @@ -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.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.activemq.command.DataStructure; -import org.apache.activemq.command.XATransactionId; -import org.apache.activemq.openwire.BooleanStream; -import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.openwire.*; +import org.apache.activemq.command.*; diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java index 18ebad18f0..f44727f2d7 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java @@ -54,7 +54,7 @@ public class BrokerServiceTest extends TestCase { BrokerService service = new BrokerService(); service.setPersistent(false); service.setUseJmx(true); - NetworkConnector connector = service.addNetworkConnector("multicast://default"); + NetworkConnector connector = service.addNetworkConnector("multicast://group-"+System.currentTimeMillis()); service.start(); service.removeNetworkConnector(connector); @@ -66,7 +66,7 @@ public class BrokerServiceTest extends TestCase { BrokerService service = new BrokerService(); service.setPersistent(false); service.setUseJmx(false); - NetworkConnector connector = service.addNetworkConnector("multicast://default"); + NetworkConnector connector = service.addNetworkConnector("multicast://group-"+System.currentTimeMillis()); service.start(); service.removeNetworkConnector(connector); diff --git a/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java b/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java index c0e83b99c2..7d8a465ce1 100644 --- a/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java @@ -200,11 +200,13 @@ public class NetworkLoadTest extends TestCase { TransportConnector transportConnector = new TransportConnector(); transportConnector.setUri(new URI("tcp://localhost:"+(60000+brokerId))); - transportConnector.setDiscoveryUri(new URI("multicast://network-load-test")); + + String groupId = "network-load-test-"+System.currentTimeMillis(); + transportConnector.setDiscoveryUri(new URI("multicast://"+groupId)); broker.addConnector(transportConnector); DiscoveryNetworkConnector networkConnector = new DiscoveryNetworkConnector(); - networkConnector.setUri(new URI("multicast://network-load-test")); + networkConnector.setUri(new URI("multicast://"+groupId)); networkConnector.setBridgeTempDestinations(true); networkConnector.setPrefetchSize(1); broker.addNetworkConnector(networkConnector); diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java index 3c3c74e12a..16bc4febe1 100755 --- a/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java @@ -110,8 +110,9 @@ public class TopicClusterTest extends TestCase implements MessageListener { String url = "tcp://localhost:0"; TransportConnector connector = container.addConnector(url); - connector.setDiscoveryUri(new URI("multicast://default")); - container.addNetworkConnector("multicast://default"); + String groupId = "topic-cluster-test-"+System.currentTimeMillis(); + connector.setDiscoveryUri(new URI("multicast://"+groupId)); + container.addNetworkConnector("multicast://"+groupId); container.start(); services.add(container); diff --git a/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java b/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java index 9142dedfdf..611a3e22dd 100755 --- a/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java @@ -43,6 +43,8 @@ public class DiscoveryTransportBrokerTest extends NetworkTestSupport { private static final Log LOG = LogFactory.getLog(DiscoveryTransportBrokerTest.class); + String groupName; + public void setUp() throws Exception { super.setAutoFail(true); super.setUp(); @@ -129,7 +131,10 @@ public class DiscoveryTransportBrokerTest extends NetworkTestSupport { } protected String getDiscoveryUri() { - return "multicast://default"; + if ( groupName == null ) { + groupName = "group-"+System.currentTimeMillis(); + } + return "multicast://"+groupName; } protected TransportConnector createRemoteConnector() throws Exception, IOException, URISyntaxException { diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java index 0a50e858e9..1580773261 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java @@ -45,6 +45,7 @@ public class TwoBrokerMulticastQueueTest extends CombinationTestSupport { public String sendUri; public String recvUri; private BrokerService[] brokers; + private String groupId; public static Test suite() { return suite(TwoBrokerMulticastQueueTest.class); @@ -55,6 +56,8 @@ public class TwoBrokerMulticastQueueTest extends CombinationTestSupport { } public void setUp() throws Exception { + groupId = getClass().getName()+"-"+System.currentTimeMillis(); + System.setProperty("groupId", groupId); super.setAutoFail(true); super.setUp(); } @@ -137,49 +140,48 @@ public class TwoBrokerMulticastQueueTest extends CombinationTestSupport { } public void testSendReceiveUsingDiscovery() throws Exception { - sendUri = "discovery:multicast://default"; - recvUri = "discovery:multicast://default"; + sendUri = "discovery:multicast://"+groupId; + recvUri = "discovery:multicast://"+groupId; createMulticastBrokerNetwork(); doSendReceiveTest(); } public void testMultipleConsumersConnectUsingDiscovery() throws Exception { - sendUri = "discovery:multicast://default"; - recvUri = "discovery:multicast://default"; + sendUri = "discovery:multicast://"+groupId; + recvUri = "discovery:multicast://"+groupId; createMulticastBrokerNetwork(); doMultipleConsumersConnectTest(); } public void testSendReceiveUsingAutoAssignFailover() throws Exception { - sendUri = "failover:(discovery:multicast://default)"; - recvUri = "failover:(discovery:multicast://default)"; + sendUri = "failover:(discovery:multicast://"+groupId+")"; + recvUri = "failover:(discovery:multicast://"+groupId+")"; createAutoAssignMulticastBrokerNetwork(); doSendReceiveTest(); } public void testMultipleConsumersConnectUsingAutoAssignFailover() throws Exception { - sendUri = "failover:(discovery:multicast://default)"; - recvUri = "failover:(discovery:multicast://default)"; + sendUri = "failover:(discovery:multicast://"+groupId+")"; + recvUri = "failover:(discovery:multicast://"+groupId+")"; createAutoAssignMulticastBrokerNetwork(); doMultipleConsumersConnectTest(); } public void testSendReceiveUsingAutoAssignDiscovery() throws Exception { - sendUri = "discovery:multicast://default"; - recvUri = "discovery:multicast://default"; + sendUri = "discovery:multicast://"+groupId; + recvUri = "discovery:multicast://"+groupId; createAutoAssignMulticastBrokerNetwork(); doSendReceiveTest(); } public void testMultipleConsumersConnectUsingAutoAssignDiscovery() throws Exception { - sendUri = "discovery:multicast://default"; - recvUri = "discovery:multicast://default"; + sendUri = "discovery:multicast://"+groupId; + recvUri = "discovery:multicast://"+groupId; createAutoAssignMulticastBrokerNetwork(); doMultipleConsumersConnectTest(); } protected void createMulticastBrokerNetwork() throws Exception { - brokers = new BrokerService[BROKER_COUNT]; for (int i = 0; i < BROKER_COUNT; i++) { brokers[i] = createBroker("org/apache/activemq/usecases/multicast-broker-" + (i + 1) + ".xml"); diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java index ec42c84506..9e4f8d6edd 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java @@ -34,6 +34,7 @@ public class TwoMulticastDiscoveryBrokerTopicSendReceiveTest extends TwoBrokerTo } protected void setUp() throws Exception{ + System.setProperty("groupId", getClass().getName()+"+"+System.currentTimeMillis()); messageCount = 100000; super.setUp(); } diff --git a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml index 831f25139b..cc20eb5313 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml @@ -16,14 +16,16 @@ limitations under the License. --> + + - + - + diff --git a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml index 62468194b2..72c6c80f30 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml @@ -17,13 +17,15 @@ --> + + - + - + diff --git a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml index 0db4bd7d79..8c15683d96 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml @@ -17,13 +17,15 @@ --> + + - + - + diff --git a/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml b/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml index e1e553910c..c8a80824e1 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml @@ -17,14 +17,15 @@ --> + - + - + diff --git a/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml b/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml index f6a1b2c2ec..4757a7d615 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml @@ -17,13 +17,15 @@ --> + + - + - +