activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r817759 [1/2] - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/trunk/ Apache.NMS.ActiveMQ/trunk/src/main/csharp/ Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/ Apache.NMS.ActiveMQ/tr...
Date Tue, 22 Sep 2009 18:47:28 GMT
Author: jgomes
Date: Tue Sep 22 18:46:57 2009
New Revision: 817759

URL: http://svn.apache.org/viewvc?rev=817759&view=rev
Log:
Removed old coding work-arounds for .NET 1.1.

Fixes [AMQNET-190]. (See https://issues.apache.org/activemq/browse/AMQNET-190)

Removed:
    activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/AtomicBoolean.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/AtomicReference.cs
Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionState.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/SessionState.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/TransactionState.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/WireFormatNegotiator.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Atomic.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/MemoryUsage.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MapMessageTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MemoryUsageTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageSelectorTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSPropertyTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationDeletionTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TextMessage.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj

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=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Tue Sep 22 18:46:57 2009
@@ -41,7 +41,7 @@
 	<property name="current.build.config"    value="${if(project.release.type == 'release', 'release', 'debug')}" overwrite="false" />
 	<property name="current.build.framework" value="${framework::get-target-framework()}" overwrite="false" />
 	<property name="current.build.defines"   value="${build.defines}" />
-	<property name="build.framework.strings" value="net-1.1,net-2.0,net-3.5,mono-2.0,netcf-2.0" />
+	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" />
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}" dynamic="true" />
 
 	<if test="${build.skip.release}">
@@ -199,18 +199,6 @@
 		<property name="csc.optimize" value="true" />
 	</target>
 
-	<target name="set-net-1.1-framework-configuration">
-		<property name="current.build.framework" value="net-1.1" />
-		<property name="current.build.framework.name" value=".NET 1.1" />
-		<property name="current.build.defines" value="${build.defines}NET,NET_1_1" dynamic="true" />
-		<property name="current.build.framework.sign" value="true" />
-		<property name="link.sdkdoc.version" value="SDK_v1_1" />
-		<property name="link.sdkdoc.web" value="true" />
-		<if test="${framework::exists(current.build.framework)}">
-			<property name="nant.settings.currentframework" value="${current.build.framework}" />
-		</if>
-	</target>
-
 	<target name="set-net-2.0-framework-configuration">
 		<property name="current.build.framework" value="net-2.0" />
 		<property name="current.build.framework.name" value=".NET 2.0" />

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Tue Sep 22 18:46:57 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -16,118 +16,112 @@
     limitations under the License.
 -->
 <project name="Apache.NMS.ActiveMQ" default="default" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
+	<!-- ============================================================================================ -->
+	<!--      I N I T I A L I Z A T I O N                                                             -->
+	<!-- ============================================================================================ -->
+	<property name="basedir" value="${project::get-base-directory()}" />
+	<property name="project.name" value="Apache.NMS.ActiveMQ" />
+	<property name="project.group" value="org.apache.activemq" />
+	<property name="project.version" value="1.2.0" unless="${property::exists('project.version')}" />
+	<property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
+	<property name="project.short_description" value="Apache NMS for ActiveMQ Class Library" />
+	<property name="project.description" value="Apache NMS for ActiveMQ Class Library (.Net Messaging Library Implementation): An implementation of the NMS API for ActiveMQ" />
+
+	<!-- Lib organized as: module/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
+	<property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+	<property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
+	<property name="Apache.NMS.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll" dynamic="true" />
+	<property name="Apache.NMS.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb" dynamic="true" />
+	<property name="Apache.NMS.Test.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll" dynamic="true" />
+	<property name="Apache.NMS.Test.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb" dynamic="true" />
+	<property name="NUnit.Projectfile" value="Apache.NMS.ActiveMQ.Test.nunit" />
+
+	<target name="vendor-init" description="Initializes Vendor library from local repository.">
+		<!--
+		   Vendor specific info.  The prefix of 'vendor.apache.org' is taken from the property
+		   'vendor.fileset.names'.  This comma-delimited list is iterated, and properties with
+		   well-known suffixes are used to access and copy down vendor file dependencies.
+		-->
+		<property name="vendor.fileset.names" value="vendor.apache.org,vendor.nunit.org" />
+
+		<!-- Property grouping for 'vendor.apache.org' -->
+		<property name="vendor.apache.org.name" value="Apache.NMS" />
+		<property name="vendor.apache.org.group" value="org.apache.activemq" />
+		<property name="vendor.apache.org.version" value="1.2.0" />
+		<property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb" />
+
+		<!-- Property grouping for 'vendor.nunit.org' -->
+		<property name="vendor.nunit.org.name" value="NUnit" />
+		<property name="vendor.nunit.org.group" value="org.nunit" />
+		<property name="vendor.nunit.org.version" value="2.4.8" />
+		<property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+	</target>
+
+	<target name="dependency-init" description="Initializes build dependencies">
+		<if test="${not file::exists(Apache.NMS.dll)}">
+			<echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." />
+			<property name="build.skip" value="true" />
+		</if>
+
+		<assemblyfileset failonempty="true" id="dependencies">
+			<include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+			<include name="${Apache.NMS.dll}" />
+		</assemblyfileset>
+
+		<assemblyfileset failonempty="true" id="test.dependencies">
+			<include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+			<include name="${Apache.NMS.dll}" />
+			<include name="${Apache.NMS.Test.dll}" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${nunit.dll}" />
+			<include name="${nunit.extensions.dll}" />
+		</assemblyfileset>
+
+		<fileset id="content.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="nmsprovider-*.config" />
+			<include name="${Apache.NMS.dll}" />
+			<include name="${Apache.NMS.pdb}" />
+			<include name="${Apache.NMS.Test.dll}" />
+			<include name="${Apache.NMS.Test.pdb}" />
+			<include name="${nunit.dll}" />
+			<include name="${nunit.extensions.dll}" />
+			<include name="${NUnit.Projectfile}" />
+		</fileset>
+
+		<fileset id="install.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${build.bin.dir}/${project.name}.pdb" />
+			<include name="${build.bin.dir}/${project.name}.dll.mdb" />
+			<include name="nmsprovider-activemq.config" />
+			<include name="nmsprovider-tcp.config" />
+			<include name="nmsprovider-stomp.config" />
+		</fileset>
+
+		<fileset id="deploy.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${build.bin.dir}/${project.name}.pdb" />
+			<include name="${build.bin.dir}/${project.name}.dll.mdb" />
+			<include name="${build.bin.dir}/${project.name}.xml" />
+			<include name="${build.bin.dir}/${project.name}.Test.dll" />
+			<include name="${build.bin.dir}/${project.name}.Test.pdb" />
+			<include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
+			<include name="${build.bin.dir}/${project.name}.Test.xml" />
+			<include name="${build.bin.dir}/nmsprovider-*.config" />
+		</fileset>
+	</target>
 
-  <!-- ============================================================================================ -->
-  <!--      I N I T I A L I Z A T I O N                                                             -->
-  <!-- ============================================================================================ -->
-  <property name="basedir" value="${project::get-base-directory()}"/>
-  <property name="project.name" value="Apache.NMS.ActiveMQ"/>
-  <property name="project.group" value="org.apache.activemq"/>
-  <property name="project.version"  value="1.2.0" unless="${property::exists('project.version')}"/>
-  <property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
-  <property name="project.short_description" value="Apache NMS for ActiveMQ Class Library"/>
-  <property name="project.description" value="Apache NMS for ActiveMQ Class Library (.Net Messaging Library Implementation): An implementation of the NMS API for ActiveMQ"/>
-
-  <!-- Lib organized as: module/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
-  <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true"/>
-  <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true"/>
-  <property name="Apache.NMS.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll" dynamic="true"/>
-  <property name="Apache.NMS.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb" dynamic="true"/>
-  <property name="Apache.NMS.Test.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll" dynamic="true"/>
-  <property name="Apache.NMS.Test.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb" dynamic="true"/>
-
-  <property name="NUnit.Projectfile" value="Apache.NMS.ActiveMQ.Test.nunit"/>
-
-  <!-- Skip certain frameworks, since ActiveMQ.NET Client is not supported on those platforms. -->
-  <property name="build.net-1.1.skip" value="true"/>
-
-  <target name="vendor-init" description="Initializes Vendor library from local repository.">
-    <!-- Vendor specific info.  The prefix of 'vendor.apache.org' is taken from the property
-         'vendor.fileset.names'.  This comma-delimited list is iterated, and properties with
-         well-known suffixes are used to access and copy down vendor file dependencies. -->
-    <property name="vendor.fileset.names" value="vendor.apache.org,vendor.nunit.org"/>
-
-    <!-- Property grouping for 'vendor.apache.org' -->
-    <property name="vendor.apache.org.name" value="Apache.NMS"/>
-    <property name="vendor.apache.org.group" value="org.apache.activemq"/>
-    <property name="vendor.apache.org.version" value="1.2.0"/>
-    <property name="vendor.apache.org.filenames"
-              value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb" />
-
-    <!-- Property grouping for 'vendor.nunit.org' -->
-    <property name="vendor.nunit.org.name" value="NUnit"/>
-    <property name="vendor.nunit.org.group" value="org.nunit"/>
-    <property name="vendor.nunit.org.version" value="2.4.8"/>
-    <property name="vendor.nunit.org.filenames"
-              value="nunit.framework.dll,nunit.framework.extensions.dll" />
-  </target>
-  
-  <target name="dependency-init" description="Initializes build dependencies">
-    <if test="${not file::exists(Apache.NMS.dll)}">
-	 <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." />
-	 <property name="build.skip" value="true"/>
-    </if>
-
-    <assemblyfileset failonempty="true" id="dependencies">
-      <include name="${current.build.framework.assembly.dir}/mscorlib.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Xml.dll"/>
-      <include name="${Apache.NMS.dll}"/>
-    </assemblyfileset>
-
-    <assemblyfileset failonempty="true" id="test.dependencies">
-      <include name="${current.build.framework.assembly.dir}/mscorlib.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Xml.dll"/>
-      <include name="${Apache.NMS.dll}"/>
-      <include name="${Apache.NMS.Test.dll}"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${nunit.dll}"/>
-      <include name="${nunit.extensions.dll}"/>
-    </assemblyfileset>
-
-    <fileset id="content.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="nmsprovider-*.config"/>
-      <include name="${Apache.NMS.dll}"/>
-      <include name="${Apache.NMS.pdb}"/>
-      <include name="${Apache.NMS.Test.dll}"/>
-      <include name="${Apache.NMS.Test.pdb}"/>
-      <include name="${nunit.dll}"/>
-      <include name="${nunit.extensions.dll}"/>
-      <include name="${NUnit.Projectfile}"/>
-    </fileset>
-
-    <fileset id="install.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${build.bin.dir}/${project.name}.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.dll.mdb"/>
-      <include name="nmsprovider-activemq.config"/>
-      <include name="nmsprovider-tcp.config"/>
-      <include name="nmsprovider-stomp.config"/>
-    </fileset>
-
-    <fileset id="deploy.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${build.bin.dir}/${project.name}.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.dll.mdb"/>
-      <include name="${build.bin.dir}/${project.name}.xml"/>
-      <include name="${build.bin.dir}/${project.name}.Test.dll"/>
-      <include name="${build.bin.dir}/${project.name}.Test.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.Test.dll.mdb"/>
-      <include name="${build.bin.dir}/${project.name}.Test.xml"/>
-      <include name="${build.bin.dir}/nmsprovider-*.config"/>
-    </fileset>
-  </target>
-
-  <target name="default" depends="download-vendor-all, install-all" />
-  
-  <!-- Load the common target definitions  -->
-  <include buildfile="${basedir}/nant-common.xml"/>
+	<target name="default" depends="download-vendor-all, install-all" />
 
+	<!-- Load the common target definitions  -->
+	<include buildfile="${basedir}/nant-common.xml" />
 </project>

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=817759&r1=817758&r2=817759&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 Tue Sep 22 18:46:57 2009
@@ -49,7 +49,7 @@
 		private int sessionCounter = 0;
 		private int temporaryDestinationCounter = 0;
 		private int localTransactionCounter;
-		private readonly AtomicBoolean started = new AtomicBoolean(false);
+		private readonly Atomic<bool> started = new Atomic<bool>(false);
 		private bool disposed = false;
 
 		public Connection(Uri connectionUri, ITransport transport, ConnectionInfo info)

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionState.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionState.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionState.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/ConnectionState.cs Tue Sep 22 18:46:57 2009
@@ -28,7 +28,7 @@
 		private AtomicDictionary<TransactionId, TransactionState> transactions = new AtomicDictionary<TransactionId, TransactionState>();
 		private AtomicDictionary<SessionId, SessionState> sessions = new AtomicDictionary<SessionId, SessionState>();
 		private AtomicCollection<DestinationInfo> tempDestinations = new AtomicCollection<DestinationInfo>();
-		private AtomicBoolean _shutdown = new AtomicBoolean(false);
+		private Atomic<bool> _shutdown = new Atomic<bool>(false);
 
 		public ConnectionState(ConnectionInfo info)
 		{

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/SessionState.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/SessionState.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/SessionState.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/SessionState.cs Tue Sep 22 18:46:57 2009
@@ -27,7 +27,7 @@
 
 		private AtomicDictionary<ProducerId, ProducerState> producers = new AtomicDictionary<ProducerId, ProducerState>();
 		private AtomicDictionary<ConsumerId, ConsumerState> consumers = new AtomicDictionary<ConsumerId, ConsumerState>();
-		private AtomicBoolean _shutdown = new AtomicBoolean(false);
+		private Atomic<bool> _shutdown = new Atomic<bool>(false);
 
 		public SessionState(SessionInfo info)
 		{

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/TransactionState.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/TransactionState.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/TransactionState.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/State/TransactionState.cs Tue Sep 22 18:46:57 2009
@@ -27,7 +27,7 @@
 
 		private List<Command> commands = new List<Command>();
 		private TransactionId id;
-		private AtomicBoolean _shutdown = new AtomicBoolean(false);
+		private Atomic<bool> _shutdown = new Atomic<bool>(false);
 		private bool prepared;
 		private int preparedResult;
 

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransport.cs Tue Sep 22 18:46:57 2009
@@ -37,7 +37,7 @@
 		private Thread readThread;
 		private bool started;
 		private bool disposed = false;
-		private AtomicBoolean closed = new AtomicBoolean(false);
+		private Atomic<bool> closed = new Atomic<bool>(false);
 		private volatile bool seenShutdown;
 		private TimeSpan maxWait = TimeSpan.FromMilliseconds(Timeout.Infinite);
 		private Uri connectedUri;

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=817759&r1=817758&r2=817759&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 Tue Sep 22 18:46:57 2009
@@ -32,7 +32,7 @@
         private OpenWireFormat wireFormat;
         private TimeSpan negotiateTimeout = TimeSpan.FromSeconds(15);
 
-        private AtomicBoolean firstStart=new AtomicBoolean(true);
+        private Atomic<bool> firstStart=new Atomic<bool>(true);
         private CountDownLatch readyCountDownLatch = new CountDownLatch(1);
         private CountDownLatch wireInfoSentDownLatch = new CountDownLatch(1);
 

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/VirtualTopicTest.cs Tue Sep 22 18:46:57 2009
@@ -33,7 +33,6 @@
 
 		protected const int totalMsgs = 5;
 
-#if !NET_1_1
 		[RowTest]
 		[Row(AcknowledgementMode.AutoAcknowledge,   MsgDeliveryMode.NonPersistent)]
 		[Row(AcknowledgementMode.AutoAcknowledge,   MsgDeliveryMode.Persistent)]
@@ -43,7 +42,6 @@
 		[Row(AcknowledgementMode.DupsOkAcknowledge, MsgDeliveryMode.Persistent)]
 		[Row(AcknowledgementMode.Transactional,     MsgDeliveryMode.NonPersistent)]
 		[Row(AcknowledgementMode.Transactional,     MsgDeliveryMode.Persistent)]
-#endif
 		public void SendReceiveVirtualTopicMessage(AcknowledgementMode ackMode, MsgDeliveryMode deliveryMode)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
@@ -99,7 +97,6 @@
 		protected int receivedA;
 		protected int receivedB;
 
-#if !NET_1_1
 		[RowTest]
 		[Row(AcknowledgementMode.AutoAcknowledge,   MsgDeliveryMode.NonPersistent)]
 		[Row(AcknowledgementMode.AutoAcknowledge,   MsgDeliveryMode.Persistent)]
@@ -108,7 +105,6 @@
 		[Row(AcknowledgementMode.DupsOkAcknowledge, MsgDeliveryMode.NonPersistent)]
 		[Row(AcknowledgementMode.DupsOkAcknowledge, MsgDeliveryMode.Persistent)]
 		// Do not use listeners with transactional processing.
-#endif
 		public void AsyncSendReceiveVirtualTopicMessage(AcknowledgementMode ackMode, MsgDeliveryMode deliveryMode)
 		{
 			receivedA = 0;

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Tue Sep 22 18:46:57 2009
@@ -41,7 +41,7 @@
 	<property name="current.build.config"    value="${if(project.release.type == 'release', 'release', 'debug')}" overwrite="false" />
 	<property name="current.build.framework" value="${framework::get-target-framework()}" overwrite="false" />
 	<property name="current.build.defines"   value="${build.defines}" />
-	<property name="build.framework.strings" value="net-1.1,net-2.0,net-3.5,mono-2.0,netcf-2.0" />
+	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" />
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}" dynamic="true" />
 
 	<if test="${build.skip.release}">
@@ -199,18 +199,6 @@
 		<property name="csc.optimize" value="true" />
 	</target>
 
-	<target name="set-net-1.1-framework-configuration">
-		<property name="current.build.framework" value="net-1.1" />
-		<property name="current.build.framework.name" value=".NET 1.1" />
-		<property name="current.build.defines" value="${build.defines}NET,NET_1_1" dynamic="true" />
-		<property name="current.build.framework.sign" value="true" />
-		<property name="link.sdkdoc.version" value="SDK_v1_1" />
-		<property name="link.sdkdoc.web" value="true" />
-		<if test="${framework::exists(current.build.framework)}">
-			<property name="nant.settings.currentframework" value="${current.build.framework}" />
-		</if>
-	</target>
-
 	<target name="set-net-2.0-framework-configuration">
 		<property name="current.build.framework" value="net-2.0" />
 		<property name="current.build.framework.name" value=".NET 2.0" />

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build Tue Sep 22 18:46:57 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -16,128 +16,124 @@
     limitations under the License.
 -->
 <project name="Apache.NMS.EMS" default="default" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
+	<!-- ============================================================================================ -->
+	<!--      I N I T I A L I Z A T I O N                                                             -->
+	<!-- ============================================================================================ -->
+	<property name="basedir" value="${project::get-base-directory()}" />
+	<property name="project.name" value="Apache.NMS.EMS" />
+	<property name="project.group" value="org.apache.activemq" />
+	<property name="project.version" value="1.2.0" unless="${property::exists('project.version')}" />
+	<property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
+	<property name="project.short_description" value="Apache NMS for EMS Class Library" />
+	<property name="project.description" value="Apache NMS for EMS Class Library (.Net Messaging Library Implementation): An implementation of the NMS API for EMS" />
+
+	<!-- The EMS module is not CLS compliant yet -->
+	<property name="project.cls.compliant" value="false" />
+
+	<!-- Repository organized as: organization/module/version/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
+	<property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+	<property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
+	<property name="Apache.NMS.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll" dynamic="true" />
+	<property name="Apache.NMS.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb" dynamic="true" />
+	<property name="Apache.NMS.Test.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll" dynamic="true" />
+	<property name="Apache.NMS.Test.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb" dynamic="true" />
+	<property name="TIBCO.EMS.dll" value="${basedir}/lib/TIBCO.EMS/${current.build.framework}/TIBCO.EMS.dll" dynamic="true" />
+	<property name="NUnit.Projectfile" value="Apache.NMS.EMS.Test.nunit" />
+
+	<!-- Skip certain frameworks, since TIBCO client is not supported on those platforms. -->
+	<property name="build.netcf-2.0.skip" value="true" />
+	<property name="build.mono-2.0.skip" value="true" />
+
+	<target name="vendor-init" description="Initializes Vendor library from local repository.">
+		<!--
+		   Vendor specific info.  The prefix of 'vendor.apache.org' is taken from the property
+		   'vendor.fileset.names'.  This comma-delimited list is iterated, and properties with
+		   well-known suffixes are used to access and copy down vendor file dependencies.
+		-->
+		<property name="vendor.fileset.names" value="vendor.apache.org,vendor.nunit.org,vendor.tibco.org" />
+
+		<!-- Property grouping for 'vendor.apache.org' -->
+		<property name="vendor.apache.org.name" value="Apache.NMS" />
+		<property name="vendor.apache.org.group" value="org.apache.activemq" />
+		<property name="vendor.apache.org.version" value="1.2.0" />
+		<property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb" />
+
+		<!-- Property grouping for 'vendor.nunit.org' -->
+		<property name="vendor.nunit.org.name" value="NUnit" />
+		<property name="vendor.nunit.org.group" value="org.nunit" />
+		<property name="vendor.nunit.org.version" value="2.4.8" />
+		<property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+
+		<!-- Property grouping for 'vendor.tibco.org' -->
+		<property name="vendor.tibco.org.name" value="TIBCO.EMS" />
+		<property name="vendor.tibco.org.group" value="org.tibco.ems" />
+		<property name="vendor.tibco.org.version" value="4.1.0" />
+		<property name="vendor.tibco.org.filenames" value="TIBCO.EMS.dll" />
+	</target>
+
+	<target name="dependency-init" description="Initializes build dependencies">
+		<if test="${not file::exists(Apache.NMS.dll)}">
+			<echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." />
+			<property name="build.skip" value="true" />
+		</if>
+
+		<assemblyfileset failonempty="true" id="dependencies">
+			<include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+			<include name="${TIBCO.EMS.dll}" />
+			<include name="${Apache.NMS.dll}" />
+		</assemblyfileset>
+
+		<assemblyfileset failonempty="true" id="test.dependencies">
+			<include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+			<include name="${TIBCO.EMS.dll}" />
+			<include name="${Apache.NMS.dll}" />
+			<include name="${Apache.NMS.Test.dll}" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${nunit.dll}" />
+			<include name="${nunit.extensions.dll}" />
+		</assemblyfileset>
+
+		<fileset id="content.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="nmsprovider-*.config" />
+			<include name="${TIBCO.EMS.dll}" />
+			<include name="${Apache.NMS.dll}" />
+			<include name="${Apache.NMS.pdb}" />
+			<include name="${Apache.NMS.Test.dll}" />
+			<include name="${Apache.NMS.Test.pdb}" />
+			<include name="${nunit.dll}" />
+			<include name="${nunit.extensions.dll}" />
+			<include name="${NUnit.Projectfile}" />
+		</fileset>
+
+		<fileset id="install.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${build.bin.dir}/${project.name}.pdb" />
+			<include name="nmsprovider-ems.config" />
+		</fileset>
+
+		<fileset id="deploy.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${build.bin.dir}/${project.name}.pdb" />
+			<include name="${build.bin.dir}/${project.name}.xml" />
+			<include name="${build.bin.dir}/${project.name}.Test.dll" />
+			<include name="${build.bin.dir}/${project.name}.Test.pdb" />
+			<include name="${build.bin.dir}/${project.name}.Test.xml" />
+			<include name="nmsprovider-*.config" />
+		</fileset>
+	</target>
 
-  <!-- ============================================================================================ -->
-  <!--      I N I T I A L I Z A T I O N                                                             -->
-  <!-- ============================================================================================ -->
-  <property name="basedir" value="${project::get-base-directory()}"/>
-  <property name="project.name" value="Apache.NMS.EMS"/>
-  <property name="project.group" value="org.apache.activemq"/>
-  <property name="project.version" value="1.2.0" unless="${property::exists('project.version')}"/>
-  <property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
-  <property name="project.short_description" value="Apache NMS for EMS Class Library"/>
-  <property name="project.description" value="Apache NMS for EMS Class Library (.Net Messaging Library Implementation): An implementation of the NMS API for EMS"/>
-  <!-- The EMS module is not CLS compliant yet -->
-  <property name="project.cls.compliant" value="false"/>
-
-  <!-- Repository organized as: organization/module/version/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
-  <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true"/>
-  <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true"/>
-  <property name="Apache.NMS.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll" dynamic="true"/>
-  <property name="Apache.NMS.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb" dynamic="true"/>
-  <property name="Apache.NMS.Test.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll" dynamic="true"/>
-  <property name="Apache.NMS.Test.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb" dynamic="true"/>
-  <property name="TIBCO.EMS.dll" value="${basedir}/lib/TIBCO.EMS/${current.build.framework}/TIBCO.EMS.dll" dynamic="true"/>
-
-  <property name="NUnit.Projectfile" value="Apache.NMS.EMS.Test.nunit"/>
-
-  <!-- Skip certain frameworks, since TIBCO client is not supported on those platforms. -->
-  <property name="build.net-1.1.skip" value="true"/>
-  <property name="build.netcf-2.0.skip" value="true"/>
-  <property name="build.mono-2.0.skip" value="true"/>
-
-  <target name="vendor-init" description="Initializes Vendor library from local repository.">
-    <!-- Vendor specific info.  The prefix of 'vendor.apache.org' is taken from the property
-         'vendor.fileset.names'.  This comma-delimited list is iterated, and properties with
-         well-known suffixes are used to access and copy down vendor file dependencies. -->
-    <property name="vendor.fileset.names" value="vendor.apache.org,vendor.nunit.org,vendor.tibco.org"/>
-
-    <!-- Property grouping for 'vendor.apache.org' -->
-    <property name="vendor.apache.org.name" value="Apache.NMS"/>
-    <property name="vendor.apache.org.group" value="org.apache.activemq"/>
-    <property name="vendor.apache.org.version" value="1.2.0"/>
-    <property name="vendor.apache.org.filenames"
-              value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb" />
-
-    <!-- Property grouping for 'vendor.nunit.org' -->
-    <property name="vendor.nunit.org.name" value="NUnit"/>
-    <property name="vendor.nunit.org.group" value="org.nunit"/>
-    <property name="vendor.nunit.org.version" value="2.4.8"/>
-    <property name="vendor.nunit.org.filenames"
-              value="nunit.framework.dll,nunit.framework.extensions.dll" />
-
-    <!-- Property grouping for 'vendor.tibco.org' -->
-    <property name="vendor.tibco.org.name" value="TIBCO.EMS"/>
-    <property name="vendor.tibco.org.group" value="org.tibco.ems"/>
-    <property name="vendor.tibco.org.version" value="4.1.0"/>
-    <property name="vendor.tibco.org.filenames"
-              value="TIBCO.EMS.dll" />
-  </target>
-
-  <target name="dependency-init" description="Initializes build dependencies">
-    <if test="${not file::exists(Apache.NMS.dll)}">
-	 <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." />
-	 <property name="build.skip" value="true"/>
-    </if>
-
-  	<assemblyfileset failonempty="true" id="dependencies">
-      <include name="${current.build.framework.assembly.dir}/mscorlib.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Xml.dll"/>
-      <include name="${TIBCO.EMS.dll}"/>
-      <include name="${Apache.NMS.dll}"/>
-  	</assemblyfileset>
-
-  	<assemblyfileset failonempty="true" id="test.dependencies">
-      <include name="${current.build.framework.assembly.dir}/mscorlib.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Xml.dll"/>
-      <include name="${TIBCO.EMS.dll}"/>
-      <include name="${Apache.NMS.dll}"/>
-      <include name="${Apache.NMS.Test.dll}"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${nunit.dll}"/>
-      <include name="${nunit.extensions.dll}"/>
-  	</assemblyfileset>
-
-    <fileset id="content.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="nmsprovider-*.config"/>
-      <include name="${TIBCO.EMS.dll}"/>
-      <include name="${Apache.NMS.dll}"/>
-      <include name="${Apache.NMS.pdb}"/>
-      <include name="${Apache.NMS.Test.dll}"/>
-      <include name="${Apache.NMS.Test.pdb}"/>
-      <include name="${nunit.dll}"/>
-      <include name="${nunit.extensions.dll}"/>
-      <include name="${NUnit.Projectfile}"/>
-    </fileset>
-
-    <fileset id="install.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${build.bin.dir}/${project.name}.pdb"/>
-      <include name="nmsprovider-ems.config"/>
-    </fileset>
-
-    <fileset id="deploy.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${build.bin.dir}/${project.name}.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.xml"/>
-      <include name="${build.bin.dir}/${project.name}.Test.dll"/>
-      <include name="${build.bin.dir}/${project.name}.Test.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.Test.xml"/>
-      <include name="nmsprovider-*.config"/>
-    </fileset>
-  </target>
-
-  <target name="default" depends="download-vendor-all, install-all" />
-
-  <!-- Load the common target definitions  -->
-  <include buildfile="${basedir}/nant-common.xml"/>
+	<target name="default" depends="download-vendor-all, install-all" />
 
+	<!-- Load the common target definitions  -->
+	<include buildfile="${basedir}/nant-common.xml" />
 </project>

Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Connection.cs Tue Sep 22 18:46:57 2009
@@ -27,7 +27,7 @@
     {
     	private Apache.NMS.AcknowledgementMode acknowledgementMode;
     	public readonly TIBCO.EMS.Connection tibcoConnection;
-		private readonly AtomicBoolean started = new AtomicBoolean(false);
+		private readonly Atomic<bool> started = new Atomic<bool>(false);
 		private bool closed = false;
     	private bool disposed = false;
 

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=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml Tue Sep 22 18:46:57 2009
@@ -41,7 +41,7 @@
 	<property name="current.build.config"    value="${if(project.release.type == 'release', 'release', 'debug')}" overwrite="false" />
 	<property name="current.build.framework" value="${framework::get-target-framework()}" overwrite="false" />
 	<property name="current.build.defines"   value="${build.defines}" />
-	<property name="build.framework.strings" value="net-1.1,net-2.0,net-3.5,mono-2.0,netcf-2.0" />
+	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" />
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}" dynamic="true" />
 
 	<if test="${build.skip.release}">
@@ -199,18 +199,6 @@
 		<property name="csc.optimize" value="true" />
 	</target>
 
-	<target name="set-net-1.1-framework-configuration">
-		<property name="current.build.framework" value="net-1.1" />
-		<property name="current.build.framework.name" value=".NET 1.1" />
-		<property name="current.build.defines" value="${build.defines}NET,NET_1_1" dynamic="true" />
-		<property name="current.build.framework.sign" value="true" />
-		<property name="link.sdkdoc.version" value="SDK_v1_1" />
-		<property name="link.sdkdoc.web" value="true" />
-		<if test="${framework::exists(current.build.framework)}">
-			<property name="nant.settings.currentframework" value="${current.build.framework}" />
-		</if>
-	</target>
-
 	<target name="set-net-2.0-framework-configuration">
 		<property name="current.build.framework" value="net-2.0" />
 		<property name="current.build.framework.name" value=".NET 2.0" />

Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build Tue Sep 22 18:46:57 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -16,116 +16,113 @@
     limitations under the License.
 -->
 <project name="Apache.NMS.MSMQ" default="default" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
+	<!-- ============================================================================================ -->
+	<!--      I N I T I A L I Z A T I O N                                                             -->
+	<!-- ============================================================================================ -->
+	<property name="basedir" value="${project::get-base-directory()}" />
+	<property name="project.name" value="Apache.NMS.MSMQ" />
+	<property name="project.group" value="org.apache.activemq" />
+	<property name="project.version" value="1.2.0" unless="${property::exists('project.version')}" />
+	<property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
+	<property name="project.short_description" value="Apache NMS for MSMQ Class Library" />
+	<property name="project.description" value="Apache NMS for MSMQ Class Library (.Net Messaging Library Implementation): An implementation of the NMS API for MSMQ" />
+
+	<!-- Repository organized as: organization/module/version/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
+	<property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+	<property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
+	<property name="Apache.NMS.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll" dynamic="true" />
+	<property name="Apache.NMS.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb" dynamic="true" />
+	<property name="Apache.NMS.Test.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll" dynamic="true" />
+	<property name="Apache.NMS.Test.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb" dynamic="true" />
+	<property name="NUnit.Projectfile" value="Apache.NMS.MSMQ.Test.nunit" />
+
+	<!-- Skip certain frameworks, since MSMQ is not supported on those platforms. -->
+	<property name="build.netcf-2.0.skip" value="true" />
+	<property name="build.mono-2.0.skip" value="true" />
+
+	<target name="vendor-init" description="Initializes Vendor library from local repository.">
+		<!--
+		   Vendor specific info.  The prefix of 'vendor.apache.org' is taken from the property
+		   'vendor.fileset.names'.  This comma-delimited list is iterated, and properties with
+		   well-known suffixes are used to access and copy down vendor file dependencies.
+		-->
+		<property name="vendor.fileset.names" value="vendor.apache.org,vendor.nunit.org" />
+
+		<!-- Property grouping for 'vendor.apache.org' -->
+		<property name="vendor.apache.org.name" value="Apache.NMS" />
+		<property name="vendor.apache.org.group" value="org.apache.activemq" />
+		<property name="vendor.apache.org.version" value="1.2.0" />
+		<property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb" />
+
+		<!-- Property grouping for 'vendor.nunit.org' -->
+		<property name="vendor.nunit.org.name" value="NUnit" />
+		<property name="vendor.nunit.org.group" value="org.nunit" />
+		<property name="vendor.nunit.org.version" value="2.4.8" />
+		<property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+	</target>
+
+	<target name="dependency-init" description="Initializes build dependencies">
+		<if test="${not file::exists(Apache.NMS.dll)}">
+			<echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." />
+			<property name="build.skip" value="true" />
+		</if>
+
+		<assemblyfileset failonempty="true" id="dependencies">
+			<include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Messaging.dll" />
+			<include name="${Apache.NMS.dll}" />
+		</assemblyfileset>
+
+		<assemblyfileset failonempty="true" id="test.dependencies">
+			<include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Messaging.dll" />
+			<include name="${Apache.NMS.dll}" />
+			<include name="${Apache.NMS.Test.dll}" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${nunit.dll}" />
+			<include name="${nunit.extensions.dll}" />
+		</assemblyfileset>
+
+		<fileset id="content.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="nmsprovider-*.config" />
+			<include name="${Apache.NMS.dll}" />
+			<include name="${Apache.NMS.pdb}" />
+			<include name="${Apache.NMS.Test.dll}" />
+			<include name="${Apache.NMS.Test.pdb}" />
+			<include name="${nunit.dll}" />
+			<include name="${nunit.extensions.dll}" />
+			<include name="${NUnit.Projectfile}" />
+		</fileset>
+
+		<fileset id="install.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${build.bin.dir}/${project.name}.pdb" />
+			<include name="nmsprovider-msmq.config" />
+		</fileset>
+
+		<fileset id="deploy.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${build.bin.dir}/${project.name}.pdb" />
+			<include name="${build.bin.dir}/${project.name}.xml" />
+			<include name="${build.bin.dir}/${project.name}.Test.dll" />
+			<include name="${build.bin.dir}/${project.name}.Test.pdb" />
+			<include name="${build.bin.dir}/${project.name}.Test.xml" />
+			<include name="${build.bin.dir}/nmsprovider-*.config" />
+		</fileset>
+	</target>
 
-  <!-- ============================================================================================ -->
-  <!--      I N I T I A L I Z A T I O N                                                             -->
-  <!-- ============================================================================================ -->
-  <property name="basedir" value="${project::get-base-directory()}"/>
-  <property name="project.name" value="Apache.NMS.MSMQ"/>
-  <property name="project.group" value="org.apache.activemq"/>
-  <property name="project.version" value="1.2.0" unless="${property::exists('project.version')}"/>
-  <property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
-  <property name="project.short_description" value="Apache NMS for MSMQ Class Library"/>
-  <property name="project.description" value="Apache NMS for MSMQ Class Library (.Net Messaging Library Implementation): An implementation of the NMS API for MSMQ"/>
-
-  <!-- Repository organized as: organization/module/version/plaform/artifact, platform might be something like 'all' or 'net-2.0/release' -->
-  <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true"/>
-  <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true"/>
-  <property name="Apache.NMS.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.dll" dynamic="true"/>
-  <property name="Apache.NMS.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.pdb" dynamic="true"/>
-  <property name="Apache.NMS.Test.dll" value="${basedir}/lib/Apache.NMS/${current.build.framework}//Apache.NMS.Test.dll" dynamic="true"/>
-  <property name="Apache.NMS.Test.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb" dynamic="true"/>
-
-  <property name="NUnit.Projectfile" value="Apache.NMS.MSMQ.Test.nunit"/>
-
-  <!-- Skip certain frameworks, since MSMQ is not supported on those platforms. -->
-  <property name="build.net-1.1.skip" value="true"/>
-  <property name="build.netcf-2.0.skip" value="true"/>
-  <property name="build.mono-2.0.skip" value="true"/>
-
-  <target name="vendor-init" description="Initializes Vendor library from local repository.">
-    <!-- Vendor specific info.  The prefix of 'vendor.apache.org' is taken from the property
-         'vendor.fileset.names'.  This comma-delimited list is iterated, and properties with
-         well-known suffixes are used to access and copy down vendor file dependencies. -->
-    <property name="vendor.fileset.names" value="vendor.apache.org,vendor.nunit.org"/>
-
-    <!-- Property grouping for 'vendor.apache.org' -->
-    <property name="vendor.apache.org.name" value="Apache.NMS"/>
-    <property name="vendor.apache.org.group" value="org.apache.activemq"/>
-    <property name="vendor.apache.org.version" value="1.2.0"/>
-    <property name="vendor.apache.org.filenames"
-              value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb,Apache.NMS.Test.dll.mdb" />
-
-    <!-- Property grouping for 'vendor.nunit.org' -->
-    <property name="vendor.nunit.org.name" value="NUnit"/>
-    <property name="vendor.nunit.org.group" value="org.nunit"/>
-    <property name="vendor.nunit.org.version" value="2.4.8"/>
-    <property name="vendor.nunit.org.filenames"
-              value="nunit.framework.dll,nunit.framework.extensions.dll" />
-  </target>
-
-  <target name="dependency-init" description="Initializes build dependencies">
-    <if test="${not file::exists(Apache.NMS.dll)}">
-	 <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." />
-	 <property name="build.skip" value="true"/>
-    </if>
-
-  	<assemblyfileset failonempty="true" id="dependencies">
-      <include name="${current.build.framework.assembly.dir}/mscorlib.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Xml.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Messaging.dll" />
-      <include name="${Apache.NMS.dll}"/>
-  	</assemblyfileset>
-
-  	<assemblyfileset failonempty="true" id="test.dependencies">
-      <include name="${current.build.framework.assembly.dir}/mscorlib.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Xml.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Messaging.dll" />
-      <include name="${Apache.NMS.dll}"/>
-      <include name="${Apache.NMS.Test.dll}"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${nunit.dll}"/>
-      <include name="${nunit.extensions.dll}"/>
-  	</assemblyfileset>
-
-    <fileset id="content.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="nmsprovider-*.config"/>
-      <include name="${Apache.NMS.dll}"/>
-      <include name="${Apache.NMS.pdb}"/>
-      <include name="${Apache.NMS.Test.dll}"/>
-      <include name="${Apache.NMS.Test.pdb}"/>
-      <include name="${nunit.dll}"/>
-      <include name="${nunit.extensions.dll}"/>
-      <include name="${NUnit.Projectfile}"/>
-    </fileset>
-
-    <fileset id="install.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${build.bin.dir}/${project.name}.pdb"/>
-      <include name="nmsprovider-msmq.config"/>
-    </fileset>
-
-    <fileset id="deploy.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${build.bin.dir}/${project.name}.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.xml"/>
-      <include name="${build.bin.dir}/${project.name}.Test.dll"/>
-      <include name="${build.bin.dir}/${project.name}.Test.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.Test.xml"/>
-      <include name="${build.bin.dir}/nmsprovider-*.config"/>
-    </fileset>
-  </target>
+	<target name="default" depends="download-vendor-all, install-all" />
 
-  <target name="default" depends="download-vendor-all, install-all" />
-
-  <!-- Load the common target definitions  -->
-  <include buildfile="${basedir}/nant-common.xml"/>
+	<!-- Load the common target definitions  -->
+	<include buildfile="${basedir}/nant-common.xml" />
 </project>

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=817759&r1=817758&r2=817759&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 Tue Sep 22 18:46:57 2009
@@ -35,7 +35,7 @@
 		private int listenerCount = 0;
 		private Thread asyncDeliveryThread = null;
 		private AutoResetEvent pause = new AutoResetEvent(false);
-		private AtomicBoolean asyncDelivery = new AtomicBoolean(false);
+		private Atomic<bool> asyncDelivery = new Atomic<bool>(false);
 
 		public MessageConsumer(Session session, AcknowledgementMode acknowledgementMode, MessageQueue messageQueue)
 		{

Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml Tue Sep 22 18:46:57 2009
@@ -41,7 +41,7 @@
 	<property name="current.build.config"    value="${if(project.release.type == 'release', 'release', 'debug')}" overwrite="false" />
 	<property name="current.build.framework" value="${framework::get-target-framework()}" overwrite="false" />
 	<property name="current.build.defines"   value="${build.defines}" />
-	<property name="build.framework.strings" value="net-1.1,net-2.0,net-3.5,mono-2.0,netcf-2.0" />
+	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" />
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}" dynamic="true" />
 
 	<if test="${build.skip.release}">
@@ -199,18 +199,6 @@
 		<property name="csc.optimize" value="true" />
 	</target>
 
-	<target name="set-net-1.1-framework-configuration">
-		<property name="current.build.framework" value="net-1.1" />
-		<property name="current.build.framework.name" value=".NET 1.1" />
-		<property name="current.build.defines" value="${build.defines}NET,NET_1_1" dynamic="true" />
-		<property name="current.build.framework.sign" value="true" />
-		<property name="link.sdkdoc.version" value="SDK_v1_1" />
-		<property name="link.sdkdoc.web" value="true" />
-		<if test="${framework::exists(current.build.framework)}">
-			<property name="nant.settings.currentframework" value="${current.build.framework}" />
-		</if>
-	</target>
-
 	<target name="set-net-2.0-framework-configuration">
 		<property name="current.build.framework" value="net-2.0" />
 		<property name="current.build.framework.name" value=".NET 2.0" />

Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build Tue Sep 22 18:46:57 2009
@@ -37,7 +37,6 @@
 	<property name="Apache.NMS.Test.pdb" value="${basedir}/lib/Apache.NMS/${current.build.framework}/Apache.NMS.Test.pdb" dynamic="true"/>
 
 	<!-- Skip certain frameworks, since WCF Client is not supported on those platforms. -->
-	<property name="build.net-1.1.skip" value="true"/>
 	<property name="build.net-2.0.skip" value="true"/>
 	<property name="build.mono-2.0.skip" value="true"/>
 	<property name="build.netcf-2.0.skip" value="true"/>

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Tue Sep 22 18:46:57 2009
@@ -41,7 +41,7 @@
 	<property name="current.build.config"    value="${if(project.release.type == 'release', 'release', 'debug')}" overwrite="false" />
 	<property name="current.build.framework" value="${framework::get-target-framework()}" overwrite="false" />
 	<property name="current.build.defines"   value="${build.defines}" />
-	<property name="build.framework.strings" value="net-1.1,net-2.0,net-3.5,mono-2.0,netcf-2.0" />
+	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.0,netcf-2.0" />
 	<property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}" dynamic="true" />
 
 	<if test="${build.skip.release}">
@@ -199,18 +199,6 @@
 		<property name="csc.optimize" value="true" />
 	</target>
 
-	<target name="set-net-1.1-framework-configuration">
-		<property name="current.build.framework" value="net-1.1" />
-		<property name="current.build.framework.name" value=".NET 1.1" />
-		<property name="current.build.defines" value="${build.defines}NET,NET_1_1" dynamic="true" />
-		<property name="current.build.framework.sign" value="true" />
-		<property name="link.sdkdoc.version" value="SDK_v1_1" />
-		<property name="link.sdkdoc.web" value="true" />
-		<if test="${framework::exists(current.build.framework)}">
-			<property name="nant.settings.currentframework" value="${current.build.framework}" />
-		</if>
-	</target>
-
 	<target name="set-net-2.0-framework-configuration">
 		<property name="current.build.framework" value="net-2.0" />
 		<property name="current.build.framework.name" value=".NET 2.0" />

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Tue Sep 22 18:46:57 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version="1.0"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
     contributor license agreements.  See the NOTICE file distributed with
@@ -15,88 +15,86 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<project name="Apache.NMS" default="default" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
 
-  <!-- ============================================================================================ -->
-  <!--      I N I T I A L I Z A T I O N                                                             -->
-  <!-- ============================================================================================ -->
-  <property name="basedir" value="${project::get-base-directory()}"/>
-  <property name="project.name" value="Apache.NMS"/>
-  <property name="project.group" value="org.apache.activemq"/>
-  <property name="project.version" value="1.2.0" unless="${property::exists('project.version')}"/>
-  <property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
-  <property name="project.short_description" value="Apache NMS Class Library"/>
-  <property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers"/>
-  <property name="project.cls.compliant" value="true"/>
-
-  <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
-  <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true"/>
-
-  <target name="vendor-init" description="Initializes Vendor library from local repository.">
-    <!-- Vendor specific info.  The prefix of 'vendor.apache.org' is taken from the property
-         'vendor.fileset.names'.  This comma-delimited list is iterated, and properties with
-         well-known suffixes are used to access and copy down vendor file dependencies. -->
-    <property name="vendor.fileset.names" value="vendor.nunit.org"/>
-
-    <!-- Property grouping for 'vendor.nunit.org' -->
-    <property name="vendor.nunit.org.name" value="NUnit"/>
-    <property name="vendor.nunit.org.group" value="org.nunit"/>
-    <property name="vendor.nunit.org.version" value="2.4.8"/>
-    <property name="vendor.nunit.org.filenames"
-              value="nunit.framework.dll,nunit.framework.extensions.dll" />
-  </target>
-
-  <target name="dependency-init" description="Initializes build dependencies">
-
-    <assemblyfileset failonempty="true" id="dependencies">
-      <include name="${current.build.framework.assembly.dir}/mscorlib.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Web.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Xml.dll"/>
-    </assemblyfileset>
-
-    <assemblyfileset failonempty="true" id="test.dependencies">
-      <include name="${current.build.framework.assembly.dir}/mscorlib.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.dll"/>
-      <include name="${current.build.framework.assembly.dir}/System.Xml.dll"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${nunit.dll}"/>
-      <include name="${nunit.extensions.dll}"/>
-    </assemblyfileset>
-
-    <fileset id="content.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-    </fileset>
-
-    <fileset id="deploy.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${build.bin.dir}/${project.name}.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.dll.mdb"/>
-      <include name="${build.bin.dir}/${project.name}.xml"/>
-      <include name="${build.bin.dir}/${project.name}.Test.dll"/>
-      <include name="${build.bin.dir}/${project.name}.Test.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.Test.dll.mdb"/>
-      <include name="${build.bin.dir}/${project.name}.Test.xml"/>
-    </fileset>
-
-    <fileset id="install.filenames">
-      <include name="LICENSE.txt"/>
-      <include name="NOTICE.txt"/>
-      <include name="${build.bin.dir}/${project.name}.dll"/>
-      <include name="${build.bin.dir}/${project.name}.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.dll.mdb"/>
-      <include name="${build.bin.dir}/${project.name}.Test.dll"/>
-      <include name="${build.bin.dir}/${project.name}.Test.pdb"/>
-      <include name="${build.bin.dir}/${project.name}.Test.dll.mdb"/>
-    </fileset>
-  </target>
-  
-  <target name="default" depends="download-vendor-all, install-all" />
+<project name="Apache.NMS" default="default" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
+	<!-- ============================================================================================ -->
+	<!--      I N I T I A L I Z A T I O N                                                             -->
+	<!-- ============================================================================================ -->
+	<property name="basedir" value="${project::get-base-directory()}" />
+	<property name="project.name" value="Apache.NMS" />
+	<property name="project.group" value="org.apache.activemq" />
+	<property name="project.version" value="1.2.0" unless="${property::exists('project.version')}" />
+	<property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
+	<property name="project.short_description" value="Apache NMS Class Library" />
+	<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
+	<property name="project.cls.compliant" value="true" />
+	<property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+	<property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
+
+	<target name="vendor-init" description="Initializes Vendor library from local repository.">
+		<!--
+		     Vendor specific info.  The prefix of 'vendor.apache.org' is taken from the property
+		     vendor.fileset.names'.  This comma-delimited list is iterated, and properties with
+		     well-known suffixes are used to access and copy down vendor file dependencies.
+		-->
+		<property name="vendor.fileset.names" value="vendor.nunit.org" />
+
+		<!-- Property grouping for 'vendor.nunit.org' -->
+		<property name="vendor.nunit.org.name" value="NUnit" />
+		<property name="vendor.nunit.org.group" value="org.nunit" />
+		<property name="vendor.nunit.org.version" value="2.4.8" />
+		<property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+	</target>
+
+	<target name="dependency-init" description="Initializes build dependencies">
+		<assemblyfileset failonempty="true" id="dependencies">
+			<include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Web.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+		</assemblyfileset>
+
+		<assemblyfileset failonempty="true" id="test.dependencies">
+			<include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.dll" />
+			<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${nunit.dll}" />
+			<include name="${nunit.extensions.dll}" />
+		</assemblyfileset>
+
+		<fileset id="content.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+		</fileset>
+
+		<fileset id="deploy.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${build.bin.dir}/${project.name}.pdb" />
+			<include name="${build.bin.dir}/${project.name}.dll.mdb" />
+			<include name="${build.bin.dir}/${project.name}.xml" />
+			<include name="${build.bin.dir}/${project.name}.Test.dll" />
+			<include name="${build.bin.dir}/${project.name}.Test.pdb" />
+			<include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
+			<include name="${build.bin.dir}/${project.name}.Test.xml" />
+		</fileset>
+
+		<fileset id="install.filenames">
+			<include name="LICENSE.txt" />
+			<include name="NOTICE.txt" />
+			<include name="${build.bin.dir}/${project.name}.dll" />
+			<include name="${build.bin.dir}/${project.name}.pdb" />
+			<include name="${build.bin.dir}/${project.name}.dll.mdb" />
+			<include name="${build.bin.dir}/${project.name}.Test.dll" />
+			<include name="${build.bin.dir}/${project.name}.Test.pdb" />
+			<include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
+		</fileset>
+	</target>
 
-  <!-- Load the common target definitions  -->
-  <include buildfile="${basedir}/nant-common.xml"/>
+	<target name="default" depends="download-vendor-all, install-all" />
 
+	<!-- Load the common target definitions  -->
+	<include buildfile="${basedir}/nant-common.xml" />
 </project>

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Atomic.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Atomic.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Atomic.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Atomic.cs Tue Sep 22 18:46:57 2009
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 using System;
-using System.Text;
 
 namespace Apache.NMS.Util
 {
-#if !NET_1_0 && !NET_1_1
-	public class Atomic<T> where T : IComparable
+	public class AtomicReference<T>
 	{
-		private T atomicValue;
+		protected T atomicValue;
 
 		public T Value
 		{
@@ -42,24 +41,49 @@
 			}
 		}
 
-		public Atomic(T defaultValue)
+		public AtomicReference()
+		{
+			atomicValue = default(T);
+		}
+
+		public AtomicReference(T defaultValue)
 		{
 			atomicValue = defaultValue;
 		}
 
-		public bool CompareAndSet(T expected, T newValue)
+		public T GetAndSet(T value)
 		{
 			lock(this)
 			{
-				if(0 == atomicValue.CompareTo(expected))
-				{
-					atomicValue = newValue;
-					return true;
-				}
-
-				return false;
+				T ret = atomicValue;
+				atomicValue = value;
+				return ret;
 			}
 		}
-	}
-#endif
+	}
+
+	public class Atomic<T> : AtomicReference<T> where T : IComparable
+	{
+		public Atomic() : base()
+		{
+		}
+
+		public Atomic(T defaultValue) : base(defaultValue)
+		{
+		}
+
+		public bool CompareAndSet(T expected, T newValue)
+		{
+			lock(this)
+			{
+				if(0 == atomicValue.CompareTo(expected))
+				{
+					atomicValue = newValue;
+					return true;
+				}
+
+				return false;
+			}
+		}
+	}
 }

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/MemoryUsage.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/MemoryUsage.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/MemoryUsage.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/MemoryUsage.cs Tue Sep 22 18:46:57 2009
@@ -19,142 +19,147 @@
 
 namespace Apache.NMS.Util
 {
-    /// <summary>
-    /// Utility class for Tracking Memory Usage with an imposed limit on the amount
-    /// available.  Provides methods for objects to wait on more space to become 
-    /// available if the memory limit is reached.
-    /// </summary>
-    public class MemoryUsage
-    {
-        private long limit = 0;
-        private long usage = 0;
-        private readonly object myLock = new object();
-        
-        public MemoryUsage()
-        {
-        }
-        
-        public MemoryUsage( long limit )
-        {
-            this.limit = limit;
-        }
-        
-        #region Property Accessors
-
-        public long Limit
-        {
-            get { return limit; }
-            set { limit = value; }
-        }
-        
-        public long Usage
-        {
-            get { return usage; }
-            set { usage = value; }
-        }
-        
-        #endregion
-        
-        /// <summary>
-        /// If no space is available then this method blocks until more becomes available.
-        /// </summary>
-        public void WaitForSpace()
-        {
-            TimeSpan indefiniteWait = TimeSpan.FromMilliseconds(Timeout.Infinite);
-            this.WaitForSpace(indefiniteWait);
-        }
-
-        /// <summary>
-        /// If no space is available then this method blocks until more becomes available 
-        /// or until the specified timeout expires.
-        /// </summary>
-        /// <param name="timeout">
-        /// A <see cref="System.TimeSpan"/>
-        /// </param>
-        public void WaitForSpace( TimeSpan timeout )
-        {
-            lock(this.myLock)
-            {
-                while(this.IsFull())
-                {
-                    if( !Monitor.Wait(this.myLock, timeout ) ) 
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        
-        /// <summary>
-        /// Attempts to increase the amount of Memory Used, if non is available to fill 
-        /// then this method blocks until more is freed.
-        /// </summary>
-        /// <param name="usage">
-        /// A <see cref="System.Int64"/>
-        /// </param>
-        public void EnqueueUsage( long usage )
-        {
-            this.WaitForSpace();
-            this.IncreaseUsage(usage);
-        }
-        
-        /// <summary>
-        /// Increase the level of Usage.
-        /// </summary>
-        /// <param name="value">
-        /// A <see cref="System.Int64"/>
-        /// </param>
-        public void IncreaseUsage( long value )
-        {
-            if(value == 0) 
-            {
-                return;
-            }
-            
-            lock(this.myLock)
-            {
-                this.Usage += value;
-            }
-        }
-        
-        /// <summary>
-        /// Decrease the level of Usage.
-        /// </summary>
-        /// <param name="value">
-        /// A <see cref="System.Int64"/>
-        /// </param>
-        public void DecreaseUsage( long value )
-        {
-            if(value == 0) 
-            {
-                return;
-            }
-            
-            lock(this.myLock)
-            {
-                if( value > this.Usage )                    
-                {
-                    this.Usage = 0;
-                }
-                else
-                {
-                    this.Usage -= value;
-                }
-                
-                Monitor.PulseAll(this.myLock);
-            }
-        }
-        
-        public bool IsFull() 
-        {
-            bool result = false;
-            
-            lock(this.myLock) {
-                result = this.Usage >= this.Limit;
-            }
-        
-            return result;        
-        }
-        
-    }
+	/// <summary>
+	/// Utility class for Tracking Memory Usage with an imposed limit on the amount
+	/// available.  Provides methods for objects to wait on more space to become
+	/// available if the memory limit is reached.
+	/// </summary>
+	public class MemoryUsage
+	{
+		private long limit = 0;
+		private long usage = 0;
+		private readonly object myLock = new object();
+
+		public MemoryUsage()
+		{
+		}
+
+		public MemoryUsage( long limit )
+		{
+			this.limit = limit;
+		}
+
+		#region Property Accessors
+
+		public long Limit
+		{
+			get { return limit; }
+			set { limit = value; }
+		}
+
+		public long Usage
+		{
+			get { return usage; }
+			set { usage = value; }
+		}
+
+		#endregion
+
+		/// <summary>
+		/// If no space is available then this method blocks until more becomes available.
+		/// </summary>
+		public void WaitForSpace()
+		{
+			TimeSpan indefiniteWait = TimeSpan.FromMilliseconds(Timeout.Infinite);
+			this.WaitForSpace(indefiniteWait);
+		}
+
+		/// <summary>
+		/// If no space is available then this method blocks until more becomes available
+		/// or until the specified timeout expires.
+		/// </summary>
+		/// <param name="timeout">
+		/// A <see cref="System.TimeSpan"/>
+		/// </param>
+		public void WaitForSpace( TimeSpan timeout )
+		{
+			lock(this.myLock)
+			{
+				while(this.IsFull())
+				{
+#if !NETCF
+					if( !Monitor.Wait(this.myLock, timeout ) )
+#endif
+					{
+						return;
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// Attempts to increase the amount of Memory Used, if non is available to fill
+		/// then this method blocks until more is freed.
+		/// </summary>
+		/// <param name="usage">
+		/// A <see cref="System.Int64"/>
+		/// </param>
+		public void EnqueueUsage( long usage )
+		{
+			this.WaitForSpace();
+			this.IncreaseUsage(usage);
+		}
+
+		/// <summary>
+		/// Increase the level of Usage.
+		/// </summary>
+		/// <param name="value">
+		/// A <see cref="System.Int64"/>
+		/// </param>
+		public void IncreaseUsage( long value )
+		{
+			if(value == 0)
+			{
+				return;
+			}
+
+			lock(this.myLock)
+			{
+				this.Usage += value;
+			}
+		}
+
+		/// <summary>
+		/// Decrease the level of Usage.
+		/// </summary>
+		/// <param name="value">
+		/// A <see cref="System.Int64"/>
+		/// </param>
+		public void DecreaseUsage( long value )
+		{
+			if(value == 0)
+			{
+				return;
+			}
+
+			lock(this.myLock)
+			{
+				if( value > this.Usage )
+				{
+					this.Usage = 0;
+				}
+				else
+				{
+					this.Usage -= value;
+				}
+
+#if !NETCF
+				Monitor.PulseAll(this.myLock);
+#endif
+			}
+		}
+
+		public bool IsFull()
+		{
+			bool result = false;
+
+			lock(this.myLock)
+			{
+				result = this.Usage >= this.Limit;
+			}
+
+			return result;
+		}
+
+	}
 }

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs Tue Sep 22 18:46:57 2009
@@ -312,11 +312,7 @@
 			// balanced parenthesis
 
 			// Start with original URI
-#if NET_1_0 || NET_1_1
-			String ssp = uri.AbsoluteUri.Trim();
-#else
 			String ssp = uri.OriginalString.Trim();
-#endif
 
 			ssp = stripPrefix(ssp, "failover:");
 

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/AsyncConsumeTest.cs Tue Sep 22 18:46:57 2009
@@ -48,11 +48,9 @@
 			base.TearDown();
 		}
 
-#if !NET_1_1
 		[RowTest]
 		[Row(MsgDeliveryMode.Persistent)]
 		[Row(MsgDeliveryMode.NonPersistent)]
-#endif
 		public void TestAsynchronousConsume(MsgDeliveryMode deliveryMode)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
@@ -80,11 +78,9 @@
 			}
 		}
 
-#if !NET_1_1
 		[RowTest]
 		[Row(MsgDeliveryMode.Persistent)]
 		[Row(MsgDeliveryMode.NonPersistent)]
-#endif
 		public void TestCreateConsumerAfterSend(MsgDeliveryMode deliveryMode)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
@@ -114,11 +110,9 @@
 			}
 		}
 
-#if !NET_1_1
 		[RowTest]
 		[Row(MsgDeliveryMode.Persistent)]
 		[Row(MsgDeliveryMode.NonPersistent)]
-#endif
 		public void TestCreateConsumerBeforeSendAddListenerAfterSend(MsgDeliveryMode deliveryMode)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
@@ -147,11 +141,9 @@
 			}
 		}
 
-#if !NET_1_1
 		[RowTest]
 		[Row(MsgDeliveryMode.Persistent)]
 		[Row(MsgDeliveryMode.NonPersistent)]
-#endif
 		public void TestAsynchronousTextMessageConsume(MsgDeliveryMode deliveryMode)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))
@@ -186,11 +178,9 @@
 			}
 		}
 
-#if !NET_1_1
 		[RowTest]
 		[Row(MsgDeliveryMode.Persistent)]
 		[Row(MsgDeliveryMode.NonPersistent)]
-#endif
 		public void TestTemporaryQueueAsynchronousConsume(MsgDeliveryMode deliveryMode)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs?rev=817759&r1=817758&r2=817759&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/BytesMessageTest.cs Tue Sep 22 18:46:57 2009
@@ -28,11 +28,9 @@
 		protected static string TEST_CLIENT_ID = "BytesMessageClientId";
 		protected byte[] msgContent = {1, 2, 3, 4, 5, 6, 7, 8};
 
-#if !NET_1_1
 		[RowTest]
 		[Row(MsgDeliveryMode.Persistent)]
 		[Row(MsgDeliveryMode.NonPersistent)]
-#endif
 		public void SendReceiveBytesMessage(MsgDeliveryMode deliveryMode)
 		{
 			using(IConnection connection = CreateConnection(TEST_CLIENT_ID))



Mime
View raw message