activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r799407 [5/29] - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp: ./ Commands/ OpenWire/ OpenWire/V1/ OpenWire/V2/ OpenWire/V3/ OpenWire/V4/ OpenWire/V5/ State/ Transport/
Date Thu, 30 Jul 2009 19:06:44 GMT
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/OpenWireFormat.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/OpenWireFormat.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/OpenWireFormat.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/OpenWireFormat.cs Thu Jul 30 19:06:34 2009
@@ -25,429 +25,429 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire
 {
-	/// <summary>
-	/// Implements the <a href="http://activemq.apache.org/openwire.html">OpenWire</a> protocol.
-	/// </summary>
-	public class OpenWireFormat : IWireFormat
-	{
-		private readonly object marshalLock = new object();
-		private BaseDataStreamMarshaller[] dataMarshallers;
-		private const byte NULL_TYPE = 0;
-
-		private int version;
-		private bool cacheEnabled = false;
-		private bool stackTraceEnabled = false;
-		private bool tcpNoDelayEnabled = false;
-		private bool sizePrefixDisabled = false;
-		private bool tightEncodingEnabled = false;
-		private long maxInactivityDuration = 0;
-		private long maxInactivityDurationInitialDelay = 0;
-		private int cacheSize = 0;
-		private int minimumVersion = 1;
-
-		private WireFormatInfo preferedWireFormatInfo = new WireFormatInfo();
-		private ITransport transport;
-
-		public OpenWireFormat()
-		{
-			// See the following link for defaults: http://activemq.apache.org/configuring-wire-formats.html
-			// See also the following link for OpenWire format info: http://activemq.apache.org/openwire-version-2-specification.html
-			PreferedWireFormatInfo.CacheEnabled = false;
-			PreferedWireFormatInfo.StackTraceEnabled = false;
-			PreferedWireFormatInfo.TcpNoDelayEnabled = true;
-			PreferedWireFormatInfo.SizePrefixDisabled = false;
-			PreferedWireFormatInfo.TightEncodingEnabled = false;
-			PreferedWireFormatInfo.MaxInactivityDuration = 30000;
-			PreferedWireFormatInfo.MaxInactivityDurationInitialDelay = 10000;
-			PreferedWireFormatInfo.CacheSize = 0;
-			PreferedWireFormatInfo.Version = 2;
-
-			dataMarshallers = new BaseDataStreamMarshaller[256];
-			Version = 1;
-		}
-
-		public ITransport Transport
-		{
-			get { return transport; }
-			set { transport = value; }
-		}
-
-		public int Version
-		{
-			get { return version; }
-			set
-			{
-				Assembly dll = Assembly.GetExecutingAssembly();
-				Type type = dll.GetType("Apache.NMS.ActiveMQ.OpenWire.V" + value + ".MarshallerFactory", false);
-				IMarshallerFactory factory = (IMarshallerFactory) Activator.CreateInstance(type);
-				factory.configure(this);
-				version = value;
-			}
-		}
-
-		public bool CacheEnabled
-		{
-			get { return cacheEnabled; }
-			set { cacheEnabled = value; }
-		}
-
-		public bool StackTraceEnabled
-		{
-			get { return stackTraceEnabled; }
-			set { stackTraceEnabled = value; }
-		}
-
-		public bool TcpNoDelayEnabled
-		{
-			get { return tcpNoDelayEnabled; }
-			set { tcpNoDelayEnabled = value; }
-		}
-
-		public bool SizePrefixDisabled
-		{
-			get { return sizePrefixDisabled; }
-			set { sizePrefixDisabled = value; }
-		}
-
-		public bool TightEncodingEnabled
-		{
-			get { return tightEncodingEnabled; }
-			set { tightEncodingEnabled = value; }
-		}
-
-		public long MaxInactivityDuration
-		{
-			get { return maxInactivityDuration; }
-			set { maxInactivityDuration = value; }
-		}
-
-		public long MaxInactivityDurationInitialDelay
-		{
-			get { return maxInactivityDurationInitialDelay; }
-			set { maxInactivityDurationInitialDelay = value; }
-		}
-
-		public int CacheSize
-		{
-			get { return cacheSize; }
-			set { cacheSize = value; }
-		}
-
-		public WireFormatInfo PreferedWireFormatInfo
-		{
-			get { return preferedWireFormatInfo; }
-			set { preferedWireFormatInfo = value; }
-		}
-
-		public void clearMarshallers()
-		{
-			lock(this.marshalLock)
-			{
-				for(int i = 0; i < dataMarshallers.Length; i++)
-				{
-					dataMarshallers[i] = null;
-				}
-			}
-		}
-
-		public void addMarshaller(BaseDataStreamMarshaller marshaller)
-		{
-			byte type = marshaller.GetDataStructureType();
-			lock(this.marshalLock)
-			{
-				dataMarshallers[type & 0xFF] = marshaller;
-			}
-		}
-
-		private BaseDataStreamMarshaller GetDataStreamMarshallerForType(byte dataType)
-		{
-			BaseDataStreamMarshaller dsm = this.dataMarshallers[dataType & 0xFF];
-			if(null == dsm)
-			{
-				throw new IOException("Unknown data type: " + dataType);
-			}
-			return dsm;
-		}
-
-		public void Marshal(Object o, BinaryWriter ds)
-		{
-			int size = 1;
-			if(o != null)
-			{
-				DataStructure c = (DataStructure) o;
-				byte type = c.GetDataStructureType();
-				BaseDataStreamMarshaller dsm;
-				bool _tightEncodingEnabled;
-				bool _sizePrefixDisabled;
-
-				lock(this.marshalLock)
-				{
-					dsm = GetDataStreamMarshallerForType(type);
-					_tightEncodingEnabled = this.tightEncodingEnabled;
-					_sizePrefixDisabled = this.sizePrefixDisabled;
-				}
-
-				if(_tightEncodingEnabled)
-				{
-					BooleanStream bs = new BooleanStream();
-					size += dsm.TightMarshal1(this, c, bs);
-					size += bs.MarshalledSize();
-
-					if(!_sizePrefixDisabled)
-					{
-						ds.Write(size);
-					}
-
-					ds.Write(type);
-					bs.Marshal(ds);
-					dsm.TightMarshal2(this, c, ds, bs);
-				}
-				else
-				{
-					BinaryWriter looseOut = ds;
-					MemoryStream ms = null;
-
-					// If we are prefixing then we need to first write it to memory,
-					// otherwise we can write direct to the stream.
-					if(!_sizePrefixDisabled)
-					{
-						ms = new MemoryStream();
-						looseOut = new OpenWireBinaryWriter(ms);
-						looseOut.Write(size);
-					}
-
-					looseOut.Write(type);
-					dsm.LooseMarshal(this, c, looseOut);
-
-					if(!_sizePrefixDisabled)
-					{
-						ms.Position = 0;
-						looseOut.Write((int) ms.Length - 4);
-						ds.Write(ms.GetBuffer(), 0, (int) ms.Length);
-					}
-				}
-			}
-			else
-			{
-				ds.Write(size);
-				ds.Write(NULL_TYPE);
-			}
-		}
-
-		public Object Unmarshal(BinaryReader dis)
-		{
-			// lets ignore the size of the packet
-			if(!sizePrefixDisabled)
-			{
-				dis.ReadInt32();
-			}
-
-			// first byte is the type of the packet
-			byte dataType = dis.ReadByte();
-
-			if(dataType != NULL_TYPE)
-			{
-				BaseDataStreamMarshaller dsm;
-				bool _tightEncodingEnabled;
-
-				lock(this.marshalLock)
-				{
-					dsm = GetDataStreamMarshallerForType(dataType);
-					_tightEncodingEnabled = this.tightEncodingEnabled;
-				}
-
-				Tracer.Debug("Parsing type: " + dataType + " with: " + dsm);
-				Object data = dsm.CreateObject();
-
-				if(_tightEncodingEnabled)
-				{
-					BooleanStream bs = new BooleanStream();
-					bs.Unmarshal(dis);
-					dsm.TightUnmarshal(this, data, dis, bs);
-					return data;
-				}
-				else
-				{
-					dsm.LooseUnmarshal(this, data, dis);
-					return data;
-				}
-			}
-			else
-			{
-				return null;
-			}
-		}
-
-		public int TightMarshalNestedObject1(DataStructure o, BooleanStream bs)
-		{
-			bs.WriteBoolean(o != null);
-			if(null == o)
-			{
-				return 0;
-			}
-
-			if(o.IsMarshallAware())
-			{
-				MarshallAware ma = (MarshallAware) o;
-				byte[] sequence = ma.GetMarshalledForm(this);
-				bs.WriteBoolean(sequence != null);
-				if(sequence != null)
-				{
-					return 1 + sequence.Length;
-				}
-			}
-
-			byte type = o.GetDataStructureType();
-			if(type == 0)
-			{
-				throw new IOException("No valid data structure type for: " + o + " of type: " + o.GetType());
-			}
-
-			BaseDataStreamMarshaller dsm;
-			lock(this.marshalLock)
-			{
-				dsm = GetDataStreamMarshallerForType(type);
-			}
-
-			Tracer.Debug("Marshalling type: " + type + " with structure: " + o);
-			return 1 + dsm.TightMarshal1(this, o, bs);
-		}
-
-		public void TightMarshalNestedObject2(DataStructure o, BinaryWriter ds, BooleanStream bs)
-		{
-			if(!bs.ReadBoolean())
-			{
-				return;
-			}
-
-			byte type = o.GetDataStructureType();
-			ds.Write(type);
-
-			if(o.IsMarshallAware() && bs.ReadBoolean())
-			{
-				MarshallAware ma = (MarshallAware) o;
-				byte[] sequence = ma.GetMarshalledForm(this);
-				ds.Write(sequence, 0, sequence.Length);
-			}
-			else
-			{
-				BaseDataStreamMarshaller dsm;
-
-				lock(this.marshalLock)
-				{
-					dsm = GetDataStreamMarshallerForType(type);
-				}
-
-				dsm.TightMarshal2(this, o, ds, bs);
-			}
-		}
-
-		public DataStructure TightUnmarshalNestedObject(BinaryReader dis, BooleanStream bs)
-		{
-			if(bs.ReadBoolean())
-			{
-				DataStructure data;
-				BaseDataStreamMarshaller dsm;
-				byte dataType = dis.ReadByte();
-
-				lock(this.marshalLock)
-				{
-					dsm = GetDataStreamMarshallerForType(dataType);
-				}
-
-				data = dsm.CreateObject();
-				if(data.IsMarshallAware() && bs.ReadBoolean())
-				{
-					dis.ReadInt32();
-					dis.ReadByte();
-
-					BooleanStream bs2 = new BooleanStream();
-					bs2.Unmarshal(dis);
-					dsm.TightUnmarshal(this, data, dis, bs2);
-
-					// TODO: extract the sequence from the dis and associate it.
-					//                MarshallAware ma = (MarshallAware)data
-					//                ma.setCachedMarshalledForm(this, sequence);
-				}
-				else
-				{
-					dsm.TightUnmarshal(this, data, dis, bs);
-				}
-
-				return data;
-			}
-			else
-			{
-				return null;
-			}
-		}
-
-		public void LooseMarshalNestedObject(DataStructure o, BinaryWriter dataOut)
-		{
-			dataOut.Write(o != null);
-			if(o != null)
-			{
-				BaseDataStreamMarshaller dsm;
-				byte type = o.GetDataStructureType();
-				dataOut.Write(type);
-
-				lock(this.marshalLock)
-				{
-					dsm = GetDataStreamMarshallerForType(type);
-				}
-
-				dsm.LooseMarshal(this, o, dataOut);
-			}
-		}
-
-		public DataStructure LooseUnmarshalNestedObject(BinaryReader dis)
-		{
-			if(dis.ReadBoolean())
-			{
-				BaseDataStreamMarshaller dsm;
-				byte dataType = dis.ReadByte();
-				DataStructure data;
-
-				lock(this.marshalLock)
-				{
-					dsm = GetDataStreamMarshallerForType(dataType);
-				}
-
-				data = dsm.CreateObject();
-				dsm.LooseUnmarshal(this, data, dis);
-				return data;
-			}
-			else
-			{
-				return null;
-			}
-		}
-
-		public void renegotiateWireFormat(WireFormatInfo info)
-		{
-			lock(this.marshalLock)
-			{
-				if(info.Version < minimumVersion)
-				{
-					throw new IOException("Remote wire format (" + info.Version + ") is lower than the minimum version required (" + minimumVersion + ")");
-				}
-
-				this.Version = Math.Min(PreferedWireFormatInfo.Version, info.Version);
-				this.cacheEnabled = info.CacheEnabled && PreferedWireFormatInfo.CacheEnabled;
-				this.stackTraceEnabled = info.StackTraceEnabled && PreferedWireFormatInfo.StackTraceEnabled;
-				this.tcpNoDelayEnabled = info.TcpNoDelayEnabled && PreferedWireFormatInfo.TcpNoDelayEnabled;
-				this.sizePrefixDisabled = info.SizePrefixDisabled && PreferedWireFormatInfo.SizePrefixDisabled;
-				this.tightEncodingEnabled = info.TightEncodingEnabled && PreferedWireFormatInfo.TightEncodingEnabled;
-				this.maxInactivityDuration = info.MaxInactivityDuration;
-				this.maxInactivityDurationInitialDelay = info.MaxInactivityDurationInitialDelay;
-				this.cacheSize = info.CacheSize;
-
-				TcpTransport tcpTransport = this.transport as TcpTransport;
-				if(null != tcpTransport)
-				{
-					tcpTransport.TcpNoDelayEnabled = this.tcpNoDelayEnabled;
-				}
-			}
-		}
-	}
+    /// <summary>
+    /// Implements the <a href="http://activemq.apache.org/openwire.html">OpenWire</a> protocol.
+    /// </summary>
+    public class OpenWireFormat : IWireFormat
+    {
+        private readonly object marshalLock = new object();
+        private BaseDataStreamMarshaller[] dataMarshallers;
+        private const byte NULL_TYPE = 0;
+
+        private int version;
+        private bool cacheEnabled = false;
+        private bool stackTraceEnabled = false;
+        private bool tcpNoDelayEnabled = false;
+        private bool sizePrefixDisabled = false;
+        private bool tightEncodingEnabled = false;
+        private long maxInactivityDuration = 0;
+        private long maxInactivityDurationInitialDelay = 0;
+        private int cacheSize = 0;
+        private int minimumVersion = 1;
+
+        private WireFormatInfo preferedWireFormatInfo = new WireFormatInfo();
+        private ITransport transport;
+
+        public OpenWireFormat()
+        {
+            // See the following link for defaults: http://activemq.apache.org/configuring-wire-formats.html
+            // See also the following link for OpenWire format info: http://activemq.apache.org/openwire-version-2-specification.html
+            PreferedWireFormatInfo.CacheEnabled = false;
+            PreferedWireFormatInfo.StackTraceEnabled = false;
+            PreferedWireFormatInfo.TcpNoDelayEnabled = true;
+            PreferedWireFormatInfo.SizePrefixDisabled = false;
+            PreferedWireFormatInfo.TightEncodingEnabled = false;
+            PreferedWireFormatInfo.MaxInactivityDuration = 30000;
+            PreferedWireFormatInfo.MaxInactivityDurationInitialDelay = 10000;
+            PreferedWireFormatInfo.CacheSize = 0;
+            PreferedWireFormatInfo.Version = 2;
+
+            dataMarshallers = new BaseDataStreamMarshaller[256];
+            Version = 1;
+        }
+
+        public ITransport Transport
+        {
+            get { return transport; }
+            set { transport = value; }
+        }
+
+        public int Version
+        {
+            get { return version; }
+            set
+            {
+                Assembly dll = Assembly.GetExecutingAssembly();
+                Type type = dll.GetType("Apache.NMS.ActiveMQ.OpenWire.V" + value + ".MarshallerFactory", false);
+                IMarshallerFactory factory = (IMarshallerFactory) Activator.CreateInstance(type);
+                factory.configure(this);
+                version = value;
+            }
+        }
+
+        public bool CacheEnabled
+        {
+            get { return cacheEnabled; }
+            set { cacheEnabled = value; }
+        }
+
+        public bool StackTraceEnabled
+        {
+            get { return stackTraceEnabled; }
+            set { stackTraceEnabled = value; }
+        }
+
+        public bool TcpNoDelayEnabled
+        {
+            get { return tcpNoDelayEnabled; }
+            set { tcpNoDelayEnabled = value; }
+        }
+
+        public bool SizePrefixDisabled
+        {
+            get { return sizePrefixDisabled; }
+            set { sizePrefixDisabled = value; }
+        }
+
+        public bool TightEncodingEnabled
+        {
+            get { return tightEncodingEnabled; }
+            set { tightEncodingEnabled = value; }
+        }
+
+        public long MaxInactivityDuration
+        {
+            get { return maxInactivityDuration; }
+            set { maxInactivityDuration = value; }
+        }
+
+        public long MaxInactivityDurationInitialDelay
+        {
+            get { return maxInactivityDurationInitialDelay; }
+            set { maxInactivityDurationInitialDelay = value; }
+        }
+
+        public int CacheSize
+        {
+            get { return cacheSize; }
+            set { cacheSize = value; }
+        }
+
+        public WireFormatInfo PreferedWireFormatInfo
+        {
+            get { return preferedWireFormatInfo; }
+            set { preferedWireFormatInfo = value; }
+        }
+
+        public void clearMarshallers()
+        {
+            lock(this.marshalLock)
+            {
+                for(int i = 0; i < dataMarshallers.Length; i++)
+                {
+                    dataMarshallers[i] = null;
+                }
+            }
+        }
+
+        public void addMarshaller(BaseDataStreamMarshaller marshaller)
+        {
+            byte type = marshaller.GetDataStructureType();
+            lock(this.marshalLock)
+            {
+                dataMarshallers[type & 0xFF] = marshaller;
+            }
+        }
+
+        private BaseDataStreamMarshaller GetDataStreamMarshallerForType(byte dataType)
+        {
+            BaseDataStreamMarshaller dsm = this.dataMarshallers[dataType & 0xFF];
+            if(null == dsm)
+            {
+                throw new IOException("Unknown data type: " + dataType);
+            }
+            return dsm;
+        }
+
+        public void Marshal(Object o, BinaryWriter ds)
+        {
+            int size = 1;
+            if(o != null)
+            {
+                DataStructure c = (DataStructure) o;
+                byte type = c.GetDataStructureType();
+                BaseDataStreamMarshaller dsm;
+                bool _tightEncodingEnabled;
+                bool _sizePrefixDisabled;
+
+                lock(this.marshalLock)
+                {
+                    dsm = GetDataStreamMarshallerForType(type);
+                    _tightEncodingEnabled = this.tightEncodingEnabled;
+                    _sizePrefixDisabled = this.sizePrefixDisabled;
+                }
+
+                if(_tightEncodingEnabled)
+                {
+                    BooleanStream bs = new BooleanStream();
+                    size += dsm.TightMarshal1(this, c, bs);
+                    size += bs.MarshalledSize();
+
+                    if(!_sizePrefixDisabled)
+                    {
+                        ds.Write(size);
+                    }
+
+                    ds.Write(type);
+                    bs.Marshal(ds);
+                    dsm.TightMarshal2(this, c, ds, bs);
+                }
+                else
+                {
+                    BinaryWriter looseOut = ds;
+                    MemoryStream ms = null;
+
+                    // If we are prefixing then we need to first write it to memory,
+                    // otherwise we can write direct to the stream.
+                    if(!_sizePrefixDisabled)
+                    {
+                        ms = new MemoryStream();
+                        looseOut = new OpenWireBinaryWriter(ms);
+                        looseOut.Write(size);
+                    }
+
+                    looseOut.Write(type);
+                    dsm.LooseMarshal(this, c, looseOut);
+
+                    if(!_sizePrefixDisabled)
+                    {
+                        ms.Position = 0;
+                        looseOut.Write((int) ms.Length - 4);
+                        ds.Write(ms.GetBuffer(), 0, (int) ms.Length);
+                    }
+                }
+            }
+            else
+            {
+                ds.Write(size);
+                ds.Write(NULL_TYPE);
+            }
+        }
+
+        public Object Unmarshal(BinaryReader dis)
+        {
+            // lets ignore the size of the packet
+            if(!sizePrefixDisabled)
+            {
+                dis.ReadInt32();
+            }
+
+            // first byte is the type of the packet
+            byte dataType = dis.ReadByte();
+
+            if(dataType != NULL_TYPE)
+            {
+                BaseDataStreamMarshaller dsm;
+                bool _tightEncodingEnabled;
+
+                lock(this.marshalLock)
+                {
+                    dsm = GetDataStreamMarshallerForType(dataType);
+                    _tightEncodingEnabled = this.tightEncodingEnabled;
+                }
+
+                Tracer.Debug("Parsing type: " + dataType + " with: " + dsm);
+                Object data = dsm.CreateObject();
+
+                if(_tightEncodingEnabled)
+                {
+                    BooleanStream bs = new BooleanStream();
+                    bs.Unmarshal(dis);
+                    dsm.TightUnmarshal(this, data, dis, bs);
+                    return data;
+                }
+                else
+                {
+                    dsm.LooseUnmarshal(this, data, dis);
+                    return data;
+                }
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public int TightMarshalNestedObject1(DataStructure o, BooleanStream bs)
+        {
+            bs.WriteBoolean(o != null);
+            if(null == o)
+            {
+                return 0;
+            }
+
+            if(o.IsMarshallAware())
+            {
+                MarshallAware ma = (MarshallAware) o;
+                byte[] sequence = ma.GetMarshalledForm(this);
+                bs.WriteBoolean(sequence != null);
+                if(sequence != null)
+                {
+                    return 1 + sequence.Length;
+                }
+            }
+
+            byte type = o.GetDataStructureType();
+            if(type == 0)
+            {
+                throw new IOException("No valid data structure type for: " + o + " of type: " + o.GetType());
+            }
+
+            BaseDataStreamMarshaller dsm;
+            lock(this.marshalLock)
+            {
+                dsm = GetDataStreamMarshallerForType(type);
+            }
+
+            Tracer.Debug("Marshalling type: " + type + " with structure: " + o);
+            return 1 + dsm.TightMarshal1(this, o, bs);
+        }
+
+        public void TightMarshalNestedObject2(DataStructure o, BinaryWriter ds, BooleanStream bs)
+        {
+            if(!bs.ReadBoolean())
+            {
+                return;
+            }
+
+            byte type = o.GetDataStructureType();
+            ds.Write(type);
+
+            if(o.IsMarshallAware() && bs.ReadBoolean())
+            {
+                MarshallAware ma = (MarshallAware) o;
+                byte[] sequence = ma.GetMarshalledForm(this);
+                ds.Write(sequence, 0, sequence.Length);
+            }
+            else
+            {
+                BaseDataStreamMarshaller dsm;
+
+                lock(this.marshalLock)
+                {
+                    dsm = GetDataStreamMarshallerForType(type);
+                }
+
+                dsm.TightMarshal2(this, o, ds, bs);
+            }
+        }
+
+        public DataStructure TightUnmarshalNestedObject(BinaryReader dis, BooleanStream bs)
+        {
+            if(bs.ReadBoolean())
+            {
+                DataStructure data;
+                BaseDataStreamMarshaller dsm;
+                byte dataType = dis.ReadByte();
+
+                lock(this.marshalLock)
+                {
+                    dsm = GetDataStreamMarshallerForType(dataType);
+                }
+
+                data = dsm.CreateObject();
+                if(data.IsMarshallAware() && bs.ReadBoolean())
+                {
+                    dis.ReadInt32();
+                    dis.ReadByte();
+
+                    BooleanStream bs2 = new BooleanStream();
+                    bs2.Unmarshal(dis);
+                    dsm.TightUnmarshal(this, data, dis, bs2);
+
+                    // TODO: extract the sequence from the dis and associate it.
+                    //                MarshallAware ma = (MarshallAware)data
+                    //                ma.setCachedMarshalledForm(this, sequence);
+                }
+                else
+                {
+                    dsm.TightUnmarshal(this, data, dis, bs);
+                }
+
+                return data;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public void LooseMarshalNestedObject(DataStructure o, BinaryWriter dataOut)
+        {
+            dataOut.Write(o != null);
+            if(o != null)
+            {
+                BaseDataStreamMarshaller dsm;
+                byte type = o.GetDataStructureType();
+                dataOut.Write(type);
+
+                lock(this.marshalLock)
+                {
+                    dsm = GetDataStreamMarshallerForType(type);
+                }
+
+                dsm.LooseMarshal(this, o, dataOut);
+            }
+        }
+
+        public DataStructure LooseUnmarshalNestedObject(BinaryReader dis)
+        {
+            if(dis.ReadBoolean())
+            {
+                BaseDataStreamMarshaller dsm;
+                byte dataType = dis.ReadByte();
+                DataStructure data;
+
+                lock(this.marshalLock)
+                {
+                    dsm = GetDataStreamMarshallerForType(dataType);
+                }
+
+                data = dsm.CreateObject();
+                dsm.LooseUnmarshal(this, data, dis);
+                return data;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public void renegotiateWireFormat(WireFormatInfo info)
+        {
+            lock(this.marshalLock)
+            {
+                if(info.Version < minimumVersion)
+                {
+                    throw new IOException("Remote wire format (" + info.Version + ") is lower than the minimum version required (" + minimumVersion + ")");
+                }
+
+                this.Version = Math.Min(PreferedWireFormatInfo.Version, info.Version);
+                this.cacheEnabled = info.CacheEnabled && PreferedWireFormatInfo.CacheEnabled;
+                this.stackTraceEnabled = info.StackTraceEnabled && PreferedWireFormatInfo.StackTraceEnabled;
+                this.tcpNoDelayEnabled = info.TcpNoDelayEnabled && PreferedWireFormatInfo.TcpNoDelayEnabled;
+                this.sizePrefixDisabled = info.SizePrefixDisabled && PreferedWireFormatInfo.SizePrefixDisabled;
+                this.tightEncodingEnabled = info.TightEncodingEnabled && PreferedWireFormatInfo.TightEncodingEnabled;
+                this.maxInactivityDuration = info.MaxInactivityDuration;
+                this.maxInactivityDurationInitialDelay = info.MaxInactivityDurationInitialDelay;
+                this.cacheSize = info.CacheSize;
+
+                TcpTransport tcpTransport = this.transport as TcpTransport;
+                if(null != tcpTransport)
+                {
+                    tcpTransport.TcpNoDelayEnabled = this.tcpNoDelayEnabled;
+                }
+            }
+        }
+    }
 }

Added: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQBlobMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQBlobMessageMarshaller.cs?rev=799407&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQBlobMessageMarshaller.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQBlobMessageMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ActiveMQBlobMessage
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
+
+using System;
+using System.Collections;
+using System.IO;
+
+using Apache.NMS.ActiveMQ.Commands;
+using Apache.NMS.ActiveMQ.OpenWire;
+using Apache.NMS.ActiveMQ.OpenWire.V1;
+
+namespace Apache.NMS.ActiveMQ.OpenWire.V1
+{
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ActiveMQBlobMessage
+    /// </summary>
+    class ActiveMQBlobMessageMarshaller : ActiveMQMessageMarshaller
+    {
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ActiveMQBlobMessage();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ActiveMQBlobMessage.ID_ACTIVEMQBLOBMESSAGE;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+        }
+    }
+}

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -1,25 +1,29 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You 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.
-*/
-
-//
-// 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
-//
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ActiveMQBytesMessage
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,68 +35,69 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V1
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ActiveMQBytesMessage
-  /// </summary>
-  class ActiveMQBytesMessageMarshaller : ActiveMQMessageMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new ActiveMQBytesMessage();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ActiveMQBytesMessage
+    /// </summary>
+    class ActiveMQBytesMessageMarshaller : ActiveMQMessageMarshaller
     {
-        return ActiveMQBytesMessage.ID_ActiveMQBytesMessage;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ActiveMQBytesMessage info = (ActiveMQBytesMessage)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        base.LooseMarshal(wireFormat, o, dataOut);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ActiveMQBytesMessage();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ActiveMQBytesMessage.ID_ACTIVEMQBYTESMESSAGE;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
 
+            base.LooseMarshal(wireFormat, o, dataOut);
+        }
     }
-    
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQDestinationMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQDestinationMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQDestinationMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQDestinationMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -1,25 +1,29 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You 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.
-*/
-
-//
-// 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
-//
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ActiveMQDestination
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,70 +35,68 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V1
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ActiveMQDestination
-  /// </summary>
-  abstract class ActiveMQDestinationMarshaller : BaseDataStreamMarshaller
-  {
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ActiveMQDestination
+    /// </summary>
+    abstract class ActiveMQDestinationMarshaller : BaseDataStreamMarshaller
     {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-        ActiveMQDestination info = (ActiveMQDestination)o;
-        info.PhysicalName = TightUnmarshalString(dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ActiveMQDestination info = (ActiveMQDestination)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-        rc += TightMarshalString1(info.PhysicalName, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-        ActiveMQDestination info = (ActiveMQDestination)o;
-        TightMarshalString2(info.PhysicalName, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-        ActiveMQDestination info = (ActiveMQDestination)o;
-        info.PhysicalName = LooseUnmarshalString(dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        ActiveMQDestination info = (ActiveMQDestination)o;
-
-        base.LooseMarshal(wireFormat, o, dataOut);
-        LooseMarshalString(info.PhysicalName, dataOut);
 
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+            ActiveMQDestination info = (ActiveMQDestination)o;
+            info.PhysicalName = TightUnmarshalString(dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            ActiveMQDestination info = (ActiveMQDestination)o;
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+            rc += TightMarshalString1(info.PhysicalName, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+            ActiveMQDestination info = (ActiveMQDestination)o;
+            TightMarshalString2(info.PhysicalName, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+
+            ActiveMQDestination info = (ActiveMQDestination)o;
+            info.PhysicalName = LooseUnmarshalString(dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
+
+            ActiveMQDestination info = (ActiveMQDestination)o;
+
+            base.LooseMarshal(wireFormat, o, dataOut);
+            LooseMarshalString(info.PhysicalName, dataOut);
+        }
     }
-    
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQMapMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQMapMessageMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQMapMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQMapMessageMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -1,25 +1,29 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You 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.
-*/
-
-//
-// 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
-//
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ActiveMQMapMessage
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,68 +35,69 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V1
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ActiveMQMapMessage
-  /// </summary>
-  class ActiveMQMapMessageMarshaller : ActiveMQMessageMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new ActiveMQMapMessage();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ActiveMQMapMessage
+    /// </summary>
+    class ActiveMQMapMessageMarshaller : ActiveMQMessageMarshaller
     {
-        return ActiveMQMapMessage.ID_ActiveMQMapMessage;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ActiveMQMapMessage info = (ActiveMQMapMessage)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        base.LooseMarshal(wireFormat, o, dataOut);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ActiveMQMapMessage();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ActiveMQMapMessage.ID_ACTIVEMQMAPMESSAGE;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
 
+            base.LooseMarshal(wireFormat, o, dataOut);
+        }
     }
-    
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQMessageMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQMessageMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -1,25 +1,29 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You 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.
-*/
-
-//
-// 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
-//
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ActiveMQMessage
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,94 +35,96 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V1
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ActiveMQMessage
-  /// </summary>
-  class ActiveMQMessageMarshaller : MessageMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ActiveMQMessage
+    /// </summary>
+    class ActiveMQMessageMarshaller : MessageMarshaller
     {
-        return new ActiveMQMessage();
-    }
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ActiveMQMessage();
+        }
 
-    public override byte GetDataStructureType() 
-    {
-        return ActiveMQMessage.ID_ActiveMQMessage;
-    }
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ActiveMQMessage.ID_ACTIVEMQMESSAGE;
+        }
 
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
-        ActiveMQMessage info = (ActiveMQMessage)o;
+            ActiveMQMessage info = (ActiveMQMessage)o;
 
-        info.BeforeUnmarshall(wireFormat);
-        
+            info.BeforeUnmarshall(wireFormat);
 
-        info.AfterUnmarshall(wireFormat);
 
-    }
+            info.AfterUnmarshall(wireFormat);
+        }
 
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ActiveMQMessage info = (ActiveMQMessage)o;
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+            ActiveMQMessage info = (ActiveMQMessage)o;
 
-        info.BeforeMarshall(wireFormat);
+            info.BeforeMarshall(wireFormat);
 
-        int rc = base.TightMarshal1(wireFormat, info, bs);
+            int rc = base.TightMarshal1(wireFormat, o, bs);
 
-        return rc + 0;
-    }
+            return rc + 0;
+        }
 
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
 
-        ActiveMQMessage info = (ActiveMQMessage)o;
+            ActiveMQMessage info = (ActiveMQMessage)o;
 
-        info.AfterMarshall(wireFormat);
+            info.AfterMarshall(wireFormat);
+        }
 
-    }
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
 
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
+            ActiveMQMessage info = (ActiveMQMessage)o;
 
-        ActiveMQMessage info = (ActiveMQMessage)o;
+            info.BeforeUnmarshall(wireFormat);
 
-        info.BeforeUnmarshall(wireFormat);
-        
-
-        info.AfterUnmarshall(wireFormat);
-
-    }
 
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
+            info.AfterUnmarshall(wireFormat);
+        }
 
-        ActiveMQMessage info = (ActiveMQMessage)o;
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
 
-        info.BeforeMarshall(wireFormat);
+            ActiveMQMessage info = (ActiveMQMessage)o;
 
-        base.LooseMarshal(wireFormat, o, dataOut);
+            info.BeforeMarshall(wireFormat);
 
-        info.AfterMarshall(wireFormat);
+            base.LooseMarshal(wireFormat, o, dataOut);
 
+            info.AfterMarshall(wireFormat);
+        }
     }
-    
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -1,25 +1,29 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You 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.
-*/
-
-//
-// 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
-//
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ActiveMQObjectMessage
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,68 +35,69 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V1
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ActiveMQObjectMessage
-  /// </summary>
-  class ActiveMQObjectMessageMarshaller : ActiveMQMessageMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new ActiveMQObjectMessage();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ActiveMQObjectMessage
+    /// </summary>
+    class ActiveMQObjectMessageMarshaller : ActiveMQMessageMarshaller
     {
-        return ActiveMQObjectMessage.ID_ActiveMQObjectMessage;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ActiveMQObjectMessage info = (ActiveMQObjectMessage)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        base.LooseMarshal(wireFormat, o, dataOut);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ActiveMQObjectMessage();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ActiveMQObjectMessage.ID_ACTIVEMQOBJECTMESSAGE;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
 
+            base.LooseMarshal(wireFormat, o, dataOut);
+        }
     }
-    
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQQueueMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQQueueMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQQueueMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQQueueMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -1,25 +1,29 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You 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.
-*/
-
-//
-// 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
-//
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ActiveMQQueue
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,68 +35,69 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V1
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ActiveMQQueue
-  /// </summary>
-  class ActiveMQQueueMarshaller : ActiveMQDestinationMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new ActiveMQQueue();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ActiveMQQueue
+    /// </summary>
+    class ActiveMQQueueMarshaller : ActiveMQDestinationMarshaller
     {
-        return ActiveMQQueue.ID_ActiveMQQueue;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ActiveMQQueue info = (ActiveMQQueue)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        base.LooseMarshal(wireFormat, o, dataOut);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ActiveMQQueue();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ActiveMQQueue.ID_ACTIVEMQQUEUE;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
 
+            base.LooseMarshal(wireFormat, o, dataOut);
+        }
     }
-    
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -1,25 +1,29 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You 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.
-*/
-
-//
-// 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
-//
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ActiveMQStreamMessage
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,68 +35,69 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V1
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ActiveMQStreamMessage
-  /// </summary>
-  class ActiveMQStreamMessageMarshaller : ActiveMQMessageMarshaller
-  {
-
-
-    public override DataStructure CreateObject() 
-    {
-        return new ActiveMQStreamMessage();
-    }
-
-    public override byte GetDataStructureType() 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ActiveMQStreamMessage
+    /// </summary>
+    class ActiveMQStreamMessageMarshaller : ActiveMQMessageMarshaller
     {
-        return ActiveMQStreamMessage.ID_ActiveMQStreamMessage;
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ActiveMQStreamMessage info = (ActiveMQStreamMessage)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
-    {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
-
-        base.LooseMarshal(wireFormat, o, dataOut);
+        /// <summery>
+        ///  Creates an instance of the Object that this marshaller handles.
+        /// </summery>
+        public override DataStructure CreateObject() 
+        {
+            return new ActiveMQStreamMessage();
+        }
+
+        /// <summery>
+        ///  Returns the type code for the Object that this Marshaller handles..
+        /// </summery>
+        public override byte GetDataStructureType() 
+        {
+            return ActiveMQStreamMessage.ID_ACTIVEMQSTREAMMESSAGE;
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
 
+            base.LooseMarshal(wireFormat, o, dataOut);
+        }
     }
-    
-  }
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs?rev=799407&r1=799406&r2=799407&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs Thu Jul 30 19:06:34 2009
@@ -1,25 +1,29 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You 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.
-*/
-
-//
-// 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
-//
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+/*
+ *
+ *  Marshaler code for OpenWire format for ActiveMQTempDestination
+ *
+ *  NOTE!: This file is auto generated - do not modify!
+ *         if you need to make a change, please see the Java Classes
+ *         in the nms-activemq-openwire-generator module
+ *
+ */
 
 using System;
 using System.Collections;
@@ -31,57 +35,54 @@
 
 namespace Apache.NMS.ActiveMQ.OpenWire.V1
 {
-  /// <summary>
-  ///  Marshalling code for Open Wire Format for ActiveMQTempDestination
-  /// </summary>
-  abstract class ActiveMQTempDestinationMarshaller : ActiveMQDestinationMarshaller
-  {
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
-    {
-        base.TightUnmarshal(wireFormat, o, dataIn, bs);
-
-    }
-
-    //
-    // Write the booleans that this object uses to a BooleanStream
-    //
-    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
-        ActiveMQTempDestination info = (ActiveMQTempDestination)o;
-
-        int rc = base.TightMarshal1(wireFormat, info, bs);
-
-        return rc + 0;
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.TightMarshal2(wireFormat, o, dataOut, bs);
-
-    }
-
-    // 
-    // Un-marshal an object instance from the data input stream
-    // 
-    public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+    /// <summary>
+    ///  Marshalling code for Open Wire Format for ActiveMQTempDestination
+    /// </summary>
+    abstract class ActiveMQTempDestinationMarshaller : ActiveMQDestinationMarshaller
     {
-        base.LooseUnmarshal(wireFormat, o, dataIn);
-
-    }
-
-    // 
-    // Write a object instance to data output stream
-    //
-    public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
 
-        base.LooseMarshal(wireFormat, o, dataOut);
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+        {
+            base.TightUnmarshal(wireFormat, o, dataIn, bs);
+        }
+
+        //
+        // Write the booleans that this object uses to a BooleanStream
+        //
+        public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs)
+        {
+
+            int rc = base.TightMarshal1(wireFormat, o, bs);
+
+            return rc + 0;
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs)
+        {
+            base.TightMarshal2(wireFormat, o, dataOut, bs);
+        }
+
+        // 
+        // Un-marshal an object instance from the data input stream
+        // 
+        public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn) 
+        {
+            base.LooseUnmarshal(wireFormat, o, dataIn);
+        }
+
+        // 
+        // Write a object instance to data output stream
+        //
+        public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut)
+        {
 
+            base.LooseMarshal(wireFormat, o, dataOut);
+        }
     }
-    
-  }
 }



Mime
View raw message