Author: jgomes
Date: Wed May 28 11:07:26 2008
New Revision: 661033
URL: http://svn.apache.org/viewvc?rev=661033&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.ActiveMQ/trunk/src/main/csharp/Util/
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/FutureResponse.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/WireFormatNegotiator.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq-test.csproj
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.csproj
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Convert.cs
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml?rev=661033&r1=661032&r2=661033&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Wed May
28 11:07:26 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.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs?rev=661033&r1=661032&r2=661033&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Commands/ActiveMQMessage.cs
Wed May 28 11:07:26 2008
@@ -15,8 +15,8 @@
* limitations under the License.
*/
using Apache.NMS.ActiveMQ.OpenWire;
-using Apache.NMS.ActiveMQ.Util;
using Apache.NMS;
+using Apache.NMS.Util;
using System;
namespace Apache.NMS.ActiveMQ.Commands
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs?rev=661033&r1=661032&r2=661033&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
Wed May 28 11:07:26 2008
@@ -16,8 +16,8 @@
*/
using Apache.NMS.ActiveMQ.Commands;
using Apache.NMS.ActiveMQ.Transport;
-using Apache.NMS.ActiveMQ.Util;
using Apache.NMS;
+using Apache.NMS.Util;
using System;
using System.Collections;
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs?rev=661033&r1=661032&r2=661033&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/ConnectionFactory.cs
Wed May 28 11:07:26 2008
@@ -17,8 +17,8 @@
using Apache.NMS.ActiveMQ.Commands;
using Apache.NMS.ActiveMQ.Transport;
using Apache.NMS.ActiveMQ.Transport.Tcp;
-using Apache.NMS.ActiveMQ.Util;
using Apache.NMS;
+using Apache.NMS.Util;
using System;
namespace Apache.NMS.ActiveMQ
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/FutureResponse.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/FutureResponse.cs?rev=661033&r1=661032&r2=661033&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/FutureResponse.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/FutureResponse.cs
Wed May 28 11:07:26 2008
@@ -17,8 +17,8 @@
using Apache.NMS.ActiveMQ.Commands;
using System;
using System.Threading;
-using Apache.NMS.ActiveMQ.Util;
using Apache.NMS;
+using Apache.NMS.Util;
namespace Apache.NMS.ActiveMQ.Transport
{
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs?rev=661033&r1=661032&r2=661033&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
Wed May 28 11:07:26 2008
@@ -21,8 +21,8 @@
using System.Collections.Specialized;
using Apache.NMS.ActiveMQ.OpenWire;
using Apache.NMS.ActiveMQ.Transport.Stomp;
-using Apache.NMS.ActiveMQ.Util;
using Apache.NMS;
+using Apache.NMS.Util;
namespace Apache.NMS.ActiveMQ.Transport.Tcp
{
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/WireFormatNegotiator.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/WireFormatNegotiator.cs?rev=661033&r1=661032&r2=661033&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/WireFormatNegotiator.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/WireFormatNegotiator.cs
Wed May 28 11:07:26 2008
@@ -19,8 +19,8 @@
using Apache.NMS.ActiveMQ.Commands;
using Apache.NMS.ActiveMQ.OpenWire;
using Apache.NMS.ActiveMQ.Transport;
+using Apache.NMS.Util;
using System;
-using Apache.NMS.ActiveMQ.Util;
namespace Apache.NMS.ActiveMQ.Transport
{
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=661033&r1=661032&r2=661033&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
Wed May 28 11:07:26 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.ActiveMQ/trunk/vs2005-activemq.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.csproj?rev=661033&r1=661032&r2=661033&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.csproj
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2005-activemq.csproj
Wed May 28 11:07:26 2008
@@ -17,7 +17,7 @@
<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>
<DocumentationFile>
</DocumentationFile>
@@ -26,7 +26,7 @@
<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>
@@ -709,13 +709,6 @@
<Compile Include="src\main\csharp\Transport\WireFormatNegotiator.cs">
<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">
- <SubType>Code</SubType>
- </Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="vendor\Apache.NMS\vs2005-nms.csproj">
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Convert.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Convert.cs?rev=661033&r1=661032&r2=661033&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Convert.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Convert.cs
Wed May 28 11:07:26 2008
@@ -18,7 +18,7 @@
namespace Apache.NMS.Util
{
- class NMSConvert
+ public class NMSConvert
{
public static AcknowledgementMode ToAcknowledgementMode(string
ackText)
{
