activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r627169 [3/3] - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk: ./ src/main/csharp/ src/main/csharp/OpenWire/V1/ src/main/csharp/OpenWire/V2/ src/main/csharp/Transport/ src/main/csharp/Transport/Stomp/ src/main/csharp/Transport/Tcp/...
Date Tue, 12 Feb 2008 23:00:44 GMT
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/StompHelperTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/StompHelperTest.cs?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/StompHelperTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/StompHelperTest.cs
Tue Feb 12 15:00:40 2008
@@ -1,89 +0,0 @@
-/*
- * 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.
- */
-using Apache.NMS;
-using NUnit.Framework;
-using Apache.NMS.ActiveMQ.Commands;
-using Apache.NMS.ActiveMQ.Transport.Stomp;
-using System;
-
-namespace Apache.Stomp
-{
-    [ TestFixture ]
-    public class StompHelperTest
-    {
-		[ Test ]
-		public void ConsumerIdMarshallingWorks()
-		{
-			ConsumerId id = new ConsumerId();
-			id.ConnectionId = "cheese";
-			id.SessionId = 2;
-			id.Value = 3;
-			
-			string text = StompHelper.ToStomp(id);
-			Assert.AreEqual("cheese:2:3", text, "ConsumerId as stomp");
-			
-			ConsumerId another = StompHelper.ToConsumerId("abc:5:6");
-			Assert.AreEqual("abc", another.ConnectionId, "extracting consumerId.ConnectionId");
-			Assert.AreEqual(5, another.SessionId, "extracting consumerId.SessionId");
-			Assert.AreEqual(6, another.Value, "extracting consumerId.Value");
-		}
-
-		[ Test ]
-		public void MessageIdMarshallingWorks()
-		{
-			ProducerId id = new ProducerId();
-			id.ConnectionId = "cheese";
-			id.SessionId = 2;
-			id.Value = 3;
-			
-			MessageId mid = new MessageId();
-			mid.ProducerId = id;
-			mid.BrokerSequenceId = 5;
-			mid.ProducerSequenceId = 6;
-			
-			string text = StompHelper.ToStomp(mid);
-			Assert.AreEqual("cheese:2:3:6", text, "MessageId as stomp");
-			
-			MessageId mid2 = StompHelper.ToMessageId("abc:5:6:7:8");
-			Assert.AreEqual(8, mid2.ProducerSequenceId, "extracting mid2.ProducerSequenceId");
-
-			ProducerId another = mid2.ProducerId;
-            Assert.AreEqual(7, another.Value, "extracting another.Value");
-            Assert.AreEqual(6, another.SessionId, "extracting another.SessionId");
-			Assert.AreEqual("abc:5", another.ConnectionId, "extracting another.ConnectionId");
-		}
-
-		// TODO destination stuff
-		
-		[ Test ]
-		public void DestinationMarshallingWorks()
-		{
-			Assert.AreEqual("/queue/FOO.BAR", StompHelper.ToStomp(new ActiveMQQueue("FOO.BAR")), "queue");
-			Assert.AreEqual("/topic/FOO.BAR", StompHelper.ToStomp(new ActiveMQTopic("FOO.BAR")), "topic");
-			Assert.AreEqual("/temp-queue/FOO.BAR", StompHelper.ToStomp(new ActiveMQTempQueue("FOO.BAR")),
"temporary queue");
-			Assert.AreEqual("/temp-topic/FOO.BAR", StompHelper.ToStomp(new ActiveMQTempTopic("FOO.BAR")),
"temporary topic");
-			
-			Assert.AreEqual(new ActiveMQQueue("FOO.BAR"), StompHelper.ToDestination("/queue/FOO.BAR"),
"queue from Stomp");
-			Assert.AreEqual(new ActiveMQTopic("FOO.BAR"), StompHelper.ToDestination("/topic/FOO.BAR"),
"topic from Stomp");
-			Assert.AreEqual(new ActiveMQTempQueue("FOO.BAR"), StompHelper.ToDestination("/temp-queue/FOO.BAR"),
"temporary queue from Stomp");
-			Assert.AreEqual(new ActiveMQTempTopic("FOO.BAR"), StompHelper.ToDestination("/temp-topic/FOO.BAR"),
"temporary topic from Stomp");
-		}
-    }
-}
-
-
-

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/StompTestUtils.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/StompTestUtils.cs?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/StompTestUtils.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/StompTestUtils.cs
Tue Feb 12 15:00:40 2008
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-
-namespace Apache.Stomp
-{
-	class StompTestUtils
-	{
-		public static Apache.NMS.IConnectionFactory CreateStompConnectionFactory()
-		{
-			return new Apache.NMS.ActiveMQ.ConnectionFactory("stomp://localhost:61613");
-		}
-	}
-}

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TemporaryQueueTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TemporaryQueueTest.cs?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TemporaryQueueTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TemporaryQueueTest.cs
Tue Feb 12 15:00:40 2008
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-using Apache.NMS;
-using NUnit.Framework;
-using Apache.Stomp;
-using System;
-
-namespace Apache.Stomp
-{
-    [ TestFixture ]
-    public class TemporaryQueueTest : NMS.Test.TemporaryQueueTest
-    {
-        protected override IConnectionFactory CreateConnectionFactory()
-        {
-			return StompTestUtils.CreateStompConnectionFactory();
-		}
-    }
-}

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TextMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TextMessage.cs?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TextMessage.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TextMessage.cs
Tue Feb 12 15:00:40 2008
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-using Apache.NMS;
-using NUnit.Framework;
-using Apache.Stomp;
-using System;
-
-namespace Apache.Stomp
-{
-	[ TestFixture ]
-    public class TextMessage : NMS.Test.TextMessage
-    {
-        protected override IConnectionFactory CreateConnectionFactory()
-        {
-			return StompTestUtils.CreateStompConnectionFactory();
-		}
-    }
-}
-
-
-

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TransactionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TransactionTest.cs?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TransactionTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/Stomp/TransactionTest.cs
Tue Feb 12 15:00:40 2008
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-using Apache.NMS;
-using NUnit.Framework;
-using Apache.Stomp;
-using System;
-
-
-namespace Apache.Stomp
-{
-	[TestFixture]
-    public class TransactionTest : NMS.Test.TransactionTest
-    {
-        protected override IConnectionFactory CreateConnectionFactory()
-        {
-			return StompTestUtils.CreateStompConnectionFactory();
-		}
-		
-    }
-}
-
-

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TemporaryQueueTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TemporaryQueueTest.cs?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TemporaryQueueTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TemporaryQueueTest.cs
Tue Feb 12 15:00:40 2008
@@ -14,19 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using Apache.NMS.ActiveMQ;
-using Apache.NMS;
 using NUnit.Framework;
-using System;
 
-namespace Apache.NMS.ActiveMQ
+namespace Apache.NMS.ActiveMQ.Test
 {
-    [ TestFixture ]
-    public class TemporaryQueueTest : NMS.Test.TemporaryQueueTest
-    {
-        protected override IConnectionFactory CreateConnectionFactory()
-        {
-            return new ConnectionFactory();
-        }
-    }
+	[TestFixture]
+	public class TemporaryQueueTest_OpenWire : Apache.NMS.Test.TemporaryQueueTest
+	{
+		protected override IConnectionFactory CreateConnectionFactory()
+		{
+			return TestUtils.CreateOpenWireConnectionFactory();
+		}
+	}
+
+	[TestFixture]
+	public class TemporaryQueueTest_Stomp : Apache.NMS.Test.TemporaryQueueTest
+	{
+		protected override IConnectionFactory CreateConnectionFactory()
+		{
+			return TestUtils.CreateOpenWireConnectionFactory();
+		}
+	}
 }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TestMain.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TestMain.cs?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TestMain.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TestMain.cs Tue Feb
12 15:00:40 2008
@@ -18,7 +18,7 @@
 using Apache.NMS;
 using System;
 
-namespace Apache.NMS.ActiveMQ
+namespace Apache.NMS.ActiveMQ.Test
 {
     public class TestMain
     {

Added: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TestUtils.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TestUtils.cs?rev=627169&view=auto
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TestUtils.cs (added)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TestUtils.cs Tue Feb
12 15:00:40 2008
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+namespace Apache.NMS.ActiveMQ.Test
+{
+	class TestUtils
+	{
+		public static Apache.NMS.IConnectionFactory CreateOpenWireConnectionFactory()
+		{
+			return new Apache.NMS.ActiveMQ.ConnectionFactory("activemq:tcp://localhost:61616");
+		}
+
+		public static Apache.NMS.IConnectionFactory CreateStompConnectionFactory()
+		{
+			return new Apache.NMS.ActiveMQ.ConnectionFactory("activemq:stomp://localhost:61613");
+		}
+	}
+}

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TextMessage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TextMessage.cs?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TextMessage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TextMessage.cs Tue
Feb 12 15:00:40 2008
@@ -14,22 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using Apache.NMS.ActiveMQ;
-using Apache.NMS;
 using NUnit.Framework;
-using System;
 
-namespace Apache.NMS.ActiveMQ
+namespace Apache.NMS.ActiveMQ.Test
 {
-	[ TestFixture ]
-    public class TextMessage : NMS.Test.TextMessage
-    {
-        protected override IConnectionFactory CreateConnectionFactory()
-        {
-            return new ConnectionFactory();
-        }
-    }
-}
-
-
+	[TestFixture]
+	public class TextMessage_OpenWire : Apache.NMS.Test.TextMessage
+	{
+		protected override IConnectionFactory CreateConnectionFactory()
+		{
+			return TestUtils.CreateOpenWireConnectionFactory();
+		}
+	}
 
+	[TestFixture]
+	public class TextMessage_Stomp : Apache.NMS.Test.TextMessage
+	{
+		protected override IConnectionFactory CreateConnectionFactory()
+		{
+			return TestUtils.CreateStompConnectionFactory();
+		}
+	}
+}
\ No newline at end of file

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TransactionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TransactionTest.cs?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TransactionTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TransactionTest.cs
Tue Feb 12 15:00:40 2008
@@ -14,23 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using Apache.NMS.ActiveMQ;
-using Apache.NMS;
 using NUnit.Framework;
-using System;
 
-
-namespace Apache.NMS.ActiveMQ
+namespace Apache.NMS.ActiveMQ.Test
 {
 	[TestFixture]
-    public class TransactionTest : NMS.Test.TransactionTest
-    {
-        protected override IConnectionFactory CreateConnectionFactory()
-        {
-            return new ConnectionFactory();
-        }
-		
-    }
-}
-
+	public class TransactionTest_OpenWire : Apache.NMS.Test.TransactionTest
+	{
+		protected override IConnectionFactory CreateConnectionFactory()
+		{
+			return TestUtils.CreateOpenWireConnectionFactory();
+		}
+	}
 
+	[TestFixture]
+	public class TransactionTest_Stomp : Apache.NMS.Test.TransactionTest
+	{
+		protected override IConnectionFactory CreateConnectionFactory()
+		{
+			return TestUtils.CreateStompConnectionFactory();
+		}
+	}
+}

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq-test.csproj?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq-test.csproj Tue Feb
12 15:00:40 2008
@@ -57,10 +57,12 @@
     <Compile Include="src\test\csharp\OpenWire\PrimitiveMapTest.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="src\test\csharp\StompHelperTest.cs" />
     <Compile Include="src\test\csharp\TemporaryQueueTest.cs" />
     <Compile Include="src\test\csharp\TestMain.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="src\test\csharp\TestUtils.cs" />
     <Compile Include="src\test\csharp\TextMessage.cs" />
     <Compile Include="src\test\csharp\TransactionTest.cs" />
   </ItemGroup>

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.csproj?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.csproj Tue Feb 12 15:00:40
2008
@@ -19,6 +19,8 @@
     <OutputPath>build\net-2.0\debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <DocumentationFile>
+    </DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
@@ -34,6 +36,15 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="activemq-dotnet.snk" />
+    <Content Include="nmsprovider-activemq.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="nmsprovider-stomp.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="nmsprovider-tcp.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="src\main\csharp\BrokerException.cs">
@@ -699,6 +710,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="src\main\csharp\Util\AtomicBoolean.cs" />
+    <Compile Include="src\main\csharp\Util\Convert.cs" />
     <Compile Include="src\main\csharp\Util\CountDownLatch.cs" />
     <Compile Include="src\main\csharp\Util\DateUtils.cs" />
     <Compile Include="src\main\csharp\Util\URISupport.cs">
@@ -712,13 +724,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="LICENSE.txt" />
-    <EmbeddedResource Include="NOTICE.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Apache.NMS.NMSConnectionFactory.activemq" />
-    <EmbeddedResource Include="Apache.NMS.NMSConnectionFactory.tcp" />
-    <EmbeddedResource Include="Apache.NMS.NMSConnectionFactory.stomp" />
+    <Content Include="LICENSE.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="NOTICE.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.sln
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.sln?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.sln (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.sln Tue Feb 12 15:00:40
2008
@@ -1,44 +1,38 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-activemq", "vs2005-activemq.csproj",
"{08321F42-4B3D-4815-B592-95962BAC3B9F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-activemq-test", "vs2005-activemq-test.csproj",
"{EB943C69-2C9B-45E7-B95B-FB916E7057ED}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-nms", "vendor\Apache.NMS\vs2005-nms.csproj",
"{300C1716-0674-4D01-8F5D-151E59A504FE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-nms-test", "vendor\Apache.NMS\vs2005-nms-test.csproj",
"{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-stomp-test", "vs2005-stomp-test.csproj",
"{F2F94D96-90F0-4724-A19F-086067556F39}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{08321F42-4B3D-4815-B592-95962BAC3B9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08321F42-4B3D-4815-B592-95962BAC3B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08321F42-4B3D-4815-B592-95962BAC3B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08321F42-4B3D-4815-B592-95962BAC3B9F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{300C1716-0674-4D01-8F5D-151E59A504FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{300C1716-0674-4D01-8F5D-151E59A504FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{300C1716-0674-4D01-8F5D-151E59A504FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{300C1716-0674-4D01-8F5D-151E59A504FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2F94D96-90F0-4724-A19F-086067556F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2F94D96-90F0-4724-A19F-086067556F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2F94D96-90F0-4724-A19F-086067556F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2F94D96-90F0-4724-A19F-086067556F39}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-activemq", "vs2005-activemq.csproj",
"{08321F42-4B3D-4815-B592-95962BAC3B9F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-activemq-test", "vs2005-activemq-test.csproj",
"{EB943C69-2C9B-45E7-B95B-FB916E7057ED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-nms", "vendor\Apache.NMS\vs2005-nms.csproj",
"{300C1716-0674-4D01-8F5D-151E59A504FE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-nms-test", "vendor\Apache.NMS\vs2005-nms-test.csproj",
"{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{08321F42-4B3D-4815-B592-95962BAC3B9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08321F42-4B3D-4815-B592-95962BAC3B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08321F42-4B3D-4815-B592-95962BAC3B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08321F42-4B3D-4815-B592-95962BAC3B9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB943C69-2C9B-45E7-B95B-FB916E7057ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{300C1716-0674-4D01-8F5D-151E59A504FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{300C1716-0674-4D01-8F5D-151E59A504FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{300C1716-0674-4D01-8F5D-151E59A504FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{300C1716-0674-4D01-8F5D-151E59A504FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-stomp-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-stomp-test.csproj?rev=627169&r1=627168&r2=627169&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-stomp-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-stomp-test.csproj Tue Feb 12
15:00:40 2008
@@ -1,70 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F2F94D96-90F0-4724-A19F-086067556F39}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Apache.Stomp.Test</RootNamespace>
-    <AssemblyName>NMS.Stomp.Test</AssemblyName>
-    <WarningLevel>4</WarningLevel>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>activemq-dotnet.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>build\net-2.0\debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>false</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>build\net-2.0\release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(USERPROFILE)\.nant\repository\org.nunit\nunit\2.2.8\all\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="activemq-dotnet.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="vs2005-activemq.csproj">
-      <Project>{08321F42-4B3D-4815-B592-95962BAC3B9F}</Project>
-      <Name>vs2005-activemq</Name>
-    </ProjectReference>
-    <ProjectReference Include="vendor\Apache.NMS\vs2005-nms-test.csproj">
-      <Project>{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}</Project>
-      <Name>vs2005-nms-test</Name>
-    </ProjectReference>
-    <ProjectReference Include="vendor\Apache.NMS\vs2005-nms.csproj">
-      <Project>{300C1716-0674-4D01-8F5D-151E59A504FE}</Project>
-      <Name>vs2005-nms</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="src\test\csharp\Stomp\BadConsumeTest.cs" />
-    <Compile Include="src\test\csharp\Stomp\CommonAssemblyInfo.cs" />
-    <Compile Include="src\test\csharp\Stomp\ConsumerTest.cs" />
-    <Compile Include="src\test\csharp\Stomp\DurableTest.cs" />
-    <Compile Include="src\test\csharp\Stomp\MapMessageTest.cs" />
-    <Compile Include="src\test\csharp\Stomp\NMSPropertyTest.cs" />
-    <Compile Include="src\test\csharp\Stomp\StompHelperTest.cs" />
-    <Compile Include="src\test\csharp\Stomp\StompTestUtils.cs" />
-    <Compile Include="src\test\csharp\Stomp\TemporaryQueueTest.cs" />
-    <Compile Include="src\test\csharp\Stomp\TextMessage.cs" />
-    <Compile Include="src\test\csharp\Stomp\TransactionTest.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file



Mime
View raw message