activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r383749 [2/13] - in /incubator/activemq/trunk: activemq-core/ activemq-core/src/gram/java/org/apache/activemq/openwire/tool/ activemq-core/src/gram/script/ activemq-core/src/main/java/org/apache/activemq/command/ activemq-core/src/main/java...
Date Tue, 07 Mar 2006 02:33:12 GMT
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ConsumerIdMarshaller
  *

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ConsumerInfoMarshaller
  *
@@ -64,9 +65,9 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setBrowser(bs.readBoolean());
-        info.setDestination((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());
@@ -79,15 +80,16 @@
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setBrokerPath(value);
         }
         else {
             info.setBrokerPath(null);
         }
+        info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setNetworkSubscription(bs.readBoolean());
 
     }
@@ -101,9 +103,9 @@
         ConsumerInfo info = (ConsumerInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
     bs.writeBoolean(info.isBrowser());
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
             bs.writeBoolean(info.isDispatchAsync());
     rc += tightMarshalString1(info.getSelector(), bs);
     rc += tightMarshalString1(info.getSubcriptionName(), bs);
@@ -111,6 +113,7 @@
     bs.writeBoolean(info.isExclusive());
     bs.writeBoolean(info.isRetroactive());
         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getAdditionalPredicate(), bs);
     bs.writeBoolean(info.isNetworkSubscription());
 
         return rc + 9;
@@ -127,9 +130,9 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
     bs.readBoolean();
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     dataOut.writeInt(info.getPrefetchSize());
     dataOut.writeInt(info.getMaximumPendingMessageLimit());
     bs.readBoolean();
@@ -140,6 +143,7 @@
     bs.readBoolean();
     dataOut.writeByte(info.getPriority());
     tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut, bs);
     bs.readBoolean();
 
     }
@@ -155,9 +159,9 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setBrowser(dataIn.readBoolean());
-        info.setDestination((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());
@@ -170,15 +174,16 @@
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setBrokerPath(value);
         }
         else {
             info.setBrokerPath(null);
         }
+        info.setAdditionalPredicate((org.apache.activemq.filter.BooleanExpression) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setNetworkSubscription(dataIn.readBoolean());
 
     }
@@ -192,9 +197,9 @@
         ConsumerInfo info = (ConsumerInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
     dataOut.writeBoolean(info.isBrowser());
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     dataOut.writeInt(info.getPrefetchSize());
     dataOut.writeInt(info.getMaximumPendingMessageLimit());
     dataOut.writeBoolean(info.isDispatchAsync());
@@ -205,6 +210,7 @@
     dataOut.writeBoolean(info.isRetroactive());
     dataOut.writeByte(info.getPriority());
     looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getAdditionalPredicate(), dataOut);
     dataOut.writeBoolean(info.isNetworkSubscription());
 
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ControlCommandMarshaller
  *

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for DataArrayResponseMarshaller
  *
@@ -67,9 +68,9 @@
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            DataStructure value[] = new DataStructure[size];
+            org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setData(value);
         }
@@ -122,9 +123,9 @@
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            DataStructure value[] = new DataStructure[size];
+            org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (DataStructure) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setData(value);
         }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for DataResponseMarshaller
  *
@@ -64,7 +65,7 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         DataResponse info = (DataResponse)o;
-        info.setData((DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setData((org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -77,7 +78,7 @@
         DataResponse info = (DataResponse)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getData(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getData(), bs);
 
         return rc + 0;
     }
@@ -93,7 +94,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DataResponse info = (DataResponse)o;
-    tightMarshalNestedObject2(wireFormat, info.getData(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getData(), dataOut, bs);
 
     }
 
@@ -108,7 +109,7 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         DataResponse info = (DataResponse)o;
-        info.setData((DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setData((org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
 
@@ -121,7 +122,7 @@
         DataResponse info = (DataResponse)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalNestedObject(wireFormat, info.getData(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getData(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for DestinationInfoMarshaller
  *
@@ -64,16 +65,16 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-        info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setOperationType(dataIn.readByte());
         info.setTimeout(tightUnmarshalLong(wireFormat, dataIn, bs));
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setBrokerPath(value);
         }
@@ -92,8 +93,8 @@
         DestinationInfo info = (DestinationInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
         rc+=tightMarshalLong1(wireFormat, info.getTimeout(), bs);
     rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
 
@@ -111,8 +112,8 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     dataOut.writeByte(info.getOperationType());
     tightMarshalLong2(wireFormat, info.getTimeout(), dataOut, bs);
     tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
@@ -130,16 +131,16 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         DestinationInfo info = (DestinationInfo)o;
-        info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setOperationType(dataIn.readByte());
         info.setTimeout(looseUnmarshalLong(wireFormat, dataIn));
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setBrokerPath(value);
         }
@@ -158,8 +159,8 @@
         DestinationInfo info = (DestinationInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     dataOut.writeByte(info.getOperationType());
     looseMarshalLong(wireFormat, info.getTimeout(), dataOut);
     looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DiscoveryEventMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for DiscoveryEventMarshaller
  *

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ExceptionResponseMarshaller
  *
@@ -64,7 +65,7 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ExceptionResponse info = (ExceptionResponse)o;
-        info.setException((Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs));
+        info.setException((java.lang.Throwable) tightUnmarsalThrowable(wireFormat, dataIn, bs));
 
     }
 
@@ -108,7 +109,7 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ExceptionResponse info = (ExceptionResponse)o;
-        info.setException((Throwable) looseUnmarsalThrowable(wireFormat, dataIn));
+        info.setException((java.lang.Throwable) looseUnmarsalThrowable(wireFormat, dataIn));
 
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for FlushCommandMarshaller
  *

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for IntegerResponseMarshaller
  *

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for JournalQueueAckMarshaller
  *
@@ -64,8 +65,8 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-        info.setDestination((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setMessageAck((MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageAck((org.apache.activemq.command.MessageAck) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -78,8 +79,8 @@
         JournalQueueAck info = (JournalQueueAck)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessageAck(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageAck(), bs);
 
         return rc + 0;
     }
@@ -95,8 +96,8 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-    tightMarshalNestedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessageAck(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageAck(), dataOut, bs);
 
     }
 
@@ -111,8 +112,8 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         JournalQueueAck info = (JournalQueueAck)o;
-        info.setDestination((ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setMessageAck((MessageAck) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setMessageAck((org.apache.activemq.command.MessageAck) looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
 
@@ -125,8 +126,8 @@
         JournalQueueAck info = (JournalQueueAck)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalNestedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessageAck(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageAck(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for JournalTopicAckMarshaller
  *
@@ -64,12 +65,12 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-        info.setDestination((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setMessageSequenceId(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setSubscritionName(tightUnmarshalString(dataIn, bs));
         info.setClientId(tightUnmarshalString(dataIn, bs));
-        info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -82,12 +83,12 @@
         JournalTopicAck info = (JournalTopicAck)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getMessageSequenceId(), bs);
     rc += tightMarshalString1(info.getSubscritionName(), bs);
     rc += tightMarshalString1(info.getClientId(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getTransactionId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
 
         return rc + 0;
     }
@@ -103,12 +104,12 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-    tightMarshalNestedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getMessageSequenceId(), dataOut, bs);
     tightMarshalString2(info.getSubscritionName(), dataOut, bs);
     tightMarshalString2(info.getClientId(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
 
     }
 
@@ -123,12 +124,12 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         JournalTopicAck info = (JournalTopicAck)o;
-        info.setDestination((ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setMessageSequenceId(looseUnmarshalLong(wireFormat, dataIn));
         info.setSubscritionName(looseUnmarshalString(dataIn));
         info.setClientId(looseUnmarshalString(dataIn));
-        info.setTransactionId((TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
 
@@ -141,12 +142,12 @@
         JournalTopicAck info = (JournalTopicAck)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalNestedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);
     looseMarshalLong(wireFormat, info.getMessageSequenceId(), dataOut);
     looseMarshalString(info.getSubscritionName(), dataOut);
     looseMarshalString(info.getClientId(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getTransactionId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for JournalTraceMarshaller
  *

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for JournalTransactionMarshaller
  *
@@ -64,7 +65,7 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-        info.setTransactionId((TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setType(dataIn.readByte());
         info.setWasPrepared(bs.readBoolean());
 
@@ -79,7 +80,7 @@
         JournalTransaction info = (JournalTransaction)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getTransactionId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
         bs.writeBoolean(info.getWasPrepared());
 
         return rc + 1;
@@ -96,7 +97,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-    tightMarshalNestedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
     dataOut.writeByte(info.getType());
     bs.readBoolean();
 
@@ -113,7 +114,7 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         JournalTransaction info = (JournalTransaction)o;
-        info.setTransactionId((TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setType(dataIn.readByte());
         info.setWasPrepared(dataIn.readBoolean());
 
@@ -128,7 +129,7 @@
         JournalTransaction info = (JournalTransaction)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalNestedObject(wireFormat, info.getTransactionId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
     dataOut.writeByte(info.getType());
     dataOut.writeBoolean(info.getWasPrepared());
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for KeepAliveInfoMarshaller
  *

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for LocalTransactionIdMarshaller
  *
@@ -65,7 +66,7 @@
 
         LocalTransactionId info = (LocalTransactionId)o;
         info.setValue(tightUnmarshalLong(wireFormat, dataIn, bs));
-        info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -79,7 +80,7 @@
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
     rc+=tightMarshalLong1(wireFormat, info.getValue(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
 
         return rc + 0;
     }
@@ -96,7 +97,7 @@
 
         LocalTransactionId info = (LocalTransactionId)o;
     tightMarshalLong2(wireFormat, info.getValue(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
 
     }
 
@@ -112,7 +113,7 @@
 
         LocalTransactionId info = (LocalTransactionId)o;
         info.setValue(looseUnmarshalLong(wireFormat, dataIn));
-        info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
 
     }
 
@@ -126,7 +127,7 @@
 
         super.looseMarshal(wireFormat, o, dataOut);
     looseMarshalLong(wireFormat, info.getValue(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java Mon Mar  6 18:32:50 2006
@@ -39,52 +39,53 @@
     static final private DataStreamMarshaller marshaller[] = new DataStreamMarshaller[256];
     static {
 
-        add(new MessageIdMarshaller());
-        add(new BrokerInfoMarshaller());
-        add(new ActiveMQTempQueueMarshaller());
         add(new LocalTransactionIdMarshaller());
-        add(new RemoveSubscriptionInfoMarshaller());
         add(new IntegerResponseMarshaller());
         add(new ActiveMQQueueMarshaller());
-        add(new DestinationInfoMarshaller());
-        add(new ActiveMQBytesMessageMarshaller());
-        add(new ShutdownInfoMarshaller());
-        add(new DataResponseMarshaller());
+        add(new ActiveMQObjectMessageMarshaller());
+        add(new ConnectionIdMarshaller());
+        add(new ConnectionInfoMarshaller());
+        add(new ProducerInfoMarshaller());
+        add(new MessageDispatchNotificationMarshaller());
+        add(new SessionInfoMarshaller());
+        add(new TransactionInfoMarshaller());
+        add(new ActiveMQStreamMessageMarshaller());
+        add(new MessageAckMarshaller());
+        add(new ProducerIdMarshaller());
+        add(new MessageIdMarshaller());
+        add(new ActiveMQTempQueueMarshaller());
+        add(new RemoveSubscriptionInfoMarshaller());
         add(new SessionIdMarshaller());
         add(new DataArrayResponseMarshaller());
         add(new JournalQueueAckMarshaller());
-        add(new WireFormatInfoMarshaller());
         add(new ResponseMarshaller());
         add(new ConnectionErrorMarshaller());
-        add(new ActiveMQObjectMessageMarshaller());
         add(new ConsumerInfoMarshaller());
+        add(new XATransactionIdMarshaller());
+        add(new JournalTraceMarshaller());
+        add(new ConsumerIdMarshaller());
+        add(new ActiveMQTextMessageMarshaller());
+        add(new SubscriptionInfoMarshaller());
+        add(new JournalTransactionMarshaller());
+        add(new ControlCommandMarshaller());
+        add(new NetworkBridgeFilterMarshaller());
+        add(new ActiveMQBytesMessageMarshaller());
+        add(new WireFormatInfoMarshaller());
         add(new ActiveMQTempTopicMarshaller());
-        add(new ConnectionIdMarshaller());
         add(new DiscoveryEventMarshaller());
-        add(new ConnectionInfoMarshaller());
+        add(new ActiveMQTopicMarshaller());
+        add(new BrokerInfoMarshaller());
+        add(new DestinationInfoMarshaller());
+        add(new ShutdownInfoMarshaller());
+        add(new DataResponseMarshaller());
         add(new KeepAliveInfoMarshaller());
-        add(new XATransactionIdMarshaller());
-        add(new JournalTraceMarshaller());
         add(new FlushCommandMarshaller());
-        add(new ConsumerIdMarshaller());
         add(new JournalTopicAckMarshaller());
-        add(new ActiveMQTextMessageMarshaller());
         add(new BrokerIdMarshaller());
         add(new MessageDispatchMarshaller());
-        add(new ProducerInfoMarshaller());
-        add(new SubscriptionInfoMarshaller());
         add(new ActiveMQMapMessageMarshaller());
-        add(new MessageDispatchNotificationMarshaller());
-        add(new SessionInfoMarshaller());
         add(new ActiveMQMessageMarshaller());
-        add(new TransactionInfoMarshaller());
-        add(new ActiveMQStreamMessageMarshaller());
-        add(new MessageAckMarshaller());
-        add(new ProducerIdMarshaller());
-        add(new ActiveMQTopicMarshaller());
-        add(new JournalTransactionMarshaller());
         add(new RemoveInfoMarshaller());
-        add(new ControlCommandMarshaller());
         add(new ExceptionResponseMarshaller());
 
 	}

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageAckMarshaller
  *
@@ -64,12 +65,12 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageAck info = (MessageAck)o;
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setAckType(dataIn.readByte());
-        info.setFirstMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setLastMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setFirstMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setLastMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setMessageCount(dataIn.readInt());
 
     }
@@ -83,11 +84,11 @@
         MessageAck info = (MessageAck)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
-        rc += tightMarshalNestedObject1(wireFormat, info.getFirstMessageId(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getLastMessageId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getFirstMessageId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getLastMessageId(), bs);
     
         return rc + 5;
     }
@@ -103,12 +104,12 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageAck info = (MessageAck)o;
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
     dataOut.writeByte(info.getAckType());
-    tightMarshalNestedObject2(wireFormat, info.getFirstMessageId(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getLastMessageId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getLastMessageId(), dataOut, bs);
     dataOut.writeInt(info.getMessageCount());
 
     }
@@ -124,12 +125,12 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageAck info = (MessageAck)o;
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setAckType(dataIn.readByte());
-        info.setFirstMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setLastMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setFirstMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setLastMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setMessageCount(dataIn.readInt());
 
     }
@@ -143,12 +144,12 @@
         MessageAck info = (MessageAck)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
     dataOut.writeByte(info.getAckType());
-    looseMarshalNestedObject(wireFormat, info.getFirstMessageId(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getLastMessageId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getFirstMessageId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getLastMessageId(), dataOut);
     dataOut.writeInt(info.getMessageCount());
 
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageDispatchMarshaller
  *
@@ -64,9 +65,9 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-        info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessage((Message) tightUnmarsalNestedObject(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.setMessage((org.apache.activemq.command.Message) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setRedeliveryCounter(dataIn.readInt());
 
     }
@@ -80,9 +81,9 @@
         MessageDispatch info = (MessageDispatch)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessage(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessage(), bs);
     
         return rc + 4;
     }
@@ -98,9 +99,9 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-    tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessage(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessage(), dataOut, bs);
     dataOut.writeInt(info.getRedeliveryCounter());
 
     }
@@ -116,9 +117,9 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageDispatch info = (MessageDispatch)o;
-        info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setMessage((Message) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setMessage((org.apache.activemq.command.Message) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setRedeliveryCounter(dataIn.readInt());
 
     }
@@ -132,9 +133,9 @@
         MessageDispatch info = (MessageDispatch)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessage(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessage(), dataOut);
     dataOut.writeInt(info.getRedeliveryCounter());
 
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchNotificationMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageDispatchNotificationMarshaller
  *
@@ -64,10 +65,10 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.setConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((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((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -80,10 +81,10 @@
         MessageDispatchNotification info = (MessageDispatchNotification)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConsumerId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConsumerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getDeliverySequenceId(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
 
         return rc + 0;
     }
@@ -99,10 +100,10 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-    tightMarshalCachedObject2(wireFormat, info.getConsumerId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConsumerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getDeliverySequenceId(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);
 
     }
 
@@ -117,10 +118,10 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-        info.setConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((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((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
 
     }
 
@@ -133,10 +134,10 @@
         MessageDispatchNotification info = (MessageDispatchNotification)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConsumerId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConsumerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     looseMarshalLong(wireFormat, info.getDeliverySequenceId(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);
 
     }
 }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageIdMarshaller
  *
@@ -64,7 +65,7 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((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));
 
@@ -79,7 +80,7 @@
         MessageId info = (MessageId)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getProducerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getProducerSequenceId(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getBrokerSequenceId(), bs);
 
@@ -97,7 +98,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageId info = (MessageId)o;
-    tightMarshalCachedObject2(wireFormat, info.getProducerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getProducerSequenceId(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getBrokerSequenceId(), dataOut, bs);
 
@@ -114,7 +115,7 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setProducerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
         info.setBrokerSequenceId(looseUnmarshalLong(wireFormat, dataIn));
 
@@ -129,7 +130,7 @@
         MessageId info = (MessageId)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getProducerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
     looseMarshalLong(wireFormat, info.getProducerSequenceId(), dataOut);
     looseMarshalLong(wireFormat, info.getBrokerSequenceId(), dataOut);
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for MessageMarshaller
  *
@@ -52,33 +53,33 @@
 
         info.beforeUnmarshall(wireFormat);
         
-        info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setOriginalDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessageId((MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setOriginalTransactionId((TransactionId) 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));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setGroupID(tightUnmarshalString(dataIn, bs));
         info.setGroupSequence(dataIn.readInt());
         info.setCorrelationId(tightUnmarshalString(dataIn, bs));
         info.setPersistent(bs.readBoolean());
         info.setExpiration(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setPriority(dataIn.readByte());
-        info.setReplyTo((ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
         info.setTimestamp(tightUnmarshalLong(wireFormat, dataIn, bs));
         info.setType(tightUnmarshalString(dataIn, bs));
         info.setContent(tightUnmarshalByteSequence(dataIn, bs));
         info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));
-        info.setDataStructure((DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setTargetConsumerId((ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDataStructure((org.apache.activemq.command.DataStructure) tightUnmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setCompressed(bs.readBoolean());
         info.setRedeliveryCounter(dataIn.readInt());
 
         if (bs.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setBrokerPath(value);
         }
@@ -104,23 +105,23 @@
         info.beforeMarshall(wireFormat);
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getProducerId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getOriginalDestination(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getMessageId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getOriginalTransactionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalDestination(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getMessageId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getOriginalTransactionId(), bs);
     rc += tightMarshalString1(info.getGroupID(), bs);
         rc += tightMarshalString1(info.getCorrelationId(), bs);
     bs.writeBoolean(info.isPersistent());
     rc+=tightMarshalLong1(wireFormat, info.getExpiration(), bs);
-        rc += tightMarshalNestedObject1(wireFormat, info.getReplyTo(), bs);
+        rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getReplyTo(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getTimestamp(), bs);
     rc += tightMarshalString1(info.getType(), bs);
     rc += tightMarshalByteSequence1(info.getContent(), bs);
     rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
-    rc += tightMarshalNestedObject1(wireFormat, info.getDataStructure(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getTargetConsumerId(), bs);
+    rc += tightMarshalNestedObject1(wireFormat, (DataStructure)info.getDataStructure(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTargetConsumerId(), bs);
     bs.writeBoolean(info.isCompressed());
         rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
     rc+=tightMarshalLong1(wireFormat, info.getArrival(), bs);
@@ -141,25 +142,25 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         Message info = (Message)o;
-    tightMarshalCachedObject2(wireFormat, info.getProducerId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getOriginalDestination(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getMessageId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getOriginalTransactionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getMessageId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut, bs);
     tightMarshalString2(info.getGroupID(), dataOut, bs);
     dataOut.writeInt(info.getGroupSequence());
     tightMarshalString2(info.getCorrelationId(), dataOut, bs);
     bs.readBoolean();
     tightMarshalLong2(wireFormat, info.getExpiration(), dataOut, bs);
     dataOut.writeByte(info.getPriority());
-    tightMarshalNestedObject2(wireFormat, info.getReplyTo(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getReplyTo(), dataOut, bs);
     tightMarshalLong2(wireFormat, info.getTimestamp(), dataOut, bs);
     tightMarshalString2(info.getType(), dataOut, bs);
     tightMarshalByteSequence2(info.getContent(), dataOut, bs);
     tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
-    tightMarshalNestedObject2(wireFormat, info.getDataStructure(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getTargetConsumerId(), dataOut, bs);
+    tightMarshalNestedObject2(wireFormat, (DataStructure)info.getDataStructure(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut, bs);
     bs.readBoolean();
     dataOut.writeInt(info.getRedeliveryCounter());
     tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
@@ -185,33 +186,33 @@
 
         info.beforeUnmarshall(wireFormat);
         
-        info.setProducerId((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setOriginalDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setMessageId((MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setOriginalTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setProducerId((org.apache.activemq.command.ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setMessageId((org.apache.activemq.command.MessageId) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setGroupID(looseUnmarshalString(dataIn));
         info.setGroupSequence(dataIn.readInt());
         info.setCorrelationId(looseUnmarshalString(dataIn));
         info.setPersistent(dataIn.readBoolean());
         info.setExpiration(looseUnmarshalLong(wireFormat, dataIn));
         info.setPriority(dataIn.readByte());
-        info.setReplyTo((ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalNestedObject(wireFormat, dataIn));
         info.setTimestamp(looseUnmarshalLong(wireFormat, dataIn));
         info.setType(looseUnmarshalString(dataIn));
         info.setContent(looseUnmarshalByteSequence(dataIn));
         info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));
-        info.setDataStructure((DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn));
-        info.setTargetConsumerId((ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDataStructure((org.apache.activemq.command.DataStructure) looseUnmarsalNestedObject(wireFormat, dataIn));
+        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setCompressed(dataIn.readBoolean());
         info.setRedeliveryCounter(dataIn.readInt());
 
         if (dataIn.readBoolean()) {
             short size = dataIn.readShort();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setBrokerPath(value);
         }
@@ -237,25 +238,25 @@
         info.beforeMarshall(wireFormat);
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getProducerId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getOriginalDestination(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getMessageId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getOriginalTransactionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalDestination(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getMessageId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getOriginalTransactionId(), dataOut);
     looseMarshalString(info.getGroupID(), dataOut);
     dataOut.writeInt(info.getGroupSequence());
     looseMarshalString(info.getCorrelationId(), dataOut);
     dataOut.writeBoolean(info.isPersistent());
     looseMarshalLong(wireFormat, info.getExpiration(), dataOut);
     dataOut.writeByte(info.getPriority());
-    looseMarshalNestedObject(wireFormat, info.getReplyTo(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getReplyTo(), dataOut);
     looseMarshalLong(wireFormat, info.getTimestamp(), dataOut);
     looseMarshalString(info.getType(), dataOut);
     looseMarshalByteSequence(wireFormat, info.getContent(), dataOut);
     looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
-    looseMarshalNestedObject(wireFormat, info.getDataStructure(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getTargetConsumerId(), dataOut);
+    looseMarshalNestedObject(wireFormat, (DataStructure)info.getDataStructure(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getTargetConsumerId(), dataOut);
     dataOut.writeBoolean(info.isCompressed());
     dataOut.writeInt(info.getRedeliveryCounter());
     looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);

Added: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java?rev=383749&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java (added)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterMarshaller.java Mon Mar  6 18:32:50 2006
@@ -0,0 +1 @@
+/**
 *
 * Copyright 2005-2006 The Apache Software Foundation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.activemq.openwire.v1;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import org.apache.activemq.openwire.*;
import org.apache.activemq.command.*;



/**
 * Marshalling code for Open Wire Format for NetworkBridgeFilterMarshaller
 *
 *
 * NOTE!: This file is auto generated - do not modify!
 *        if 
 you need to make a change, please see the modify the groovy scripts in the
 *        under src/gram/script and then use maven openwire:generate to regenerate 
 *        this file.
 *
 * @version $Revision$
 */
public class NetworkBridgeFilterMarshaller extends BaseDataStreamMarshaller {

    /**
     * Return the type of Data Structure we marshal
     * @return short representation of the type data structure
     */
    public byte getDataStructureType() {
        return NetworkBridgeFilter.DATA_STRUCTURE_TYPE;
    }
    
    /**
     * @return a new object instance
     */
    public DataStructure createObject() {
        return new NetworkBridgeFilter();
    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void tightUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn, Bo
 oleanStream bs) throws IOException {
        super.tightUnmarshal(wireFormat, o, dataIn, bs);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
        info.setNetworkTTL(dataIn.readInt());
        info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public int tightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) throws IOException {

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;

        int rc = super.tightMarshal1(wireFormat, o, bs);
        rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getNetworkBrokerId(), bs);

        return rc + 4;
    }

    /**
     * Write a object instance to data output stream
     *
     * @param o the instance to be marshaled
     * @param dataOut the output stream
     * @throws IOException thrown if an error occurs
     */
    pub
 lic void tightMarshal2(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut, BooleanStream bs) throws IOException {
        super.tightMarshal2(wireFormat, o, dataOut, bs);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
    dataOut.writeInt(info.getNetworkTTL());
    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut, bs);

    }

    /**
     * Un-marshal an object instance from the data input stream
     *
     * @param o the object to un-marshal
     * @param dataIn the data input stream to build the object from
     * @throws IOException
     */
    public void looseUnmarshal(OpenWireFormat wireFormat, Object o, DataInputStream dataIn) throws IOException {
        super.looseUnmarshal(wireFormat, o, dataIn);

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;
        info.setNetworkTTL(dataIn.readInt());
        info.setNetworkBrokerId((org.apache.activemq.command.BrokerId) looseUnmarsalCachedObject(wireF
 ormat, dataIn));

    }


    /**
     * Write the booleans that this object uses to a BooleanStream
     */
    public void looseMarshal(OpenWireFormat wireFormat, Object o, DataOutputStream dataOut) throws IOException {

        NetworkBridgeFilter info = (NetworkBridgeFilter)o;

        super.looseMarshal(wireFormat, o, dataOut);
    dataOut.writeInt(info.getNetworkTTL());
    looseMarshalCachedObject(wireFormat, (DataStructure)info.getNetworkBrokerId(), dataOut);

    }
}
\ No newline at end of file

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ProducerIdMarshaller
  *

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for ProducerInfoMarshaller
  *
@@ -64,14 +65,14 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-        info.setProducerId((ProducerId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((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();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (org.apache.activemq.command.BrokerId) tightUnmarsalNestedObject(wireFormat,dataIn, bs);
             }
             info.setBrokerPath(value);
         }
@@ -90,8 +91,8 @@
         ProducerInfo info = (ProducerInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getProducerId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getProducerId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
     rc += tightMarshalObjectArray1(wireFormat, info.getBrokerPath(), bs);
 
         return rc + 0;
@@ -108,8 +109,8 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getProducerId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getProducerId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     tightMarshalObjectArray2(wireFormat, info.getBrokerPath(), dataOut, bs);
 
     }
@@ -125,14 +126,14 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         ProducerInfo info = (ProducerInfo)o;
-        info.setProducerId((ProducerId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setDestination((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();
-            BrokerId value[] = new BrokerId[size];
+            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
+                value[i] = (org.apache.activemq.command.BrokerId) looseUnmarsalNestedObject(wireFormat,dataIn);
             }
             info.setBrokerPath(value);
         }
@@ -151,8 +152,8 @@
         ProducerInfo info = (ProducerInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getProducerId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getProducerId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     looseMarshalObjectArray(wireFormat, info.getBrokerPath(), dataOut);
 
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for RemoveInfoMarshaller
  *
@@ -64,7 +65,7 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-        info.setObjectId((DataStructure) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setObjectId((org.apache.activemq.command.DataStructure) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 
@@ -77,7 +78,7 @@
         RemoveInfo info = (RemoveInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getObjectId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getObjectId(), bs);
 
         return rc + 0;
     }
@@ -93,7 +94,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getObjectId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getObjectId(), dataOut, bs);
 
     }
 
@@ -108,7 +109,7 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         RemoveInfo info = (RemoveInfo)o;
-        info.setObjectId((DataStructure) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setObjectId((org.apache.activemq.command.DataStructure) looseUnmarsalCachedObject(wireFormat, dataIn));
 
     }
 
@@ -121,7 +122,7 @@
         RemoveInfo info = (RemoveInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getObjectId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getObjectId(), dataOut);
 
     }
 }



Mime
View raw message