Author: jgomes
Date: Wed May 28 11:22:47 2008
New Revision: 661038
URL: http://svn.apache.org/viewvc?rev=661038&view=rev
Log:
Add common utility functions that all providers can use.
Updated Visual Studio project defines to be the same as the NAnt defines.
Removed:
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/Util/
Modified:
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq-test.csproj
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.csproj
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/
------------------------------------------------------------------------------
bugtraq:label = Issue #:
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/
------------------------------------------------------------------------------
--- bugtraq:message (added)
+++ bugtraq:message Wed May 28 11:22:47 2008
@@ -0,0 +1 @@
+Fixes [AMQNET-%BUGID%]. (See
https://issues.apache.org/activemq/browse/AMQNET-%BUGID%)
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/
------------------------------------------------------------------------------
bugtraq:url = https://issues.apache.org/activemq/browse/AMQNET-%BUGID%
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml?rev=661038&r1=661037&r2=661038&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml Wed May 28
11:22:47 2008
@@ -237,7 +237,7 @@
<target name="set-net-3.5-framework-configuration">
<property name="current.build.framework" value="net-3.5" />
<property name="current.build.framework.name" value=".NET 3.5"/>
- <property name="current.build.defines" value="${build.defines}NET,NET_3_5"
dynamic="true" />
+ <property name="current.build.defines"
value="${build.defines}NET,NET_2_0,NET_3_5" dynamic="true" />
<property name="current.build.framework.sign" value="true"/>
<property name="link.sdkdoc.version" value="SDK_v6_0a" />
<property name="link.sdkdoc.web" value="true" />
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=661038&r1=661037&r2=661038&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
Wed May 28 11:22:47 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
using Apache.NMS;
-using Apache.NMS.MSMQ.Util;
+using Apache.NMS.Util;
using System;
using System.Messaging;
using System.Threading;
@@ -78,11 +78,11 @@
public void Close()
{
- StopmAsyncDelivery();
+ StopAsyncDelivery();
Dispose();
}
- public void StopmAsyncDelivery()
+ public void StopAsyncDelivery()
{
asyncDelivery.Value = true;
}
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=661038&r1=661037&r2=661038&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 Wed
May 28 11:22:47 2008
@@ -17,14 +17,14 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\net-2.0\debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;NET,NET_2_0</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>
+ <DefineConstants>TRACE;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
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=661038&r1=661037&r2=661038&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2005-msmq.csproj Wed May
28 11:22:47 2008
@@ -19,14 +19,14 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>build\net-2.0\debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;NET,NET_2_0</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>
+ <DefineConstants>TRACE;NET,NET_2_0</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
@@ -53,7 +53,6 @@
<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" />
