activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r661094 [2/2] - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/openwire/v3/ test/java/org/apache/activemq/broker/ test/java/org/apache/activemq/network/ test/java/org/apache/activemq/transport/ test/java/org/apache/acti...
Date Wed, 28 May 2008 21:26:13 GMT
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageAckMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.MessageAck;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageDispatchNotificationMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,31 +22,32 @@
 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 @@
 
     /**
      * 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 @@
         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 @@
         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 @@
 
     /**
      * 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 @@
 
     /**
      * 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 @@
         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
      */

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessageIdMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,30 +22,32 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.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 @@
 
     /**
      * 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 @@
         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 @@
 
         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 @@
 
     /**
      * 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 @@
         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
      */

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/MessagePullMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,32 +22,32 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.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 @@
 
     /**
      * 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 @@
         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 @@
 
     /**
      * 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 @@
 
     /**
      * 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 @@
         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
      */

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/NetworkBridgeFilterMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.NetworkBridgeFilter;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/PartialCommandMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.PartialCommand;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerAckMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.ProducerAck;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerIdMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,30 +22,32 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.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 @@
 
     /**
      * 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 @@
 
     }
 
+
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -78,15 +82,15 @@
 
         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 @@
 
     /**
      * 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 @@
 
     }
 
+
     /**
      * Write the booleans that this object uses to a BooleanStream
      */

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ProducerInfoMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,32 +22,32 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.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 @@
 
     /**
      * 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 @@
 
     }
 
+
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -108,13 +104,12 @@
 
     /**
      * Write a object instance to data output stream
-     * 
+     *
      * @param o the instance to be marshaled
      * @param dataOut the output stream
      * @throws IOException thrown if an error occurs
      */
-    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs)
-        throws IOException {
+    public void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutput dataOut, BooleanStream bs) throws IOException {
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ProducerInfo info = (ProducerInfo)o;
@@ -128,7 +123,7 @@
 
     /**
      * Un-marshal an object instance from the data input stream
-     * 
+     *
      * @param o the object to un-marshal
      * @param dataIn the data input stream to build the object from
      * @throws IOException
@@ -137,21 +132,18 @@
         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 @@
 
     }
 
+
     /**
      * Write the booleans that this object uses to a BooleanStream
      */

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/RemoveSubscriptionInfoMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.RemoveSubscriptionInfo;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ReplayCommandMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.ReplayCommand;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ResponseMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.Response;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionIdMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,32 +22,32 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.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 @@
 
     /**
      * 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 @@
 
     }
 
+
     /**
      * Write the booleans that this object uses to a BooleanStream
      */
@@ -80,20 +81,19 @@
 
         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 @@
 
     /**
      * 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 @@
 
     }
 
+
     /**
      * Write the booleans that this object uses to a BooleanStream
      */

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SessionInfoMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.SessionInfo;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/ShutdownInfoMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.ShutdownInfo;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/SubscriptionInfoMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.SubscriptionInfo;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionIdMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,8 +22,8 @@
 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.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/TransactionInfoMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.TransactionInfo;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/WireFormatInfoMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.WireFormatInfo;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v3/XATransactionIdMarshaller.java Wed May 28 14:26:11 2008
@@ -1,4 +1,5 @@
 /**
+ *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -6,7 +7,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,10 +22,8 @@
 import java.io.DataOutput;
 import java.io.IOException;
 
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.XATransactionId;
-import org.apache.activemq.openwire.BooleanStream;
-import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 
 
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java Wed May 28 14:26:11 2008
@@ -54,7 +54,7 @@
         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 @@
         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);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/NetworkLoadTest.java Wed May 28 14:26:11 2008
@@ -200,11 +200,13 @@
 		
         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);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/TopicClusterTest.java Wed May 28 14:26:11 2008
@@ -110,8 +110,9 @@
 
         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);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/discovery/DiscoveryTransportBrokerTest.java Wed May 28 14:26:11 2008
@@ -43,6 +43,8 @@
 
     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 @@
     }
 
     protected String getDiscoveryUri() {
-        return "multicast://default";
+    	if ( groupName == null ) {
+    		groupName = "group-"+System.currentTimeMillis();
+    	}
+        return "multicast://"+groupName;
     }
 
     protected TransportConnector createRemoteConnector() throws Exception, IOException, URISyntaxException {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoBrokerMulticastQueueTest.java Wed May 28 14:26:11 2008
@@ -45,6 +45,7 @@
     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 void setUp() throws Exception {
+    	groupId = getClass().getName()+"-"+System.currentTimeMillis();
+    	System.setProperty("groupId", groupId);
         super.setAutoFail(true);
         super.setUp();
     }
@@ -137,49 +140,48 @@
     }
 
     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");

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java Wed May 28 14:26:11 2008
@@ -34,6 +34,7 @@
     }
     
     protected void setUp() throws Exception{
+    	System.setProperty("groupId", getClass().getName()+"+"+System.currentTimeMillis());
         messageCount = 100000;
         super.setUp();
     }

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-1.xml Wed May 28 14:26:11 2008
@@ -16,14 +16,16 @@
     limitations under the License.
 -->
 <beans>
+  
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="BrokerA" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+      <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://default"/>
+      <networkConnector uri="multicast://${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-2.xml Wed May 28 14:26:11 2008
@@ -17,13 +17,15 @@
 -->
 <beans>
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:61617" discoveryUri="multicast://default"/>
+      <transportConnector uri="tcp://localhost:61617" discoveryUri="multicast://${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://default"/>
+      <networkConnector uri="multicast://${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/multicast-broker-auto.xml Wed May 28 14:26:11 2008
@@ -17,13 +17,15 @@
 -->
 <beans>
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <broker brokerName="BrokerB" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://default"/>
+      <networkConnector uri="multicast://${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-discovery.xml Wed May 28 14:26:11 2008
@@ -17,14 +17,15 @@
 -->
 <beans>
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <broker brokerName="receiver" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://default"/>
+      <networkConnector uri="multicast://${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml?rev=661094&r1=661093&r2=661094&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-discovery.xml Wed May 28 14:26:11 2008
@@ -17,13 +17,15 @@
 -->
 <beans>
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
   <broker brokerName="sender" persistent="false" useJmx="false" xmlns="http://activemq.apache.org/schema/core">
     <transportConnectors>
-      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://default"/>
+      <transportConnector uri="tcp://localhost:0" discoveryUri="multicast://${groupId}"/>
     </transportConnectors>
 
     <networkConnectors>
-      <networkConnector uri="multicast://default"/>
+      <networkConnector uri="multicast://${groupId}"/>
     </networkConnectors>
 
     <persistenceAdapter>



Mime
View raw message