activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r383749 [3/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/RemoveSubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for RemoveSubscriptionInfoMarshaller
  *
@@ -64,7 +65,7 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-        info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
         info.setClientId(tightUnmarshalString(dataIn, bs));
 
@@ -79,7 +80,7 @@
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
     rc += tightMarshalString1(info.getSubcriptionName(), bs);
     rc += tightMarshalString1(info.getClientId(), bs);
 
@@ -97,7 +98,7 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
     tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
     tightMarshalString2(info.getClientId(), dataOut, bs);
 
@@ -114,7 +115,7 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-        info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setSubcriptionName(looseUnmarshalString(dataIn));
         info.setClientId(looseUnmarshalString(dataIn));
 
@@ -129,7 +130,7 @@
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
     looseMarshalString(info.getSubcriptionName(), dataOut);
     looseMarshalString(info.getClientId(), dataOut);
 

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

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

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

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

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for SubscriptionInfoMarshaller
  *
@@ -65,7 +66,7 @@
 
         SubscriptionInfo info = (SubscriptionInfo)o;
         info.setClientId(tightUnmarshalString(dataIn, bs));
-        info.setDestination((ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setSelector(tightUnmarshalString(dataIn, bs));
         info.setSubcriptionName(tightUnmarshalString(dataIn, bs));
 
@@ -81,7 +82,7 @@
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
     rc += tightMarshalString1(info.getClientId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getDestination(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getDestination(), bs);
     rc += tightMarshalString1(info.getSelector(), bs);
     rc += tightMarshalString1(info.getSubcriptionName(), bs);
 
@@ -100,7 +101,7 @@
 
         SubscriptionInfo info = (SubscriptionInfo)o;
     tightMarshalString2(info.getClientId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getDestination(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getDestination(), dataOut, bs);
     tightMarshalString2(info.getSelector(), dataOut, bs);
     tightMarshalString2(info.getSubcriptionName(), dataOut, bs);
 
@@ -118,7 +119,7 @@
 
         SubscriptionInfo info = (SubscriptionInfo)o;
         info.setClientId(looseUnmarshalString(dataIn));
-        info.setDestination((ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setSelector(looseUnmarshalString(dataIn));
         info.setSubcriptionName(looseUnmarshalString(dataIn));
 
@@ -134,7 +135,7 @@
 
         super.looseMarshal(wireFormat, o, dataOut);
     looseMarshalString(info.getClientId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getDestination(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getDestination(), dataOut);
     looseMarshalString(info.getSelector(), dataOut);
     looseMarshalString(info.getSubcriptionName(), dataOut);
 

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

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for TransactionInfoMarshaller
  *
@@ -64,8 +65,8 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-        info.setConnectionId((ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) tightUnmarsalCachedObject(wireFormat, dataIn, bs));
         info.setType(dataIn.readByte());
 
     }
@@ -79,8 +80,8 @@
         TransactionInfo info = (TransactionInfo)o;
 
         int rc = super.tightMarshal1(wireFormat, o, bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getConnectionId(), bs);
-    rc += tightMarshalCachedObject1(wireFormat, info.getTransactionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getConnectionId(), bs);
+    rc += tightMarshalCachedObject1(wireFormat, (DataStructure)info.getTransactionId(), bs);
     
         return rc + 1;
     }
@@ -96,8 +97,8 @@
         super.tightMarshal2(wireFormat, o, dataOut, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-    tightMarshalCachedObject2(wireFormat, info.getConnectionId(), dataOut, bs);
-    tightMarshalCachedObject2(wireFormat, info.getTransactionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getConnectionId(), dataOut, bs);
+    tightMarshalCachedObject2(wireFormat, (DataStructure)info.getTransactionId(), dataOut, bs);
     dataOut.writeByte(info.getType());
 
     }
@@ -113,8 +114,8 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         TransactionInfo info = (TransactionInfo)o;
-        info.setConnectionId((ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
-        info.setTransactionId((TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) looseUnmarsalCachedObject(wireFormat, dataIn));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) looseUnmarsalCachedObject(wireFormat, dataIn));
         info.setType(dataIn.readByte());
 
     }
@@ -128,8 +129,8 @@
         TransactionInfo info = (TransactionInfo)o;
 
         super.looseMarshal(wireFormat, o, dataOut);
-    looseMarshalCachedObject(wireFormat, info.getConnectionId(), dataOut);
-    looseMarshalCachedObject(wireFormat, info.getTransactionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getConnectionId(), dataOut);
+    looseMarshalCachedObject(wireFormat, (DataStructure)info.getTransactionId(), dataOut);
     dataOut.writeByte(info.getType());
 
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java Mon Mar  6 18:32:50 2006
@@ -25,6 +25,7 @@
 import org.apache.activemq.command.*;
 
 
+
 /**
  * Marshalling code for Open Wire Format for WireFormatInfoMarshaller
  *
@@ -64,13 +65,14 @@
         super.tightUnmarshal(wireFormat, o, dataIn, bs);
 
         WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
         info.setMagic(tightUnmarshalConstByteArray(dataIn, bs, 8));
         info.setVersion(dataIn.readInt());
-        info.setCacheEnabled(bs.readBoolean());
-        info.setStackTraceEnabled(bs.readBoolean());
-        info.setTcpNoDelayEnabled(bs.readBoolean());
-        info.setPrefixPacketSize(bs.readBoolean());
-        info.setTightEncodingEnabled(bs.readBoolean());
+        info.setMarshalledProperties(tightUnmarshalByteSequence(dataIn, bs));
+
+        info.afterUnmarshall(wireFormat);
 
     }
 
@@ -82,13 +84,11 @@
 
         WireFormatInfo info = (WireFormatInfo)o;
 
+        info.beforeMarshall(wireFormat);
+
         int rc = super.tightMarshal1(wireFormat, o, bs);
     rc += tightMarshalConstByteArray1(info.getMagic(), bs, 8);
-        bs.writeBoolean(info.isCacheEnabled());
-    bs.writeBoolean(info.isStackTraceEnabled());
-    bs.writeBoolean(info.isTcpNoDelayEnabled());
-    bs.writeBoolean(info.isPrefixPacketSize());
-    bs.writeBoolean(info.isTightEncodingEnabled());
+        rc += tightMarshalByteSequence1(info.getMarshalledProperties(), bs);
 
         return rc + 4;
     }
@@ -106,11 +106,9 @@
         WireFormatInfo info = (WireFormatInfo)o;
     tightMarshalConstByteArray2(info.getMagic(), dataOut, bs, 8);
     dataOut.writeInt(info.getVersion());
-    bs.readBoolean();
-    bs.readBoolean();
-    bs.readBoolean();
-    bs.readBoolean();
-    bs.readBoolean();
+    tightMarshalByteSequence2(info.getMarshalledProperties(), dataOut, bs);
+
+        info.afterMarshall(wireFormat);
 
     }
 
@@ -125,13 +123,14 @@
         super.looseUnmarshal(wireFormat, o, dataIn);
 
         WireFormatInfo info = (WireFormatInfo)o;
+
+        info.beforeUnmarshall(wireFormat);
+        
         info.setMagic(looseUnmarshalConstByteArray(dataIn, 8));
         info.setVersion(dataIn.readInt());
-        info.setCacheEnabled(dataIn.readBoolean());
-        info.setStackTraceEnabled(dataIn.readBoolean());
-        info.setTcpNoDelayEnabled(dataIn.readBoolean());
-        info.setPrefixPacketSize(dataIn.readBoolean());
-        info.setTightEncodingEnabled(dataIn.readBoolean());
+        info.setMarshalledProperties(looseUnmarshalByteSequence(dataIn));
+
+        info.afterUnmarshall(wireFormat);
 
     }
 
@@ -143,14 +142,12 @@
 
         WireFormatInfo info = (WireFormatInfo)o;
 
+        info.beforeMarshall(wireFormat);
+
         super.looseMarshal(wireFormat, o, dataOut);
     looseMarshalConstByteArray(wireFormat, info.getMagic(), dataOut, 8);
     dataOut.writeInt(info.getVersion());
-    dataOut.writeBoolean(info.isCacheEnabled());
-    dataOut.writeBoolean(info.isStackTraceEnabled());
-    dataOut.writeBoolean(info.isTcpNoDelayEnabled());
-    dataOut.writeBoolean(info.isPrefixPacketSize());
-    dataOut.writeBoolean(info.isTightEncodingEnabled());
+    looseMarshalByteSequence(wireFormat, info.getMarshalledProperties(), dataOut);
 
     }
 }

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

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java Mon Mar  6 18:32:50 2006
@@ -69,7 +69,7 @@
         super.oneway(command);
     }
 
-    protected WireFormatInfo createWireFormatInfo() {
+    protected WireFormatInfo createWireFormatInfo() throws IOException {
         WireFormatInfo info = new WireFormatInfo();
         info.setVersion(wireFormat.getVersion());
         if ( wireFormat instanceof OpenWireFormat ) {
@@ -98,20 +98,24 @@
                 wireFormat.setVersion(info.getVersion());
             }
             if ( wireFormat instanceof OpenWireFormat ) {
-                if( !info.isStackTraceEnabled() ) {
-                    ((OpenWireFormat)wireFormat).setStackTraceEnabled(false);
-                }
-                if( info.isTcpNoDelayEnabled() ) {
-                    ((OpenWireFormat)wireFormat).setTcpNoDelayEnabled(true);
-                }
-                if( !info.isCacheEnabled() ) {
-                    ((OpenWireFormat)wireFormat).setCacheEnabled(false);
-                }
-                if( !info.isPrefixPacketSize() ) {
-                    ((OpenWireFormat)wireFormat).setPrefixPacketSize(false);
-                }
-                if( !info.isTightEncodingEnabled() ) {
-                    ((OpenWireFormat)wireFormat).setTightEncodingEnabled(false);
+                try {
+                    if( !info.isStackTraceEnabled() ) {
+                        ((OpenWireFormat)wireFormat).setStackTraceEnabled(false);
+                    }
+                    if( info.isTcpNoDelayEnabled() ) {
+                        ((OpenWireFormat)wireFormat).setTcpNoDelayEnabled(true);
+                    }
+                    if( !info.isCacheEnabled() ) {
+                        ((OpenWireFormat)wireFormat).setCacheEnabled(false);
+                    }
+                    if( !info.isPrefixPacketSize() ) {
+                        ((OpenWireFormat)wireFormat).setPrefixPacketSize(false);
+                    }
+                    if( !info.isTightEncodingEnabled() ) {
+                        ((OpenWireFormat)wireFormat).setTightEncodingEnabled(false);
+                    }
+                } catch (IOException e) {
+                    commandListener.onException(e);
                 }
             }
                 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActiveIOTransport.java Mon Mar  6 18:32:50 2006
@@ -54,13 +54,13 @@
             public void onCommand(Object command) {
                 if (command.getClass() == WireFormatInfo.class) {
                     WireFormatInfo info = (WireFormatInfo) command;
-                    if (info.isTcpNoDelayEnabled()) {
-                        try {
+                    try {
+                        if (info.isTcpNoDelayEnabled()) {
                             enableTcpNodeDelay();
                         }
-                        catch (SocketException e) {
-                            onError(e);
-                        }
+                    }
+                    catch (IOException e) {
+                        onError(e);
                     }
                 }
                 transportListener.onCommand((Command) command);

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java Mon Mar  6 18:32:50 2006
@@ -16,6 +16,24 @@
  */
 package org.apache.activemq.openwire;
 
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.net.URI;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.activeio.ByteSequence;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
@@ -29,34 +47,16 @@
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.NetworkBridgeFilter;
 import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.command.SessionId;
 import org.apache.activemq.command.TransactionId;
+import org.apache.activemq.filter.BooleanExpression;
 import org.apache.activemq.openwire.v1.ActiveMQTextMessageTest;
 import org.apache.activemq.openwire.v1.BrokerInfoTest;
 import org.apache.activemq.openwire.v1.MessageAckTest;
 import org.apache.activemq.test.TestSupport;
 
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URL;
-import java.util.*;
-
-import junit.framework.TestCase;
-
 public abstract class DataFileGeneratorTestSupport extends TestSupport {
 
     protected static final Object[] EMPTY_ARGUMENTS = {};
@@ -316,4 +316,9 @@
         // exception each time
         return singletonException;
     }
+    
+    protected BooleanExpression createBooleanExpression(String string) {
+        return new NetworkBridgeFilter(new BrokerId(string), 10);
+    }
+
 }

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/ConsumerInfoTest.java Mon Mar  6 18:32:50 2006
@@ -70,6 +70,7 @@
 	            }
 	            info.setBrokerPath(value);
             }
+        info.setAdditionalPredicate(createBooleanExpression("AdditionalPredicate:6"));
         info.setNetworkSubscription(false);
 
             }

Added: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java?rev=383749&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.java (added)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/NetworkBridgeFilterTest.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.*;


/**
 * Test case for the OpenWire marshalling for NetworkBridgeFilter
 *
 *
 * 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 NetworkBridgeFilterTest extends DataFileGeneratorTestSupport {


    public static NetworkBridgeFilterTest SINGLETON = new NetworkBridgeFilterTest();

    public Object createObject() throws Exception {
    		NetworkBridgeFilter info = new NetworkBridgeFilter();
    		populateObject(info);
    		return info;
    }

    
    protected void populateObject(Object object) throws Exception {
    		super.populateObject(object);
    		NetworkBridgeFilter info = (NetworkBridgeFilter) object;
        info.setNetworkTTL(1);
        info.setNetworkBrokerId(createBrokerId("NetworkBrokerId:1"));

            }
        }
\ No newline at end of file

Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java Mon Mar  6 18:32:50 2006
@@ -51,11 +51,12 @@
     		super.populateObject(object);
     		WireFormatInfo info = (WireFormatInfo) object;
         info.setVersion(1);
-        info.setCacheEnabled(true);
-        info.setStackTraceEnabled(false);
-        info.setTcpNoDelayEnabled(true);
-        info.setPrefixPacketSize(false);
-        info.setTightEncodingEnabled(true);
+        
+    		{
+        		byte data[] = "MarshalledProperties:1".getBytes();
+        		info.setMarshalledProperties(new org.activeio.ByteSequence(data,0,data.length));
+    		}
+    		
 
             }
         }

Modified: incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj (original)
+++ incubator/activemq/trunk/activemq-dotnet/activemq-dotnet.csproj Mon Mar  6 18:32:50 2006
@@ -49,6 +49,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ActiveMQTextMessage.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ActiveMQTopic.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BaseCommand.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\BooleanExpression.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BrokerError.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BrokerId.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\BrokerInfo.cs"/>
@@ -80,6 +81,8 @@
         <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageDispatch.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageDispatchNotification.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageId.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\MessageReference.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\NetworkBridgeFilter.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ProducerId.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\ProducerInfo.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\RemoveInfo.cs"/>
@@ -93,6 +96,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\Commands\TransactionInfo.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\WireFormatInfo.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Commands\XATransactionId.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\Commands\Xid.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\Connection.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\ConnectionClosedException.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\ConnectionFactory.cs"/>
@@ -151,6 +155,7 @@
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MessageDispatchNotificationMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MessageIdMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\MessageMarshaller.cs"/>
+        <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\NetworkBridgeFilterMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\ProducerIdMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\ProducerInfoMarshaller.cs"/>
         <Compile Include="src\main\csharp\ActiveMQ\OpenWire\V1\RemoveInfoMarshaller.cs"/>

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs Mon Mar  6 18:32:50 2006
@@ -16,6 +16,7 @@
  */
 using ActiveMQ.Commands;
 using System;
+using ActiveMQ.OpenWire;
 
 namespace ActiveMQ.Commands
 {
@@ -137,6 +138,32 @@
                 return -1;
             }
         }
+		
+		public virtual void BeforeMarshall(OpenWireFormat wireFormat)
+		{
+		}
+		
+		public virtual void AfterMarshall(OpenWireFormat wireFormat)
+		{
+		}
+		
+		public virtual void BeforeUnmarshall(OpenWireFormat wireFormat)
+		{
+		}
+		
+		public virtual void AfterUnmarshall(OpenWireFormat wireFormat)
+		{
+		}
+		
+		public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data)
+		{
+		}
+		
+		public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat)
+		{
+			return null;
+		}
+		
     }
 }
 

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs Mon Mar  6 18:32:50 2006
@@ -1,316 +1,295 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * 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.
- */
-using ActiveMQ.OpenWire;
-using JMS;
-
-
-namespace ActiveMQ.Commands
-{
-	public delegate void AcknowledgeHandler(ActiveMQMessage message);
-}
-
-namespace ActiveMQ.Commands
-{
-	public class ActiveMQMessage : Message, IMessage, MarshallAware
-    {
-        public const byte ID_ActiveMQMessage = 23;
-        
-        protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper();
-        
-        private PrimitiveMap properties;
-        
-        public event AcknowledgeHandler Acknowledger;
-        
-        public static ActiveMQMessage Transform(IMessage message)
-        {
-            return (ActiveMQMessage) message;
-        }
-        
-        // TODO generate Equals method
-        // TODO generate GetHashCode method
-        
-        
-        public override byte GetDataStructureType()
-        {
-            return ID_ActiveMQMessage;
-        }
-        
-        public void Acknowledge()
-        {
-            if (Acknowledger == null)
-			{
-                throw new JMSException("No Acknowledger has been associated with this message: " + this);
-			}
-            else
-			{
-                Acknowledger(this);
-            }
-        }
-        
-        
-        // Properties
-        
-        public IPrimitiveMap Properties
-        {
-            get {
-                if (properties == null)
-                {
-                    properties = PrimitiveMap.Unmarshal(MarshalledProperties);
-                }
-                return properties;
-            }
-        }
-        
-        public IDestination FromDestination
-        {
-            get { return Destination; }
-            set { this.Destination = ActiveMQDestination.Transform(value); }
-        }
-        
-        
-        // IMessage interface
-        
-        // JMS headers
-        
-        /// <summary>
-        /// The correlation ID used to correlate messages with conversations or long running business processes
-        /// </summary>
-        public string JMSCorrelationID
-        {
-            get {
-                return CorrelationId;
-            }
-            set {
-                CorrelationId = value;
-            }
-        }
-        
-        /// <summary>
-        /// The destination of the message
-        /// </summary>
-        public IDestination JMSDestination
-        {
-            get {
-                return OriginalDestination;
-            }
-        }
-        
-        /// <summary>
-        /// The time in milliseconds that this message should expire in
-        /// </summary>
-        public long JMSExpiration
-        {
-            get {
-                return Expiration;
-            }
-            set {
-                Expiration = value;
-            }
-        }
-        
-        /// <summary>
-        /// The message ID which is set by the provider
-        /// </summary>
-        public string JMSMessageId
-        {
-            get {
-                return BaseDataStreamMarshaller.ToString(MessageId);
-            }
-        }
-        
-        /// <summary>
-        /// Whether or not this message is persistent
-        /// </summary>
-        public bool JMSPersistent
-        {
-            get {
-                return Persistent;
-            }
-            set {
-                Persistent = value;
-            }
-        }
-        
-        /// <summary>
-        /// The Priority on this message
-        /// </summary>
-        public byte JMSPriority
-        {
-            get {
-                return Priority;
-            }
-            set {
-                Priority = value;
-            }
-        }
-        
-        /// <summary>
-        /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully.
-        /// </summary>
-        public bool JMSRedelivered
-        {
-            get {
-                return RedeliveryCounter > 0;
-            }
-        }
-        
-        
-        /// <summary>
-        /// The destination that the consumer of this message should send replies to
-        /// </summary>
-        public IDestination JMSReplyTo
-        {
-            get {
-                return ReplyTo;
-            }
-            set {
-                ReplyTo = ActiveMQDestination.Transform(value);
-            }
-        }
-        
-        
-        /// <summary>
-        /// The timestamp the broker added to the message
-        /// </summary>
-        public long JMSTimestamp
-        {
-            get {
-                return Timestamp;
-            }
-        }
-        
-        /// <summary>
-        /// The type name of this message
-        /// </summary>
-        public string JMSType
-        {
-            get {
-                return Type;
-            }
-            set {
-                Type = value;
-            }
-        }
-        
-        
-        // JMS Extension headers
-        
-        /// <summary>
-        /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully.
-        /// </summary>
-        public int JMSXDeliveryCount
-        {
-            get {
-                return RedeliveryCounter + 1;
-            }
-        }
-        
-        
-        /// <summary>
-        /// The Message Group ID used to group messages together to the same consumer for the same group ID value
-        /// </summary>
-        public string JMSXGroupID
-        {
-            get {
-                return GroupID;
-            }
-            set {
-                GroupID = value;
-            }
-        }
-        /// <summary>
-        /// The Message Group Sequence counter to indicate the position in a group
-        /// </summary>
-        public int JMSXGroupSeq
-        {
-            get {
-                return GroupSequence;
-            }
-            set {
-                GroupSequence = value;
-            }
-        }
-        
-        /// <summary>
-        /// Returns the ID of the producers transaction
-        /// </summary>
-        public string JMSXProducerTXID
-        {
-            get {
-                TransactionId txnId = OriginalTransactionId;
-                if (txnId == null)
-                {
-                    txnId = TransactionId;
-                }
-                if (txnId != null)
-                {
-                    return BaseDataStreamMarshaller.ToString(txnId);
-                }
-                return null;
-            }
-        }
-        
-        public object GetObjectProperty(string name)
-        {
-            return propertyHelper.GetObjectProperty(this, name);
-        }
-        
-        public void SetObjectProperty(string name, object value)
-        {
-            propertyHelper.SetObjectProperty(this, name, value);
-        }
-        
-        // MarshallAware interface
-        
-        public override bool IsMarshallAware()
-        {
-            return true;
-        }
-        
-        public virtual void BeforeMarshall(OpenWireFormat wireFormat)
-        {
-            MarshalledProperties = null;
-            if (properties != null)
-            {
-                MarshalledProperties = properties.Marshal();
-            }
-        }
-        
-        public virtual void AfterMarshall(OpenWireFormat wireFormat)
-        {
-        }
-        
-        public virtual void BeforeUnmarshall(OpenWireFormat wireFormat)
-        {
-        }
-        
-        public virtual void AfterUnmarshall(OpenWireFormat wireFormat)
-        {
-        }
-        
-        public virtual void SetMarshalledForm(OpenWireFormat wireFormat, byte[] data)
-        {
-        }
-        
-        public virtual byte[] GetMarshalledForm(OpenWireFormat wireFormat)
-        {
-            return null;
-        }
-        
-    }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * 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.
+ */
+using ActiveMQ.OpenWire;
+using JMS;
+
+
+namespace ActiveMQ.Commands
+{
+	public delegate void AcknowledgeHandler(ActiveMQMessage message);
+}
+
+namespace ActiveMQ.Commands
+{
+	public class ActiveMQMessage : Message, IMessage, MarshallAware
+    {
+        public const byte ID_ActiveMQMessage = 23;
+        
+        protected static MessagePropertyHelper propertyHelper = new MessagePropertyHelper();
+        
+        private PrimitiveMap properties;
+        
+        public event AcknowledgeHandler Acknowledger;
+        
+        public static ActiveMQMessage Transform(IMessage message)
+        {
+            return (ActiveMQMessage) message;
+        }
+        
+        // TODO generate Equals method
+        // TODO generate GetHashCode method
+        
+        
+        public override byte GetDataStructureType()
+        {
+            return ID_ActiveMQMessage;
+        }
+        
+        public void Acknowledge()
+        {
+            if (Acknowledger == null)
+			{
+                throw new JMSException("No Acknowledger has been associated with this message: " + this);
+			}
+            else
+			{
+                Acknowledger(this);
+            }
+        }
+        
+        
+        // Properties
+        
+        public IPrimitiveMap Properties
+        {
+            get {
+                if (properties == null)
+                {
+                    properties = PrimitiveMap.Unmarshal(MarshalledProperties);
+                }
+                return properties;
+            }
+        }
+        
+        public IDestination FromDestination
+        {
+            get { return Destination; }
+            set { this.Destination = ActiveMQDestination.Transform(value); }
+        }
+        
+        
+        // IMessage interface
+        
+        // JMS headers
+        
+        /// <summary>
+        /// The correlation ID used to correlate messages with conversations or long running business processes
+        /// </summary>
+        public string JMSCorrelationID
+        {
+            get {
+                return CorrelationId;
+            }
+            set {
+                CorrelationId = value;
+            }
+        }
+        
+        /// <summary>
+        /// The destination of the message
+        /// </summary>
+        public IDestination JMSDestination
+        {
+            get {
+                return OriginalDestination;
+            }
+        }
+        
+        /// <summary>
+        /// The time in milliseconds that this message should expire in
+        /// </summary>
+        public long JMSExpiration
+        {
+            get {
+                return Expiration;
+            }
+            set {
+                Expiration = value;
+            }
+        }
+        
+        /// <summary>
+        /// The message ID which is set by the provider
+        /// </summary>
+        public string JMSMessageId
+        {
+            get {
+                return BaseDataStreamMarshaller.ToString(MessageId);
+            }
+        }
+        
+        /// <summary>
+        /// Whether or not this message is persistent
+        /// </summary>
+        public bool JMSPersistent
+        {
+            get {
+                return Persistent;
+            }
+            set {
+                Persistent = value;
+            }
+        }
+        
+        /// <summary>
+        /// The Priority on this message
+        /// </summary>
+        public byte JMSPriority
+        {
+            get {
+                return Priority;
+            }
+            set {
+                Priority = value;
+            }
+        }
+        
+        /// <summary>
+        /// Returns true if this message has been redelivered to this or another consumer before being acknowledged successfully.
+        /// </summary>
+        public bool JMSRedelivered
+        {
+            get {
+                return RedeliveryCounter > 0;
+            }
+        }
+        
+        
+        /// <summary>
+        /// The destination that the consumer of this message should send replies to
+        /// </summary>
+        public IDestination JMSReplyTo
+        {
+            get {
+                return ReplyTo;
+            }
+            set {
+                ReplyTo = ActiveMQDestination.Transform(value);
+            }
+        }
+        
+        
+        /// <summary>
+        /// The timestamp the broker added to the message
+        /// </summary>
+        public long JMSTimestamp
+        {
+            get {
+                return Timestamp;
+            }
+        }
+        
+        /// <summary>
+        /// The type name of this message
+        /// </summary>
+        public string JMSType
+        {
+            get {
+                return Type;
+            }
+            set {
+                Type = value;
+            }
+        }
+        
+        
+        // JMS Extension headers
+        
+        /// <summary>
+        /// Returns the number of times this message has been redelivered to other consumers without being acknowledged successfully.
+        /// </summary>
+        public int JMSXDeliveryCount
+        {
+            get {
+                return RedeliveryCounter + 1;
+            }
+        }
+        
+        
+        /// <summary>
+        /// The Message Group ID used to group messages together to the same consumer for the same group ID value
+        /// </summary>
+        public string JMSXGroupID
+        {
+            get {
+                return GroupID;
+            }
+            set {
+                GroupID = value;
+            }
+        }
+        /// <summary>
+        /// The Message Group Sequence counter to indicate the position in a group
+        /// </summary>
+        public int JMSXGroupSeq
+        {
+            get {
+                return GroupSequence;
+            }
+            set {
+                GroupSequence = value;
+            }
+        }
+        
+        /// <summary>
+        /// Returns the ID of the producers transaction
+        /// </summary>
+        public string JMSXProducerTXID
+        {
+            get {
+                TransactionId txnId = OriginalTransactionId;
+                if (txnId == null)
+                {
+                    txnId = TransactionId;
+                }
+                if (txnId != null)
+                {
+                    return BaseDataStreamMarshaller.ToString(txnId);
+                }
+                return null;
+            }
+        }
+        
+        public object GetObjectProperty(string name)
+        {
+            return propertyHelper.GetObjectProperty(this, name);
+        }
+        
+        public void SetObjectProperty(string name, object value)
+        {
+            propertyHelper.SetObjectProperty(this, name, value);
+        }
+        
+        // MarshallAware interface
+        public override bool IsMarshallAware()
+        {
+            return true;
+        }
+        
+        public override void BeforeMarshall(OpenWireFormat wireFormat)
+        {
+            MarshalledProperties = null;
+            if (properties != null)
+            {
+                MarshalledProperties = properties.Marshal();
+            }
+        }
+        
+        
+    }
+}
+

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs Mon Mar  6 18:32:50 2006
@@ -1,55 +1,56 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* 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.
-*/
-
-using System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.Commands;
-
-namespace ActiveMQ.Commands
-{
-    //
-    //  Marshalling code for Open Wire Format for ActiveMQObjectMessage
-    //
-    //
-    //  NOTE!: This file is autogenerated - do not modify!
-    //         if you need to make a change, please see the Groovy scripts in the
-    //         activemq-core module
-    //
-    public class ActiveMQObjectMessage : ActiveMQMessage
-    {
-        public const byte ID_ActiveMQObjectMessage = 26;
-    			
-
-		public override string ToString() {
-            return GetType().Name + "["
-                + " ]";
-
-		}
-	
-
-
-        public override byte GetDataStructureType() {
-            return ID_ActiveMQObjectMessage;
-        }
-
-
-        // Properties
-
-    }
-}
+/*
+* Copyright 2006 The Apache Software Foundation or its licensors, as
+* applicable.
+*
+* 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.
+*/
+
+using System;
+using System.Collections;
+
+using ActiveMQ.OpenWire;
+using ActiveMQ.Commands;
+using JMS;
+
+namespace ActiveMQ.Commands
+{
+    //
+    //  Marshalling code for Open Wire Format for ActiveMQObjectMessage
+    //
+    //
+    //  NOTE!: This file is autogenerated - do not modify!
+    //         if you need to make a change, please see the Groovy scripts in the
+    //         activemq-core module
+    //
+    public class ActiveMQObjectMessage : ActiveMQMessage
+    {
+        public const byte ID_ActiveMQObjectMessage = 26;
+    			
+
+		public override string ToString() {
+            return GetType().Name + "["
+                + " ]";
+
+		}
+	
+
+
+        public override byte GetDataStructureType() {
+            return ID_ActiveMQObjectMessage;
+        }
+
+
+        // Properties
+
+    }
+}

Added: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BooleanExpression.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BooleanExpression.cs?rev=383749&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BooleanExpression.cs (added)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BooleanExpression.cs Mon Mar  6 18:32:50 2006
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * 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.
+ */
+namespace ActiveMQ.Commands
+{
+	public interface BooleanExpression
+	{
+	}
+}

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs Mon Mar  6 18:32:50 2006
@@ -1,85 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* 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.
-*/
-
-using System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.Commands;
-
-namespace ActiveMQ.Commands
-{
-    //
-    //  Marshalling code for Open Wire Format for BrokerId
-    //
-    //
-    //  NOTE!: This file is autogenerated - do not modify!
-    //         if you need to make a change, please see the Groovy scripts in the
-    //         activemq-core module
-    //
-    public class BrokerId : AbstractCommand
-    {
-        public const byte ID_BrokerId = 124;
-    			
-        string value;
-
-		public override int GetHashCode() {
-            int answer = 0;
-            answer = (answer * 37) + HashCode(Value);
-            return answer;
-
-		}
-	
-
-		public override bool Equals(object that) {
-	    	if (that is BrokerId) {
-	    	    return Equals((BrokerId) that);
-			}
-			return false;
-    	}
-    
-		public virtual bool Equals(BrokerId that) {
-            if (! Equals(this.Value, that.Value)) return false;
-            return true;
-
-		}
-	
-
-		public override string ToString() {
-            return GetType().Name + "["
-                + " Value=" + Value
-                + " ]";
-
-		}
-	
-
-
-        public override byte GetDataStructureType() {
-            return ID_BrokerId;
-        }
-
-
-        // Properties
-
-        public string Value
-        {
-            get { return value; }
-            set { this.value = value; }            
-        }
-
-    }
-}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
    //
    //  Marshalling code for Open Wire Format for BrokerId
    //
    //
    //  NOTE!: This file is autogenerated - do not modify!
    //         if you need to make a change, please see the Groovy scripts in the
    //    
      activemq-core module
    //
    public class BrokerId : AbstractCommand, DataStructure
    {
        public const byte ID_BrokerId = 124;
    			
        string value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is BrokerId) {
	    	    return Equals((BrokerId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(BrokerId that) {
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_BrokerId;
        }


        // Properties

        public string Value
        {
            get { return value; }
            set { this.val
 ue = value; }            
        }

    }
}
\ No newline at end of file

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs Mon Mar  6 18:32:50 2006
@@ -1,95 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* 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.
-*/
-
-using System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.Commands;
-
-namespace ActiveMQ.Commands
-{
-    //
-    //  Marshalling code for Open Wire Format for BrokerInfo
-    //
-    //
-    //  NOTE!: This file is autogenerated - do not modify!
-    //         if you need to make a change, please see the Groovy scripts in the
-    //         activemq-core module
-    //
-    public class BrokerInfo : BaseCommand
-    {
-        public const byte ID_BrokerInfo = 2;
-    			
-        BrokerId brokerId;
-        string brokerURL;
-        BrokerInfo[] peerBrokerInfos;
-        string brokerName;
-        bool slaveBroker;
-
-		public override string ToString() {
-            return GetType().Name + "["
-                + " BrokerId=" + BrokerId
-                + " BrokerURL=" + BrokerURL
-                + " PeerBrokerInfos=" + PeerBrokerInfos
-                + " BrokerName=" + BrokerName
-                + " SlaveBroker=" + SlaveBroker
-                + " ]";
-
-		}
-	
-
-
-        public override byte GetDataStructureType() {
-            return ID_BrokerInfo;
-        }
-
-
-        // Properties
-
-        public BrokerId BrokerId
-        {
-            get { return brokerId; }
-            set { this.brokerId = value; }            
-        }
-
-        public string BrokerURL
-        {
-            get { return brokerURL; }
-            set { this.brokerURL = value; }            
-        }
-
-        public BrokerInfo[] PeerBrokerInfos
-        {
-            get { return peerBrokerInfos; }
-            set { this.peerBrokerInfos = value; }            
-        }
-
-        public string BrokerName
-        {
-            get { return brokerName; }
-            set { this.brokerName = value; }            
-        }
-
-        public bool SlaveBroker
-        {
-            get { return slaveBroker; }
-            set { this.slaveBroker = value; }            
-        }
-
-    }
-}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
    //
    //  Marshalling code for Open Wire Format for BrokerInfo
    //
    //
    //  NOTE!: This file is autogenerated - do not modify!
    //         if you need to make a change, please see the Groovy scripts in the
    //  
        activemq-core module
    //
    public class BrokerInfo : BaseCommand
    {
        public const byte ID_BrokerInfo = 2;
    			
        BrokerId brokerId;
        string brokerURL;
        BrokerInfo[] peerBrokerInfos;
        string brokerName;
        bool slaveBroker;

		public override string ToString() {
            return GetType().Name + "["
                + " BrokerId=" + BrokerId
                + " BrokerURL=" + BrokerURL
                + " PeerBrokerInfos=" + PeerBrokerInfos
                + " BrokerName=" + BrokerName
                + " SlaveBroker=" + SlaveBroker
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_BrokerInfo;
        }


        // Properties

        public BrokerId BrokerId
        {
            get { return brokerId; }
            set { this.brokerId = value; }            
        }

        public string BrokerURL
        {
            get { return brokerURL; }
            
 set { this.brokerURL = value; }            
        }

        public BrokerInfo[] PeerBrokerInfos
        {
            get { return peerBrokerInfos; }
            set { this.peerBrokerInfos = value; }            
        }

        public string BrokerName
        {
            get { return brokerName; }
            set { this.brokerName = value; }            
        }

        public bool SlaveBroker
        {
            get { return slaveBroker; }
            set { this.slaveBroker = value; }            
        }

    }
}
\ No newline at end of file

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs Mon Mar  6 18:32:50 2006
@@ -1,71 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* 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.
-*/
-
-using System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.Commands;
-
-namespace ActiveMQ.Commands
-{
-    //
-    //  Marshalling code for Open Wire Format for ConnectionError
-    //
-    //
-    //  NOTE!: This file is autogenerated - do not modify!
-    //         if you need to make a change, please see the Groovy scripts in the
-    //         activemq-core module
-    //
-    public class ConnectionError : BaseCommand
-    {
-        public const byte ID_ConnectionError = 16;
-    			
-        BrokerError exception;
-        ConnectionId connectionId;
-
-		public override string ToString() {
-            return GetType().Name + "["
-                + " Exception=" + Exception
-                + " ConnectionId=" + ConnectionId
-                + " ]";
-
-		}
-	
-
-
-        public override byte GetDataStructureType() {
-            return ID_ConnectionError;
-        }
-
-
-        // Properties
-
-        public BrokerError Exception
-        {
-            get { return exception; }
-            set { this.exception = value; }            
-        }
-
-        public ConnectionId ConnectionId
-        {
-            get { return connectionId; }
-            set { this.connectionId = value; }            
-        }
-
-    }
-}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
    //
    //  Marshalling code for Open Wire Format for ConnectionError
    //
    //
    //  NOTE!: This file is autogenerated - do not modify!
    //         if you need to make a change, please see the Groovy scripts in the
   
  //         activemq-core module
    //
    public class ConnectionError : BaseCommand
    {
        public const byte ID_ConnectionError = 16;
    			
        BrokerError exception;
        ConnectionId connectionId;

		public override string ToString() {
            return GetType().Name + "["
                + " Exception=" + Exception
                + " ConnectionId=" + ConnectionId
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_ConnectionError;
        }


        // Properties

        public BrokerError Exception
        {
            get { return exception; }
            set { this.exception = value; }            
        }

        public ConnectionId ConnectionId
        {
            get { return connectionId; }
            set { this.connectionId = value; }            
        }

    }
}
\ No newline at end of file

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs Mon Mar  6 18:32:50 2006
@@ -1,85 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* 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.
-*/
-
-using System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.Commands;
-
-namespace ActiveMQ.Commands
-{
-    //
-    //  Marshalling code for Open Wire Format for ConnectionId
-    //
-    //
-    //  NOTE!: This file is autogenerated - do not modify!
-    //         if you need to make a change, please see the Groovy scripts in the
-    //         activemq-core module
-    //
-    public class ConnectionId : AbstractCommand
-    {
-        public const byte ID_ConnectionId = 120;
-    			
-        string value;
-
-		public override int GetHashCode() {
-            int answer = 0;
-            answer = (answer * 37) + HashCode(Value);
-            return answer;
-
-		}
-	
-
-		public override bool Equals(object that) {
-	    	if (that is ConnectionId) {
-	    	    return Equals((ConnectionId) that);
-			}
-			return false;
-    	}
-    
-		public virtual bool Equals(ConnectionId that) {
-            if (! Equals(this.Value, that.Value)) return false;
-            return true;
-
-		}
-	
-
-		public override string ToString() {
-            return GetType().Name + "["
-                + " Value=" + Value
-                + " ]";
-
-		}
-	
-
-
-        public override byte GetDataStructureType() {
-            return ID_ConnectionId;
-        }
-
-
-        // Properties
-
-        public string Value
-        {
-            get { return value; }
-            set { this.value = value; }            
-        }
-
-    }
-}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
    //
    //  Marshalling code for Open Wire Format for ConnectionId
    //
    //
    //  NOTE!: This file is autogenerated - do not modify!
    //         if you need to make a change, please see the Groovy scripts in the
    //
          activemq-core module
    //
    public class ConnectionId : AbstractCommand, DataStructure
    {
        public const byte ID_ConnectionId = 120;
    			
        string value;

		public override int GetHashCode() {
            int answer = 0;
            answer = (answer * 37) + HashCode(Value);
            return answer;

		}
	

		public override bool Equals(object that) {
	    	if (that is ConnectionId) {
	    	    return Equals((ConnectionId) that);
			}
			return false;
    	}
    
		public virtual bool Equals(ConnectionId that) {
            if (! Equals(this.Value, that.Value)) return false;
            return true;

		}
	

		public override string ToString() {
            return GetType().Name + "["
                + " Value=" + Value
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_ConnectionId;
        }


        // Properties

        public string Value
        {
            get { return value; 
 }
            set { this.value = value; }            
        }

    }
}
\ No newline at end of file

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs?rev=383749&r1=383748&r2=383749&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs Mon Mar  6 18:32:50 2006
@@ -1,95 +1 @@
-/*
-* Copyright 2006 The Apache Software Foundation or its licensors, as
-* applicable.
-*
-* 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.
-*/
-
-using System;
-using System.Collections;
-
-using ActiveMQ.OpenWire;
-using ActiveMQ.Commands;
-
-namespace ActiveMQ.Commands
-{
-    //
-    //  Marshalling code for Open Wire Format for ConnectionInfo
-    //
-    //
-    //  NOTE!: This file is autogenerated - do not modify!
-    //         if you need to make a change, please see the Groovy scripts in the
-    //         activemq-core module
-    //
-    public class ConnectionInfo : BaseCommand
-    {
-        public const byte ID_ConnectionInfo = 3;
-    			
-        ConnectionId connectionId;
-        string clientId;
-        string password;
-        string userName;
-        BrokerId[] brokerPath;
-
-		public override string ToString() {
-            return GetType().Name + "["
-                + " ConnectionId=" + ConnectionId
-                + " ClientId=" + ClientId
-                + " Password=" + Password
-                + " UserName=" + UserName
-                + " BrokerPath=" + BrokerPath
-                + " ]";
-
-		}
-	
-
-
-        public override byte GetDataStructureType() {
-            return ID_ConnectionInfo;
-        }
-
-
-        // Properties
-
-        public ConnectionId ConnectionId
-        {
-            get { return connectionId; }
-            set { this.connectionId = value; }            
-        }
-
-        public string ClientId
-        {
-            get { return clientId; }
-            set { this.clientId = value; }            
-        }
-
-        public string Password
-        {
-            get { return password; }
-            set { this.password = value; }            
-        }
-
-        public string UserName
-        {
-            get { return userName; }
-            set { this.userName = value; }            
-        }
-
-        public BrokerId[] BrokerPath
-        {
-            get { return brokerPath; }
-            set { this.brokerPath = value; }            
-        }
-
-    }
-}
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* 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.
*/

using System;
using System.Collections;

using ActiveMQ.OpenWire;
using ActiveMQ.Commands;

namespace ActiveMQ.Commands
{
    //
    //  Marshalling code for Open Wire Format for ConnectionInfo
    //
    //
    //  NOTE!: This file is autogenerated - do not modify!
    //         if you need to make a change, please see the Groovy scripts in the
    
 //         activemq-core module
    //
    public class ConnectionInfo : BaseCommand
    {
        public const byte ID_ConnectionInfo = 3;
    			
        ConnectionId connectionId;
        string clientId;
        string password;
        string userName;
        BrokerId[] brokerPath;

		public override string ToString() {
            return GetType().Name + "["
                + " ConnectionId=" + ConnectionId
                + " ClientId=" + ClientId
                + " Password=" + Password
                + " UserName=" + UserName
                + " BrokerPath=" + BrokerPath
                + " ]";

		}
	


        public override byte GetDataStructureType() {
            return ID_ConnectionInfo;
        }


        // Properties

        public ConnectionId ConnectionId
        {
            get { return connectionId; }
            set { this.connectionId = value; }            
        }

        public string ClientId
        {
            get { return clientId; }
 
            set { this.clientId = value; }            
        }

        public string Password
        {
            get { return password; }
            set { this.password = value; }            
        }

        public string UserName
        {
            get { return userName; }
            set { this.userName = value; }            
        }

        public BrokerId[] BrokerPath
        {
            get { return brokerPath; }
            set { this.brokerPath = value; }            
        }

    }
}
\ No newline at end of file



Mime
View raw message