activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r591227 - in /activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk: src/main/csharp/MessageConsumer.cs vendor/ vs2005-msmq-test.csproj vs2005-msmq.csproj vs2005-msmq.sln
Date Fri, 02 Nov 2007 04:56:04 GMT
Author: chirino
Date: Thu Nov  1 21:56:02 2007
New Revision: 591227

URL: http://svn.apache.org/viewvc?rev=591227&view=rev
Log:
Applied patch in AMQNET-72 to avoid depending on the ActiveMQ impl.

Modified:
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vendor/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq-test.csproj
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.csproj
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.sln

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs?rev=591227&r1=591226&r2=591227&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs Thu
Nov  1 21:56:02 2007
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using Apache.NMS.ActiveMQ;
-using Apache.NMS.ActiveMQ.Util;
 using Apache.NMS;
+using Apache.NMS.MSMQ.Util;
 using System;
 using System.Messaging;
 using System.Threading;

Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vendor/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Thu Nov  1 21:56:02 2007
@@ -1,2 +1 @@
 Apache.NMS              https://svn.apache.org/repos/asf/activemq/activemq-dotnet/Apache.NMS/trunk
-Apache.NMS.ActiveMQ     https://svn.apache.org/repos/asf/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq-test.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq-test.csproj?rev=591227&r1=591226&r2=591227&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq-test.csproj Thu Nov  1 21:56:02
2007
@@ -38,10 +38,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Apache.NMS.ActiveMQ\vs2005-activemq.csproj">
-      <Project>{08321F42-4B3D-4815-B592-95962BAC3B9F}</Project>
-      <Name>vs2005-activemq</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Apache.NMS\vs2005-nms-test.csproj">
       <Project>{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}</Project>
       <Name>vs2005-nms-test</Name>

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.csproj
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.csproj?rev=591227&r1=591226&r2=591227&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.csproj Thu Nov  1 21:56:02
2007
@@ -53,15 +53,13 @@
     <Compile Include="src\main\csharp\Session.cs" />
     <Compile Include="src\main\csharp\StreamMessage.cs" />
     <Compile Include="src\main\csharp\TextMessage.cs" />
+    <Compile Include="src\main\csharp\Util\AtomicBoolean.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="activemq-dotnet.snk" />
+    <None Include="src\main\csharp\MessageConsumer.cs.orig" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Apache.NMS.ActiveMQ\vs2005-activemq.csproj">
-      <Project>{08321F42-4B3D-4815-B592-95962BAC3B9F}</Project>
-      <Name>vs2005-activemq</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Apache.NMS\vs2005-nms.csproj">
       <Project>{300C1716-0674-4D01-8F5D-151E59A504FE}</Project>
       <Name>vs2005-nms</Name>

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.sln
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.sln?rev=591227&r1=591226&r2=591227&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.sln (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.sln Thu Nov  1 21:56:02 2007
@@ -9,8 +9,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-nms-test", "..\Apache.NMS\vs2005-nms-test.csproj",
"{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vs2005-activemq", "..\Apache.NMS.ActiveMQ\vs2005-activemq.csproj",
"{08321F42-4B3D-4815-B592-95962BAC3B9F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,10 +31,6 @@
 		{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
-		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE



Mime
View raw message