activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r387665 [8/9] - in /incubator/activemq/trunk: activecluster/src/java/org/apache/activecluster/impl/ activemq-core/src/main/java/org/apache/activemq/advisory/ activemq-core/src/main/java/org/apache/activemq/broker/jmx/ activemq-core/src/main...
Date Tue, 21 Mar 2006 23:21:29 GMT
Propchange: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITemporaryTopic.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs Tue Mar 21 15:20:55 2006
@@ -1,33 +1,33 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-namespace NMS
-{
-	/// <summary>
-	/// Represents a text based message
-	/// </summary>
-	public interface ITextMessage : IMessage
-    {
-        
-        string Text
-        {
-            get;
-            set;
-        }
-    }
-}
-
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace NMS
+{
+	/// <summary>
+	/// Represents a text based message
+	/// </summary>
+	public interface ITextMessage : IMessage
+    {
+        
+        string Text
+        {
+            get;
+            set;
+        }
+    }
+}
+
+

Propchange: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITextMessage.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs Tue Mar 21 15:20:55 2006
@@ -1,32 +1,32 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-namespace NMS
-{
-	/// <summary>
-	/// Summary description for ITopic.
-	/// </summary>
-	public interface ITopic : IDestination
-	{
-		
-		string TopicName
-		{
-			get;
-		}
-	}
-}
-
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace NMS
+{
+	/// <summary>
+	/// Summary description for ITopic.
+	/// </summary>
+	public interface ITopic : IDestination
+	{
+		
+		string TopicName
+		{
+			get;
+		}
+	}
+}
+
+

Propchange: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/ITopic.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSConnectionException.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSConnectionException.cs?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSConnectionException.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSConnectionException.cs Tue Mar 21 15:20:55 2006
@@ -1,30 +1,30 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-namespace NMS
-{
-	/// <summary>
-	/// Represents a connection failure.
-	/// </summary>
-	public class NMSConnectionException : NMSException
-	{
-		public NMSConnectionException(string message) : base(message)
-		{
-		}
-	}
-}
-
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace NMS
+{
+	/// <summary>
+	/// Represents a connection failure.
+	/// </summary>
+	public class NMSConnectionException : NMSException
+	{
+		public NMSConnectionException(string message) : base(message)
+		{
+		}
+	}
+}
+
+

Propchange: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSConnectionException.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSException.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSException.cs?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSException.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSException.cs Tue Mar 21 15:20:55 2006
@@ -1,30 +1,30 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-namespace NMS
-{
-	/// <summary>
-	/// Represents a NMS exception
-	/// </summary>
-	public class NMSException : System.Exception
-	{
-		public NMSException(string message) : base(message)
-		{
-		}
-	}
-}
-
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace NMS
+{
+	/// <summary>
+	/// Represents a NMS exception
+	/// </summary>
+	public class NMSException : System.Exception
+	{
+		public NMSException(string message) : base(message)
+		{
+		}
+	}
+}
+
+

Propchange: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/NMS/NMSException.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/Commands/CommandTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/Commands/CommandTest.cs?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/Commands/CommandTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/Commands/CommandTest.cs Tue Mar 21 15:20:55 2006
@@ -1,63 +1,63 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-using ActiveMQ.Commands;
-using NUnit.Framework;
-using System.Collections;
-
-
-namespace ActiveMQ.Commands
-{
-	[TestFixture]
-    public class CommandTest
-    {
-        
-        [Test]
-        public void TestCommand()
-        {
-            ConsumerId value1 = new ConsumerId();
-            value1.ConnectionId = "abc";
-            value1.SessionId = 123;
-            value1.Value = 456;
-            
-            ConsumerId value2 = new ConsumerId();
-            value2.ConnectionId = "abc";
-            value2.SessionId = 123;
-            value2.Value = 456;
-            
-            ConsumerId value3 = new ConsumerId();
-            value3.ConnectionId = "abc";
-            value3.SessionId = 123;
-            value3.Value = 457;
-            
-            Assert.AreEqual(value1, value2, "value1 and value2 should be equal");
-            Assert.AreEqual(value1.GetHashCode(), value2.GetHashCode(), "value1 and value2 hash codes should be equal");
-            
-            Assert.IsTrue(!value1.Equals(value3), "value1 and value3 should not be equal");
-            Assert.IsTrue(!value3.Equals(value2), "value3 and value2 should not be equal");
-            
-            // now lets test an IDictionary
-            IDictionary dictionary = new Hashtable();
-            dictionary[value1] = value3;
-            
-            // now lets lookup with a copy
-            object actual = dictionary[value2];
-            
-            Assert.AreEqual(value3, actual, "Should have found item in Map using value2 as a key");
-        }
-    }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using ActiveMQ.Commands;
+using NUnit.Framework;
+using System.Collections;
+
+
+namespace ActiveMQ.Commands
+{
+	[TestFixture]
+    public class CommandTest
+    {
+        
+        [Test]
+        public void TestCommand()
+        {
+            ConsumerId value1 = new ConsumerId();
+            value1.ConnectionId = "abc";
+            value1.SessionId = 123;
+            value1.Value = 456;
+            
+            ConsumerId value2 = new ConsumerId();
+            value2.ConnectionId = "abc";
+            value2.SessionId = 123;
+            value2.Value = 456;
+            
+            ConsumerId value3 = new ConsumerId();
+            value3.ConnectionId = "abc";
+            value3.SessionId = 123;
+            value3.Value = 457;
+            
+            Assert.AreEqual(value1, value2, "value1 and value2 should be equal");
+            Assert.AreEqual(value1.GetHashCode(), value2.GetHashCode(), "value1 and value2 hash codes should be equal");
+            
+            Assert.IsTrue(!value1.Equals(value3), "value1 and value3 should not be equal");
+            Assert.IsTrue(!value3.Equals(value2), "value3 and value2 should not be equal");
+            
+            // now lets test an IDictionary
+            IDictionary dictionary = new Hashtable();
+            dictionary[value1] = value3;
+            
+            // now lets lookup with a copy
+            object actual = dictionary[value2];
+            
+            Assert.AreEqual(value3, actual, "Should have found item in Map using value2 as a key");
+        }
+    }
+}
+

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/Commands/CommandTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs Tue Mar 21 15:20:55 2006
@@ -1,128 +1,128 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-using NUnit.Framework;
-using System;
-using System.IO;
-
-namespace ActiveMQ.OpenWire
-{
-    [TestFixture]
-    public class BooleanStreamTest
-    {
-		protected int endOfStreamMarker = 0x12345678;
-		int numberOfBytes = 8 * 200;
-		
-		public delegate bool GetBooleanValueDelegate(int index, int count);
-		
-        [Test]
-		public void TestBooleanMarshallingUsingAllTrue()
-		{
-			DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAllTrue));
-		}
-		public bool GetBooleanValueAllTrue(int index, int count)
-		{
-			return true;
-		}
-		
-        [Test]
-		public void TestBooleanMarshallingUsingAllFalse()
-		{
-			DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAllFalse));
-		}
-		public bool GetBooleanValueAllFalse(int index, int count)
-		{
-			return false;
-		}
-		
-        [Test]
-		public void TestBooleanMarshallingUsingAlternateTrueFalse()
-		{
-			DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAlternateTrueFalse));
-		}
-		public bool GetBooleanValueAlternateTrueFalse(int index, int count)
-		{
-			return (index & 1) == 0;
-		}
-		
-		[Test]
-		public void TestBooleanMarshallingUsingAlternateFalseTrue()
-		{
-			DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAlternateFalseTrue));
-		}
-		public bool GetBooleanValueAlternateFalseTrue(int index, int count)
-		{
-			return (index & 1) != 0;
-		}
-		
-		protected void DoTestBooleanStream(int numberOfBytes, GetBooleanValueDelegate valueDelegate)
-		{
-			for (int i = 1017; i < numberOfBytes; i++)
-			{
-				AssertMarshalBooleans(i, valueDelegate);
-			}
-		}
-		
-		protected void AssertMarshalBooleans(int count, GetBooleanValueDelegate valueDelegate)
-		{
-			BooleanStream bs = new BooleanStream();
-			for (int i = 0; i < count; i++)
-			{
-				bs.WriteBoolean(valueDelegate(i, count));
-			}
-			MemoryStream buffer = new MemoryStream();
-			BinaryWriter ds = new OpenWireBinaryWriter(buffer);
-			bs.Marshal(ds);
-			ds.Write(endOfStreamMarker);
-			
-			// now lets read from the stream
-			
-			MemoryStream ins = new MemoryStream(buffer.ToArray());
-			BinaryReader dis = new OpenWireBinaryReader(ins);
-			bs = new BooleanStream();
-			bs.Unmarshal(dis);
-			
-			for (int i = 0; i < count; i++)
-			{
-				bool expected = valueDelegate(i, count);
-				
-				try
-				{
-					bool actual = bs.ReadBoolean();
-					Assert.AreEqual(expected, actual);
-				}
-				catch (Exception e)
-				{
-					Assert.Fail("Failed to parse bool: " + i + " out of: " + count + " due to: " + e);
-				}
-			}
-			int marker = dis.ReadInt32();
-			Assert.AreEqual(endOfStreamMarker, marker, "did not match: "+endOfStreamMarker+" and "+marker);
-			
-			// lets try read and we should get an exception
-			try
-			{
-				dis.ReadByte();
-				Assert.Fail("Should have reached the end of the stream");
-			}
-			catch (IOException)
-			{
-			}
-		}
-		
-	}
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace ActiveMQ.OpenWire
+{
+    [TestFixture]
+    public class BooleanStreamTest
+    {
+		protected int endOfStreamMarker = 0x12345678;
+		int numberOfBytes = 8 * 200;
+		
+		public delegate bool GetBooleanValueDelegate(int index, int count);
+		
+        [Test]
+		public void TestBooleanMarshallingUsingAllTrue()
+		{
+			DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAllTrue));
+		}
+		public bool GetBooleanValueAllTrue(int index, int count)
+		{
+			return true;
+		}
+		
+        [Test]
+		public void TestBooleanMarshallingUsingAllFalse()
+		{
+			DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAllFalse));
+		}
+		public bool GetBooleanValueAllFalse(int index, int count)
+		{
+			return false;
+		}
+		
+        [Test]
+		public void TestBooleanMarshallingUsingAlternateTrueFalse()
+		{
+			DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAlternateTrueFalse));
+		}
+		public bool GetBooleanValueAlternateTrueFalse(int index, int count)
+		{
+			return (index & 1) == 0;
+		}
+		
+		[Test]
+		public void TestBooleanMarshallingUsingAlternateFalseTrue()
+		{
+			DoTestBooleanStream(numberOfBytes, new GetBooleanValueDelegate(GetBooleanValueAlternateFalseTrue));
+		}
+		public bool GetBooleanValueAlternateFalseTrue(int index, int count)
+		{
+			return (index & 1) != 0;
+		}
+		
+		protected void DoTestBooleanStream(int numberOfBytes, GetBooleanValueDelegate valueDelegate)
+		{
+			for (int i = 1017; i < numberOfBytes; i++)
+			{
+				AssertMarshalBooleans(i, valueDelegate);
+			}
+		}
+		
+		protected void AssertMarshalBooleans(int count, GetBooleanValueDelegate valueDelegate)
+		{
+			BooleanStream bs = new BooleanStream();
+			for (int i = 0; i < count; i++)
+			{
+				bs.WriteBoolean(valueDelegate(i, count));
+			}
+			MemoryStream buffer = new MemoryStream();
+			BinaryWriter ds = new OpenWireBinaryWriter(buffer);
+			bs.Marshal(ds);
+			ds.Write(endOfStreamMarker);
+			
+			// now lets read from the stream
+			
+			MemoryStream ins = new MemoryStream(buffer.ToArray());
+			BinaryReader dis = new OpenWireBinaryReader(ins);
+			bs = new BooleanStream();
+			bs.Unmarshal(dis);
+			
+			for (int i = 0; i < count; i++)
+			{
+				bool expected = valueDelegate(i, count);
+				
+				try
+				{
+					bool actual = bs.ReadBoolean();
+					Assert.AreEqual(expected, actual);
+				}
+				catch (Exception e)
+				{
+					Assert.Fail("Failed to parse bool: " + i + " out of: " + count + " due to: " + e);
+				}
+			}
+			int marker = dis.ReadInt32();
+			Assert.AreEqual(endOfStreamMarker, marker, "did not match: "+endOfStreamMarker+" and "+marker);
+			
+			// lets try read and we should get an exception
+			try
+			{
+				dis.ReadByte();
+				Assert.Fail("Should have reached the end of the stream");
+			}
+			catch (IOException)
+			{
+			}
+		}
+		
+	}
+}
+

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/EndianTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/PrimitiveMapTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs Tue Mar 21 15:20:55 2006
@@ -1,77 +1,77 @@
-/*
- * Copyright 2006 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-using ActiveMQ.Commands;
-using NMS;
-using System;
-
-namespace ActiveMQ
-{
-    public class TestMain
-    {
-        public static void Main(string[] args)
-        {
-            try
-            {
-                Console.WriteLine("About to connect to ActiveMQ");
-
-                // START SNIPPET: demo
-                IConnectionFactory factory = new ConnectionFactory(new Uri("tcp://localhost:61616"));
-                using (IConnection connection = factory.CreateConnection())
-                {
-                    Console.WriteLine("Created a connection!");
-                    
-                    ISession session = connection.CreateSession();
-                    
-                    IDestination destination = session.GetQueue("FOO.BAR");
-                    Console.WriteLine("Using destination: " + destination);
-                    
-                    // lets create a consumer and producer
-                    IMessageConsumer consumer = session.CreateConsumer(destination);
-                    
-                    IMessageProducer producer = session.CreateProducer(destination);
-                    producer.Persistent = true;
-                    
-                    // lets send a message
-                    ITextMessage request = session.CreateTextMessage("Hello World!");
-                    request.NMSCorrelationID = "abc";
-                    request.Properties["JMSXGroupID"] = "cheese";
-                    request.Properties["myHeader"] = "James";
-                    
-                    producer.Send(request);
-                    
-                    // lets consume a message
-                    ActiveMQTextMessage message = (ActiveMQTextMessage) consumer.Receive();
-                    if (message == null)
-                    {
-                        Console.WriteLine("No message received!");
-                    }
-                    else
-                    {
-                        Console.WriteLine("Received message with ID:   " + message.NMSMessageId);
-                        Console.WriteLine("Received message with text: " + message.Text);
-                    }
-                }
-                // END SNIPPET: demo
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine("Caught: " + e);
-                Console.WriteLine("Stack: " + e.StackTrace);
-            }
-        }
-    }
-}
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using ActiveMQ.Commands;
+using NMS;
+using System;
+
+namespace ActiveMQ
+{
+    public class TestMain
+    {
+        public static void Main(string[] args)
+        {
+            try
+            {
+                Console.WriteLine("About to connect to ActiveMQ");
+
+                // START SNIPPET: demo
+                IConnectionFactory factory = new ConnectionFactory(new Uri("tcp://localhost:61616"));
+                using (IConnection connection = factory.CreateConnection())
+                {
+                    Console.WriteLine("Created a connection!");
+                    
+                    ISession session = connection.CreateSession();
+                    
+                    IDestination destination = session.GetQueue("FOO.BAR");
+                    Console.WriteLine("Using destination: " + destination);
+                    
+                    // lets create a consumer and producer
+                    IMessageConsumer consumer = session.CreateConsumer(destination);
+                    
+                    IMessageProducer producer = session.CreateProducer(destination);
+                    producer.Persistent = true;
+                    
+                    // lets send a message
+                    ITextMessage request = session.CreateTextMessage("Hello World!");
+                    request.NMSCorrelationID = "abc";
+                    request.Properties["JMSXGroupID"] = "cheese";
+                    request.Properties["myHeader"] = "James";
+                    
+                    producer.Send(request);
+                    
+                    // lets consume a message
+                    ActiveMQTextMessage message = (ActiveMQTextMessage) consumer.Receive();
+                    if (message == null)
+                    {
+                        Console.WriteLine("No message received!");
+                    }
+                    else
+                    {
+                        Console.WriteLine("Received message with ID:   " + message.NMSMessageId);
+                        Console.WriteLine("Received message with text: " + message.Text);
+                    }
+                }
+                // END SNIPPET: demo
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("Caught: " + e);
+                Console.WriteLine("Stack: " + e.StackTrace);
+            }
+        }
+    }
+}

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/CommonAssemblyInfo.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/AsyncConsumeTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/BadConsumeTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/BytesMessageTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/ConsumerTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/JMSPropertyTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/JMSTestSupport.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/MapMessageTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/MessageTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/TextMessage.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/activemq/trunk/activemq-dotnet/src/test/csharp/NMS/TransactionTest.cs
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java Tue Mar 21 15:20:55 2006
@@ -1,56 +1,56 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.transport.http;
-
-import org.apache.activemq.JmsDurableTopicSendReceiveTest;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-
-public class HttpJmsDurableTopicSendReceiveTest extends JmsDurableTopicSendReceiveTest {
-    protected BrokerService broker;
-
-    protected void setUp() throws Exception {
-        if (broker == null) {
-            broker = createBroker();
-            broker.start();
-        }
-        super.setUp();
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        if (broker != null) {
-            broker.stop();
-        }
-    }
-
-    protected ActiveMQConnectionFactory createConnectionFactory() {
-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(getBrokerURL());
-        return connectionFactory;
-    }
-
-    protected String getBrokerURL() {
-        return "http://localhost:8161";
-    }
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService answer = new BrokerService();
-        answer.setPersistent(false);
-        answer.addConnector(getBrokerURL());
-        return answer;
-    }
-}
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.http;
+
+import org.apache.activemq.JmsDurableTopicSendReceiveTest;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+
+public class HttpJmsDurableTopicSendReceiveTest extends JmsDurableTopicSendReceiveTest {
+    protected BrokerService broker;
+
+    protected void setUp() throws Exception {
+        if (broker == null) {
+            broker = createBroker();
+            broker.start();
+        }
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        if (broker != null) {
+            broker.stop();
+        }
+    }
+
+    protected ActiveMQConnectionFactory createConnectionFactory() {
+        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(getBrokerURL());
+        return connectionFactory;
+    }
+
+    protected String getBrokerURL() {
+        return "http://localhost:8161";
+    }
+
+    protected BrokerService createBroker() throws Exception {
+        BrokerService answer = new BrokerService();
+        answer.setPersistent(false);
+        answer.addConnector(getBrokerURL());
+        return answer;
+    }
+}

Propchange: incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpJmsDurableTopicSendReceiveTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java Tue Mar 21 15:20:55 2006
@@ -1,38 +1,38 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.transport.http;
-
-import org.apache.activemq.broker.BrokerService;
-
-import javax.jms.DeliveryMode;
-
-public class HttpPersistentSendAndReceiveTest extends HttpJmsSendAndReceiveTest {
-    protected BrokerService broker;
-
-    protected void setUp() throws Exception {
-        this.topic = false;
-        this.deliveryMode = DeliveryMode.PERSISTENT;
-        super.setUp();
-    }
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService answer = new BrokerService();
-        answer.setPersistent(true);
-        answer.addConnector(getBrokerURL());
-        return answer;
-    }
-}
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.http;
+
+import org.apache.activemq.broker.BrokerService;
+
+import javax.jms.DeliveryMode;
+
+public class HttpPersistentSendAndReceiveTest extends HttpJmsSendAndReceiveTest {
+    protected BrokerService broker;
+
+    protected void setUp() throws Exception {
+        this.topic = false;
+        this.deliveryMode = DeliveryMode.PERSISTENT;
+        super.setUp();
+    }
+
+    protected BrokerService createBroker() throws Exception {
+        BrokerService answer = new BrokerService();
+        answer.setPersistent(true);
+        answer.addConnector(getBrokerURL());
+        return answer;
+    }
+}

Propchange: incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java Tue Mar 21 15:20:55 2006
@@ -1,39 +1,39 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.transport.https;
-
-import org.apache.activemq.transport.http.HttpJmsSendAndReceiveTest;
-
-/**
- * @version $Revision$
- */
-public class HttpsJmsSendAndReceiveTest extends HttpJmsSendAndReceiveTest {
-
-    protected void setUp() throws Exception {
-        System.setProperty("javax.net.ssl.trustStore", "src/test/resources/client.keystore");
-        System.setProperty("javax.net.ssl.trustStorePassword", "password");
-        System.setProperty("javax.net.ssl.trustStoreType", "jks");
-        System.setProperty("javax.net.ssl.keyStore", "src/test/resources/server.keystore");
-        System.setProperty("javax.net.ssl.keyStorePassword", "password");
-        System.setProperty("javax.net.ssl.keyStoreType", "jks");
-        super.setUp();
-    }
-
-    protected String getBrokerURL() {
-        return "https://localhost:8161";
-    }
-}
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.https;
+
+import org.apache.activemq.transport.http.HttpJmsSendAndReceiveTest;
+
+/**
+ * @version $Revision$
+ */
+public class HttpsJmsSendAndReceiveTest extends HttpJmsSendAndReceiveTest {
+
+    protected void setUp() throws Exception {
+        System.setProperty("javax.net.ssl.trustStore", "src/test/resources/client.keystore");
+        System.setProperty("javax.net.ssl.trustStorePassword", "password");
+        System.setProperty("javax.net.ssl.trustStoreType", "jks");
+        System.setProperty("javax.net.ssl.keyStore", "src/test/resources/server.keystore");
+        System.setProperty("javax.net.ssl.keyStorePassword", "password");
+        System.setProperty("javax.net.ssl.keyStoreType", "jks");
+        super.setUp();
+    }
+
+    protected String getBrokerURL() {
+        return "https://localhost:8161";
+    }
+}

Propchange: incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsJmsSendAndReceiveTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java Tue Mar 21 15:20:55 2006
@@ -1,51 +1,51 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.transport.https;
-
-import org.apache.activemq.transport.http.HttpTransportBrokerTest;
-
-import junit.framework.Test;
-import junit.textui.TestRunner;
-
-public class HttpsTransportBrokerTest extends HttpTransportBrokerTest {
-
-    protected String getBindLocation() {
-        return "https://localhost:8161";
-    }
-
-    protected void setUp() throws Exception {
-        System.setProperty("javax.net.ssl.trustStore", "src/test/resources/client.keystore");
-        System.setProperty("javax.net.ssl.trustStorePassword", "password");
-        System.setProperty("javax.net.ssl.trustStoreType", "jks");
-        System.setProperty("javax.net.ssl.keyStore", "src/test/resources/server.keystore");
-        System.setProperty("javax.net.ssl.keyStorePassword", "password");
-        System.setProperty("javax.net.ssl.keyStoreType", "jks");
-        //System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");
-        super.setUp();
-
-        Thread.sleep(5000);
-    }
-
-    public static Test suite() {
-        return suite(HttpsTransportBrokerTest.class);
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(suite());
-    }
-
-}
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.https;
+
+import org.apache.activemq.transport.http.HttpTransportBrokerTest;
+
+import junit.framework.Test;
+import junit.textui.TestRunner;
+
+public class HttpsTransportBrokerTest extends HttpTransportBrokerTest {
+
+    protected String getBindLocation() {
+        return "https://localhost:8161";
+    }
+
+    protected void setUp() throws Exception {
+        System.setProperty("javax.net.ssl.trustStore", "src/test/resources/client.keystore");
+        System.setProperty("javax.net.ssl.trustStorePassword", "password");
+        System.setProperty("javax.net.ssl.trustStoreType", "jks");
+        System.setProperty("javax.net.ssl.keyStore", "src/test/resources/server.keystore");
+        System.setProperty("javax.net.ssl.keyStorePassword", "password");
+        System.setProperty("javax.net.ssl.keyStoreType", "jks");
+        //System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");
+        super.setUp();
+
+        Thread.sleep(5000);
+    }
+
+    public static Test suite() {
+        return suite(HttpsTransportBrokerTest.class);
+    }
+
+    public static void main(String[] args) {
+        TestRunner.run(suite());
+    }
+
+}

Propchange: incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/MarshallingWithCachingTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/MarshallingWithCachingTest.java?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/MarshallingWithCachingTest.java (original)
+++ incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/MarshallingWithCachingTest.java Tue Mar 21 15:20:55 2006
@@ -1,142 +1,142 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.soaktest;
-
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.DataStructure;
-import org.apache.activemq.command.ProducerId;
-import org.apache.activemq.command.ProducerInfo;
-import org.apache.activemq.openwire.OpenWireFormat;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-/**
- *
- * @version $Revision: 383541 $
- */
-public class MarshallingWithCachingTest extends TestCase {
-
-    protected long commandCount = Short.MAX_VALUE;
-    protected String connectionId = "Cheese";
-    protected ActiveMQDestination destination = new ActiveMQQueue("Foo");
-    protected int endOfStreamMarker = 0x12345678;
-    
-    protected ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-    protected DataOutputStream ds = new DataOutputStream(buffer);
-    protected OpenWireFormat openWireformat;
-    protected long logGroup = 10000;
-    
-
-    
-    public void testReadAndWriteLotsOfCommands() throws Exception {
-        System.out.println("Marshalling: " + commandCount + " objects");
-        for (long i = 0; i < commandCount ; i++) {
-            logProgress("Marshalling", i);
-            DataStructure object = createDataStructure(i);
-            writeObject(object);
-        }
-        ds.writeInt(endOfStreamMarker);
-        
-        // now lets read from the stream
-        ds.close();
-        
-        System.out.println("Unmarshalling: " + commandCount + " objects");
-        
-        ByteArrayInputStream in = new ByteArrayInputStream(buffer.toByteArray());
-        DataInputStream dis = new DataInputStream(in);
-        for (long i = 0; i < commandCount ; i++) {
-            logProgress("Unmarshalling", i);
-            DataStructure command = null;
-            try {
-                command = (DataStructure) openWireformat.unmarshal(dis);
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-                fail("Failed to unmarshal object: " + i + ". Reason: " + e);
-            }
-            assertDataStructureExpected(command, i);
-        }
-
-        int marker = dis.readInt();
-        assertEquals("Marker int", Integer.toHexString(endOfStreamMarker), Integer.toHexString(marker));
-        
-        // lets try read and we should get an exception
-        try {
-            dis.readByte();
-            fail("Should have reached the end of the stream");
-        }
-        catch (IOException e) {
-            // worked!
-        }
-    }
-
-    protected void logProgress(String message, long i) {
-        if (i % logGroup  == 0) {
-            System.out.println(message + " at object: " + i);
-        }
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        openWireformat = createOpenWireFormat();
-    }
-
-    protected OpenWireFormat createOpenWireFormat() {
-        OpenWireFormat wf = new OpenWireFormat();
-        wf.setCacheEnabled(true);
-        wf.setStackTraceEnabled(true);
-        wf.setVersion(1);
-        return wf;
-    }
-
-    private void writeObject(Object object) throws IOException {
-        openWireformat.marshal(object, ds);
-    }
-    
-    protected DataStructure createDataStructure(long index) {
-        ProducerId id = new ProducerId();
-        id.setConnectionId(connectionId);
-        id.setSessionId(index);
-        id.setValue(index);
-        
-        ProducerInfo object = new ProducerInfo();
-        object.setProducerId(id);
-        object.setDestination(destination);
-        return object;
-    }
-    
-    protected void assertDataStructureExpected(DataStructure object, long i) {
-        assertEquals("Type of object for index: " + i, ProducerInfo.class, object.getClass());
-        ProducerInfo command = (ProducerInfo) object;
-        
-        ProducerId id = command.getProducerId();
-        assertNotNull("ProducerID for object at index: " + i, id);
-        
-        assertEquals("connection ID in object: "+ i, connectionId, id.getConnectionId());
-        String actual = Long.toHexString(id.getValue());
-        String expected = Long.toHexString(i);
-        assertEquals("value of object: "+ i + " was: " + actual, expected, actual);
-        assertEquals("value of object: "+ i + " was: " + actual, i, id.getSessionId());
-    }
-}
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.soaktest;
+
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.openwire.OpenWireFormat;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ * @version $Revision: 383541 $
+ */
+public class MarshallingWithCachingTest extends TestCase {
+
+    protected long commandCount = Short.MAX_VALUE;
+    protected String connectionId = "Cheese";
+    protected ActiveMQDestination destination = new ActiveMQQueue("Foo");
+    protected int endOfStreamMarker = 0x12345678;
+    
+    protected ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+    protected DataOutputStream ds = new DataOutputStream(buffer);
+    protected OpenWireFormat openWireformat;
+    protected long logGroup = 10000;
+    
+
+    
+    public void testReadAndWriteLotsOfCommands() throws Exception {
+        System.out.println("Marshalling: " + commandCount + " objects");
+        for (long i = 0; i < commandCount ; i++) {
+            logProgress("Marshalling", i);
+            DataStructure object = createDataStructure(i);
+            writeObject(object);
+        }
+        ds.writeInt(endOfStreamMarker);
+        
+        // now lets read from the stream
+        ds.close();
+        
+        System.out.println("Unmarshalling: " + commandCount + " objects");
+        
+        ByteArrayInputStream in = new ByteArrayInputStream(buffer.toByteArray());
+        DataInputStream dis = new DataInputStream(in);
+        for (long i = 0; i < commandCount ; i++) {
+            logProgress("Unmarshalling", i);
+            DataStructure command = null;
+            try {
+                command = (DataStructure) openWireformat.unmarshal(dis);
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                fail("Failed to unmarshal object: " + i + ". Reason: " + e);
+            }
+            assertDataStructureExpected(command, i);
+        }
+
+        int marker = dis.readInt();
+        assertEquals("Marker int", Integer.toHexString(endOfStreamMarker), Integer.toHexString(marker));
+        
+        // lets try read and we should get an exception
+        try {
+            dis.readByte();
+            fail("Should have reached the end of the stream");
+        }
+        catch (IOException e) {
+            // worked!
+        }
+    }
+
+    protected void logProgress(String message, long i) {
+        if (i % logGroup  == 0) {
+            System.out.println(message + " at object: " + i);
+        }
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        openWireformat = createOpenWireFormat();
+    }
+
+    protected OpenWireFormat createOpenWireFormat() {
+        OpenWireFormat wf = new OpenWireFormat();
+        wf.setCacheEnabled(true);
+        wf.setStackTraceEnabled(true);
+        wf.setVersion(1);
+        return wf;
+    }
+
+    private void writeObject(Object object) throws IOException {
+        openWireformat.marshal(object, ds);
+    }
+    
+    protected DataStructure createDataStructure(long index) {
+        ProducerId id = new ProducerId();
+        id.setConnectionId(connectionId);
+        id.setSessionId(index);
+        id.setValue(index);
+        
+        ProducerInfo object = new ProducerInfo();
+        object.setProducerId(id);
+        object.setDestination(destination);
+        return object;
+    }
+    
+    protected void assertDataStructureExpected(DataStructure object, long i) {
+        assertEquals("Type of object for index: " + i, ProducerInfo.class, object.getClass());
+        ProducerInfo command = (ProducerInfo) object;
+        
+        ProducerId id = command.getProducerId();
+        assertNotNull("ProducerID for object at index: " + i, id);
+        
+        assertEquals("connection ID in object: "+ i, connectionId, id.getConnectionId());
+        String actual = Long.toHexString(id.getValue());
+        String expected = Long.toHexString(i);
+        assertEquals("value of object: "+ i + " was: " + actual, expected, actual);
+        assertEquals("value of object: "+ i + " was: " + actual, i, id.getSessionId());
+    }
+}

Propchange: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/MarshallingWithCachingTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/PublishThenConsumeSoakTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/PublishThenConsumeSoakTest.java?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/PublishThenConsumeSoakTest.java (original)
+++ incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/PublishThenConsumeSoakTest.java Tue Mar 21 15:20:55 2006
@@ -1,47 +1,47 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.activemq.soaktest;
-
-
-public class PublishThenConsumeSoakTest extends SoakTestSupport{
-
-
-    public void testPublishThenReceive() throws Exception {
-          messageCount = 5000000;
-
-          createProducers();
-          int counter = 0;
-          for (int i = 0; i < messageCount; i++) {
-
-                for (int k = 0; k < producers.length; k++) {
-                    producers[k].sendMessage(payload,"counter",counter);
-                    counter++;
-                }
-          }
-
-          allMessagesList.setAsParent(true);
-
-          createConsumers();
-          allMessagesList.waitForMessagesToArrive(messageCount*producers.length);
-          allMessagesList.assertMessagesReceived(messageCount*producers.length);
-          allMessagesList.assertMessagesReceivedAreInOrder(messageCount*producers.length);
-
-    }
-
-
-}
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.soaktest;
+
+
+public class PublishThenConsumeSoakTest extends SoakTestSupport{
+
+
+    public void testPublishThenReceive() throws Exception {
+          messageCount = 5000000;
+
+          createProducers();
+          int counter = 0;
+          for (int i = 0; i < messageCount; i++) {
+
+                for (int k = 0; k < producers.length; k++) {
+                    producers[k].sendMessage(payload,"counter",counter);
+                    counter++;
+                }
+          }
+
+          allMessagesList.setAsParent(true);
+
+          createConsumers();
+          allMessagesList.waitForMessagesToArrive(messageCount*producers.length);
+          allMessagesList.assertMessagesReceived(messageCount*producers.length);
+          allMessagesList.assertMessagesReceivedAreInOrder(messageCount*producers.length);
+
+    }
+
+
+}

Propchange: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/PublishThenConsumeSoakTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/SoakTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/SoakTestSupport.java?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/SoakTestSupport.java (original)
+++ incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/SoakTestSupport.java Tue Mar 21 15:20:55 2006
@@ -1,183 +1,183 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.activemq.soaktest;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.tool.Producer;
-import org.apache.activemq.tool.Consumer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.jms.*;
-
-import junit.framework.TestCase;
-
-import java.io.File;
-
-
-public class SoakTestSupport  extends TestCase{
-
-    private static final Log log = LogFactory.getLog(SoakTestSupport.class);
-    protected BrokerService broker;
-    protected String brokerURL = "tcp://localhost:61616";
-    protected int consumerCount = 1;
-    protected int producerCount = 1;
-    protected int messageSize = 1024;
-    protected int messageCount = 1000;
-
-    protected Producer[] producers;
-    protected Consumer[] consumers;
-    protected String destinationName = "TOOL.DEFAULT";
-    protected Message payload;
-
-    protected ConnectionFactory connectionFactory;
-    protected Destination destination;
-    protected boolean createConnectionPerClient = true;
-    protected boolean topic = false;
-    protected boolean transacted = false;
-    protected boolean durable = true;
-    protected boolean useEmbeddedBroker = true;
-    protected boolean keepOnRunning = true;
-    protected int duration = 0;   //duration in minutes
-    protected boolean useConsumerListener = true;
-    protected Consumer allMessagesList = new Consumer();
-    private String dataFileRoot =  "activemq-data";
-
-
-    protected void setUp() throws Exception {
-        //clean up db store
-        File dataFile = new File(dataFileRoot);
-        recursiveDelete(dataFile);
-
-        if (useEmbeddedBroker) {
-            if (broker == null) {
-                broker = createBroker();
-            }
-        }
-
-        connectionFactory = createConnectionFactory();
-        Connection con = connectionFactory.createConnection();
-        Session session = con.createSession(transacted, Session.AUTO_ACKNOWLEDGE);
-
-        if (topic) {
-            destination = session.createTopic(destinationName);
-        } else {
-            destination = session.createQueue(destinationName);
-        }
-
-        createPayload(session);
-
-        con.close();
-
-    }
-
-
-    protected void createPayload(Session session) throws JMSException {
-
-        byte[] array = new byte[messageSize];
-        for (int i = 0; i < array.length; i++) {
-            array[i] = (byte) i;
-        }
-
-        BytesMessage bystePayload = session.createBytesMessage();
-        bystePayload.writeBytes(array);
-        payload = (Message) bystePayload;
-    }
-
-
-    protected void createProducers() throws JMSException {
-        producers = new Producer[producerCount];
-        for (int i = 0; i < producerCount; i++) {
-            producers[i] = new Producer(connectionFactory, destination);
-            if (durable) {
-                producers[i].setDeliveryMode(DeliveryMode.PERSISTENT);
-            }
-             else {
-                producers[i].setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-            }
-            producers[i].start();
-        }
-
-    }
-
-    protected void createConsumers() throws JMSException {
-        consumers = new Consumer[consumerCount];
-        for (int i = 0; i < consumerCount; i++) {
-            consumers[i] = new Consumer(connectionFactory, destination);
-            consumers[i].setParent(allMessagesList);
-            if(useConsumerListener){
-               consumers[i].start();
-            }
-
-
-        }
-    }
-
-    protected ActiveMQConnectionFactory createConnectionFactory() throws JMSException {
-
-        if (useEmbeddedBroker) {
-            return new ActiveMQConnectionFactory("vm://localhost");
-        } else {
-            return new ActiveMQConnectionFactory(brokerURL);
-        }
-    }
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService broker = new BrokerService();
-        configureBroker(broker);
-        broker.start();
-        return broker;
-    }
-
-    protected void configureBroker(BrokerService broker) throws Exception {
-        broker.addConnector("vm://localhost");
-        broker.setDeleteAllMessagesOnStartup(true);
-    }
-
-    public void startTimer() {
-
-        Thread timer = new Thread(new Runnable() {
-            public void run() {
-                try {
-
-                    Thread.sleep(duration * 60 * 1000);
-                    keepOnRunning = true;
-                } catch (InterruptedException e) {
-
-                } finally {
-
-                }
-            }
-        }, "TimerThread");
-
-
-        log.info("Starting timer thread... Duration :" +duration + " minutes");
-        timer.start();
-    }
-
-    protected  void recursiveDelete(File file) {
-        if( file.isDirectory() ) {
-            File[] files = file.listFiles();
-            for (int i = 0; i < files.length; i++) {
-                recursiveDelete(files[i]);
-            }
-        }
-        file.delete();
-    }
-}
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.soaktest;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.tool.Producer;
+import org.apache.activemq.tool.Consumer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.jms.*;
+
+import junit.framework.TestCase;
+
+import java.io.File;
+
+
+public class SoakTestSupport  extends TestCase{
+
+    private static final Log log = LogFactory.getLog(SoakTestSupport.class);
+    protected BrokerService broker;
+    protected String brokerURL = "tcp://localhost:61616";
+    protected int consumerCount = 1;
+    protected int producerCount = 1;
+    protected int messageSize = 1024;
+    protected int messageCount = 1000;
+
+    protected Producer[] producers;
+    protected Consumer[] consumers;
+    protected String destinationName = "TOOL.DEFAULT";
+    protected Message payload;
+
+    protected ConnectionFactory connectionFactory;
+    protected Destination destination;
+    protected boolean createConnectionPerClient = true;
+    protected boolean topic = false;
+    protected boolean transacted = false;
+    protected boolean durable = true;
+    protected boolean useEmbeddedBroker = true;
+    protected boolean keepOnRunning = true;
+    protected int duration = 0;   //duration in minutes
+    protected boolean useConsumerListener = true;
+    protected Consumer allMessagesList = new Consumer();
+    private String dataFileRoot =  "activemq-data";
+
+
+    protected void setUp() throws Exception {
+        //clean up db store
+        File dataFile = new File(dataFileRoot);
+        recursiveDelete(dataFile);
+
+        if (useEmbeddedBroker) {
+            if (broker == null) {
+                broker = createBroker();
+            }
+        }
+
+        connectionFactory = createConnectionFactory();
+        Connection con = connectionFactory.createConnection();
+        Session session = con.createSession(transacted, Session.AUTO_ACKNOWLEDGE);
+
+        if (topic) {
+            destination = session.createTopic(destinationName);
+        } else {
+            destination = session.createQueue(destinationName);
+        }
+
+        createPayload(session);
+
+        con.close();
+
+    }
+
+
+    protected void createPayload(Session session) throws JMSException {
+
+        byte[] array = new byte[messageSize];
+        for (int i = 0; i < array.length; i++) {
+            array[i] = (byte) i;
+        }
+
+        BytesMessage bystePayload = session.createBytesMessage();
+        bystePayload.writeBytes(array);
+        payload = (Message) bystePayload;
+    }
+
+
+    protected void createProducers() throws JMSException {
+        producers = new Producer[producerCount];
+        for (int i = 0; i < producerCount; i++) {
+            producers[i] = new Producer(connectionFactory, destination);
+            if (durable) {
+                producers[i].setDeliveryMode(DeliveryMode.PERSISTENT);
+            }
+             else {
+                producers[i].setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+            }
+            producers[i].start();
+        }
+
+    }
+
+    protected void createConsumers() throws JMSException {
+        consumers = new Consumer[consumerCount];
+        for (int i = 0; i < consumerCount; i++) {
+            consumers[i] = new Consumer(connectionFactory, destination);
+            consumers[i].setParent(allMessagesList);
+            if(useConsumerListener){
+               consumers[i].start();
+            }
+
+
+        }
+    }
+
+    protected ActiveMQConnectionFactory createConnectionFactory() throws JMSException {
+
+        if (useEmbeddedBroker) {
+            return new ActiveMQConnectionFactory("vm://localhost");
+        } else {
+            return new ActiveMQConnectionFactory(brokerURL);
+        }
+    }
+
+    protected BrokerService createBroker() throws Exception {
+        BrokerService broker = new BrokerService();
+        configureBroker(broker);
+        broker.start();
+        return broker;
+    }
+
+    protected void configureBroker(BrokerService broker) throws Exception {
+        broker.addConnector("vm://localhost");
+        broker.setDeleteAllMessagesOnStartup(true);
+    }
+
+    public void startTimer() {
+
+        Thread timer = new Thread(new Runnable() {
+            public void run() {
+                try {
+
+                    Thread.sleep(duration * 60 * 1000);
+                    keepOnRunning = true;
+                } catch (InterruptedException e) {
+
+                } finally {
+
+                }
+            }
+        }, "TimerThread");
+
+
+        log.info("Starting timer thread... Duration :" +duration + " minutes");
+        timer.start();
+    }
+
+    protected  void recursiveDelete(File file) {
+        if( file.isDirectory() ) {
+            File[] files = file.listFiles();
+            for (int i = 0; i < files.length; i++) {
+                recursiveDelete(files[i]);
+            }
+        }
+        file.delete();
+    }
+}

Propchange: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/soaktest/SoakTestSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java?rev=387665&r1=387664&r2=387665&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java (original)
+++ incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java Tue Mar 21 15:20:55 2006
@@ -1,116 +1,116 @@
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.tool;
-
-import org.apache.activemq.util.MessageIdList;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.Session;
-import javax.jms.Topic;
-/**
- * @version $Revision: 1.3 $
- */
-public class Consumer extends MessageIdList implements MessageListener{
-    protected Connection connection;
-    protected MessageConsumer consumer;
-    protected long counter = 0;
-    protected boolean isParent = false;
-    protected boolean inOrder = true;
-
-
-    public Consumer() {
-        super();
-    }
-    public Consumer(ConnectionFactory fac,Destination dest,String consumerName) throws JMSException{
-        connection=fac.createConnection();
-        Session s=connection.createSession(false,Session.AUTO_ACKNOWLEDGE);
-        if(dest instanceof Topic&&consumerName!=null&&consumerName.length()>0){
-            consumer=s.createDurableSubscriber((Topic) dest,consumerName);
-        }else{
-            consumer=s.createConsumer(dest);
-        }
-        consumer.setMessageListener(this);
-    }
-    public Consumer(ConnectionFactory fac,Destination dest) throws JMSException{
-        this(fac,dest,null);
-    }
-    public void start() throws JMSException{
-        connection.start();
-    }
-    public void stop() throws JMSException{
-        connection.stop();
-    }
-    public void shutDown() throws JMSException{
-        connection.close();
-    }
-
-
-    public Message receive() throws JMSException{
-        return consumer.receive(); 
-    }
-
-    public Message receive(long wait) throws JMSException{
-        return consumer.receive(wait);
-    }
-
-    public void onMessage(Message msg){
-        super.onMessage(msg);
-        if(isParent) {
-           try {
-              long ctr = msg.getLongProperty("counter");
-              if (counter != ctr){
-                   inOrder = false;
-              }
-              counter ++;
-           }catch(Exception e) {
-               e.printStackTrace();
-           }
-        }
-    }
-
-
-    public boolean isInOrder() {
-        return inOrder;
-    }
-
-
-    public void setAsParent(boolean isParent) {
-        this.isParent = isParent;
-    }
-
-    public boolean isParent() {
-        return this.isParent;
-    }
-
-
-    /**
-     * Performs a testing assertion that the correct order  of messages have
-     * been received
-     *
-     * @param messageCount
-     */
-    public void assertMessagesReceivedAreInOrder(int messageCount) {
-        assertEquals("expected number of messages when received", messageCount, getMessageCount());
-    }
-
+/**
+ *
+ * Copyright 2005-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.tool;
+
+import org.apache.activemq.util.MessageIdList;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.Session;
+import javax.jms.Topic;
+/**
+ * @version $Revision: 1.3 $
+ */
+public class Consumer extends MessageIdList implements MessageListener{
+    protected Connection connection;
+    protected MessageConsumer consumer;
+    protected long counter = 0;
+    protected boolean isParent = false;
+    protected boolean inOrder = true;
+
+
+    public Consumer() {
+        super();
+    }
+    public Consumer(ConnectionFactory fac,Destination dest,String consumerName) throws JMSException{
+        connection=fac.createConnection();
+        Session s=connection.createSession(false,Session.AUTO_ACKNOWLEDGE);
+        if(dest instanceof Topic&&consumerName!=null&&consumerName.length()>0){
+            consumer=s.createDurableSubscriber((Topic) dest,consumerName);
+        }else{
+            consumer=s.createConsumer(dest);
+        }
+        consumer.setMessageListener(this);
+    }
+    public Consumer(ConnectionFactory fac,Destination dest) throws JMSException{
+        this(fac,dest,null);
+    }
+    public void start() throws JMSException{
+        connection.start();
+    }
+    public void stop() throws JMSException{
+        connection.stop();
+    }
+    public void shutDown() throws JMSException{
+        connection.close();
+    }
+
+
+    public Message receive() throws JMSException{
+        return consumer.receive(); 
+    }
+
+    public Message receive(long wait) throws JMSException{
+        return consumer.receive(wait);
+    }
+
+    public void onMessage(Message msg){
+        super.onMessage(msg);
+        if(isParent) {
+           try {
+              long ctr = msg.getLongProperty("counter");
+              if (counter != ctr){
+                   inOrder = false;
+              }
+              counter ++;
+           }catch(Exception e) {
+               e.printStackTrace();
+           }
+        }
+    }
+
+
+    public boolean isInOrder() {
+        return inOrder;
+    }
+
+
+    public void setAsParent(boolean isParent) {
+        this.isParent = isParent;
+    }
+
+    public boolean isParent() {
+        return this.isParent;
+    }
+
+
+    /**
+     * Performs a testing assertion that the correct order  of messages have
+     * been received
+     *
+     * @param messageCount
+     */
+    public void assertMessagesReceivedAreInOrder(int messageCount) {
+        assertEquals("expected number of messages when received", messageCount, getMessageCount());
+    }
+
 }

Propchange: incubator/activemq/trunk/activemq-soaktest/src/test/java/org/apache/activemq/tool/Consumer.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message