activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r465436 - in /incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ: Commands/ OpenWire/V2/
Date Thu, 19 Oct 2006 01:06:53 GMT
Author: chirino
Date: Wed Oct 18 18:06:52 2006
New Revision: 465436

URL: http://svn.apache.org/viewvc?view=rev&rev=465436
Log:
Regenerated the marshallers to chatch recent command changes

Modified:
    incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
    incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
    incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerControl.cs
    incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs
    incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConnectionInfoMarshaller.cs
    incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerControlMarshaller.cs
    incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/MarshallerFactory.cs

Modified: incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs?view=diff&rev=465436&r1=465435&r2=465436
==============================================================================
--- incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
(original)
+++ incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
Wed Oct 18 18:06:52 2006
@@ -42,6 +42,8 @@
         bool slaveBroker;
         bool masterBroker;
         bool faultTolerantConfiguration;
+        bool duplexConnection;
+        bool networkConnection;
 
 		public override string ToString() {
             return GetType().Name + "["
@@ -52,6 +54,8 @@
                 + " SlaveBroker=" + SlaveBroker
                 + " MasterBroker=" + MasterBroker
                 + " FaultTolerantConfiguration=" + FaultTolerantConfiguration
+                + " DuplexConnection=" + DuplexConnection
+                + " NetworkConnection=" + NetworkConnection
                 + " ]";
 
 		}
@@ -103,6 +107,18 @@
         {
             get { return faultTolerantConfiguration; }
             set { this.faultTolerantConfiguration = value; }            
+        }
+
+        public bool DuplexConnection
+        {
+            get { return duplexConnection; }
+            set { this.duplexConnection = value; }            
+        }
+
+        public bool NetworkConnection
+        {
+            get { return networkConnection; }
+            set { this.networkConnection = value; }            
         }
 
     }

Modified: incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs?view=diff&rev=465436&r1=465435&r2=465436
==============================================================================
--- incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
(original)
+++ incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
Wed Oct 18 18:06:52 2006
@@ -42,6 +42,7 @@
         BrokerId[] brokerPath;
         bool brokerMasterConnector;
         bool manageable;
+        bool clientMaster;
 
 		public override string ToString() {
             return GetType().Name + "["
@@ -52,6 +53,7 @@
                 + " BrokerPath=" + BrokerPath
                 + " BrokerMasterConnector=" + BrokerMasterConnector
                 + " Manageable=" + Manageable
+                + " ClientMaster=" + ClientMaster
                 + " ]";
 
 		}
@@ -103,6 +105,12 @@
         {
             get { return manageable; }
             set { this.manageable = value; }            
+        }
+
+        public bool ClientMaster
+        {
+            get { return clientMaster; }
+            set { this.clientMaster = value; }            
         }
 
     }

Modified: incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerControl.cs
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerControl.cs?view=diff&rev=465436&r1=465435&r2=465436
==============================================================================
--- incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerControl.cs
(original)
+++ incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/Commands/ConsumerControl.cs
Wed Oct 18 18:06:52 2006
@@ -38,12 +38,18 @@
         bool close;
         ConsumerId consumerId;
         int prefetch;
+        bool flush;
+        bool start;
+        bool stop;
 
 		public override string ToString() {
             return GetType().Name + "["
                 + " Close=" + Close
                 + " ConsumerId=" + ConsumerId
                 + " Prefetch=" + Prefetch
+                + " Flush=" + Flush
+                + " Start=" + Start
+                + " Stop=" + Stop
                 + " ]";
 
 		}
@@ -71,6 +77,24 @@
         {
             get { return prefetch; }
             set { this.prefetch = value; }            
+        }
+
+        public bool Flush
+        {
+            get { return flush; }
+            set { this.flush = value; }            
+        }
+
+        public bool Start
+        {
+            get { return start; }
+            set { this.start = value; }            
+        }
+
+        public bool Stop
+        {
+            get { return stop; }
+            set { this.stop = value; }            
         }
 
     }

Modified: incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs?view=diff&rev=465436&r1=465435&r2=465436
==============================================================================
--- incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs
(original)
+++ incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/BrokerInfoMarshaller.cs
Wed Oct 18 18:06:52 2006
@@ -74,6 +74,8 @@
         info.SlaveBroker = bs.ReadBoolean();
         info.MasterBroker = bs.ReadBoolean();
         info.FaultTolerantConfiguration = bs.ReadBoolean();
+        info.DuplexConnection = bs.ReadBoolean();
+        info.NetworkConnection = bs.ReadBoolean();
 
     }
 
@@ -91,6 +93,8 @@
         bs.WriteBoolean(info.SlaveBroker);
         bs.WriteBoolean(info.MasterBroker);
         bs.WriteBoolean(info.FaultTolerantConfiguration);
+        bs.WriteBoolean(info.DuplexConnection);
+        bs.WriteBoolean(info.NetworkConnection);
 
         return rc + 0;
     }
@@ -109,6 +113,8 @@
         bs.ReadBoolean();
         bs.ReadBoolean();
         bs.ReadBoolean();
+        bs.ReadBoolean();
+        bs.ReadBoolean();
 
     }
 
@@ -138,6 +144,8 @@
         info.SlaveBroker = dataIn.ReadBoolean();
         info.MasterBroker = dataIn.ReadBoolean();
         info.FaultTolerantConfiguration = dataIn.ReadBoolean();
+        info.DuplexConnection = dataIn.ReadBoolean();
+        info.NetworkConnection = dataIn.ReadBoolean();
 
     }
 
@@ -156,6 +164,8 @@
         dataOut.Write(info.SlaveBroker);
         dataOut.Write(info.MasterBroker);
         dataOut.Write(info.FaultTolerantConfiguration);
+        dataOut.Write(info.DuplexConnection);
+        dataOut.Write(info.NetworkConnection);
 
     }
   }

Modified: incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConnectionInfoMarshaller.cs
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConnectionInfoMarshaller.cs?view=diff&rev=465436&r1=465435&r2=465436
==============================================================================
--- incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConnectionInfoMarshaller.cs
(original)
+++ incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConnectionInfoMarshaller.cs
Wed Oct 18 18:06:52 2006
@@ -74,6 +74,7 @@
         }
         info.BrokerMasterConnector = bs.ReadBoolean();
         info.Manageable = bs.ReadBoolean();
+        info.ClientMaster = bs.ReadBoolean();
 
     }
 
@@ -91,6 +92,7 @@
         rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
         bs.WriteBoolean(info.BrokerMasterConnector);
         bs.WriteBoolean(info.Manageable);
+        bs.WriteBoolean(info.ClientMaster);
 
         return rc + 0;
     }
@@ -109,6 +111,7 @@
         TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
         bs.ReadBoolean();
         bs.ReadBoolean();
+        bs.ReadBoolean();
 
     }
 
@@ -138,6 +141,7 @@
         }
         info.BrokerMasterConnector = dataIn.ReadBoolean();
         info.Manageable = dataIn.ReadBoolean();
+        info.ClientMaster = dataIn.ReadBoolean();
 
     }
 
@@ -156,6 +160,7 @@
         LooseMarshalObjectArray(wireFormat, info.BrokerPath, dataOut);
         dataOut.Write(info.BrokerMasterConnector);
         dataOut.Write(info.Manageable);
+        dataOut.Write(info.ClientMaster);
 
     }
   }

Modified: incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerControlMarshaller.cs
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerControlMarshaller.cs?view=diff&rev=465436&r1=465435&r2=465436
==============================================================================
--- incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerControlMarshaller.cs
(original)
+++ incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/ConsumerControlMarshaller.cs
Wed Oct 18 18:06:52 2006
@@ -59,6 +59,9 @@
         info.Close = bs.ReadBoolean();
         info.ConsumerId = (ConsumerId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
         info.Prefetch = dataIn.ReadInt32();
+        info.Flush = bs.ReadBoolean();
+        info.Start = bs.ReadBoolean();
+        info.Stop = bs.ReadBoolean();
 
     }
 
@@ -71,6 +74,9 @@
         int rc = base.TightMarshal1(wireFormat, info, bs);
         bs.WriteBoolean(info.Close);
         rc += TightMarshalNestedObject1(wireFormat, (DataStructure)info.ConsumerId, bs);
+        bs.WriteBoolean(info.Flush);
+        bs.WriteBoolean(info.Start);
+        bs.WriteBoolean(info.Stop);
 
         return rc + 4;
     }
@@ -85,6 +91,9 @@
         bs.ReadBoolean();
         TightMarshalNestedObject2(wireFormat, (DataStructure)info.ConsumerId, dataOut, bs);
         dataOut.Write(info.Prefetch);
+        bs.ReadBoolean();
+        bs.ReadBoolean();
+        bs.ReadBoolean();
 
     }
 
@@ -99,6 +108,9 @@
         info.Close = dataIn.ReadBoolean();
         info.ConsumerId = (ConsumerId) LooseUnmarshalNestedObject(wireFormat, dataIn);
         info.Prefetch = dataIn.ReadInt32();
+        info.Flush = dataIn.ReadBoolean();
+        info.Start = dataIn.ReadBoolean();
+        info.Stop = dataIn.ReadBoolean();
 
     }
 
@@ -113,6 +125,9 @@
         dataOut.Write(info.Close);
         LooseMarshalNestedObject(wireFormat, (DataStructure)info.ConsumerId, dataOut);
         dataOut.Write(info.Prefetch);
+        dataOut.Write(info.Flush);
+        dataOut.Write(info.Start);
+        dataOut.Write(info.Stop);
 
     }
   }

Modified: incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/MarshallerFactory.cs
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/MarshallerFactory.cs?view=diff&rev=465436&r1=465435&r2=465436
==============================================================================
--- incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/MarshallerFactory.cs
(original)
+++ incubator/activemq/activemq-dotnet/trunk/src/main/csharp/ActiveMQ/OpenWire/V2/MarshallerFactory.cs
Wed Oct 18 18:06:52 2006
@@ -34,11 +34,10 @@
 	/// <summary>
 	/// Used to create marshallers for a specific version of the wire protocol
 	/// </summary>
-    public class MarshallerFactory : IMarshallerFactory
+    public class MarshallerFactory
     {
         public void configure(OpenWireFormat format) 
         {
-            format.clearMarshallers();
             format.addMarshaller(new ActiveMQBytesMessageMarshaller());
             format.addMarshaller(new ActiveMQMapMessageMarshaller());
             format.addMarshaller(new ActiveMQMessageMarshaller());



Mime
View raw message