Author: jgomes
Date: Tue Feb 9 18:32:48 2010
New Revision: 908147
URL: http://svn.apache.org/viewvc?rev=908147&view=rev
Log:
Applied patch from Sebastien Rodriguez - excepting changes that broke other
platform builds (i.e., .NET 3.5, and .NET Compact Framework). Thanks,
Sebastien!
Fixes [AMQNET-233]. (See https://issues.apache.org/activemq/browse/AMQNET-233)
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/IConnectionMetaData.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/IQueueBrowser.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConstants.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Atomic.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/Convert.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianBinaryReader.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianSupport.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/URISupport.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/XmlUtils.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.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/NMSTestSupport.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NmsTracer.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ProducerTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/RedeliveryPolicyTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/StreamMessageTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationDeletionTest.cs
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationTest.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/trunk/src/main/csharp/IConnectionMetaData.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/IConnectionMetaData.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/IConnectionMetaData.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/IConnectionMetaData.cs
Tue Feb 9 18:32:48 2010
@@ -15,8 +15,6 @@
* limitations under the License.
*/
-using System;
-
namespace Apache.NMS
{
/// <summary>
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/IQueueBrowser.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/IQueueBrowser.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/IQueueBrowser.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/IQueueBrowser.cs
Tue Feb 9 18:32:48 2010
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-using System;
using System.Collections;
namespace Apache.NMS
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConstants.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConstants.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConstants.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/NMSConstants.cs
Tue Feb 9 18:32:48 2010
@@ -16,7 +16,6 @@
*/
using System;
-using System.Text;
namespace Apache.NMS
{
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=908147&r1=908146&r2=908147&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 Feb 9 18:32:48 2010
@@ -39,13 +39,13 @@
atomicValue = value;
}
}
- }
-
+ }
+
public AtomicReference()
{
atomicValue = default(T);
- }
-
+ }
+
public AtomicReference(T defaultValue)
{
atomicValue = defaultValue;
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=908147&r1=908146&r2=908147&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
Tue Feb 9 18:32:48 2010
@@ -17,7 +17,6 @@
using System;
using System.Reflection;
-using System.Text;
namespace Apache.NMS.Util
{
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianBinaryReader.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianBinaryReader.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianBinaryReader.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianBinaryReader.cs
Tue Feb 9 18:32:48 2010
@@ -17,7 +17,6 @@
using System;
using System.IO;
-using System.Text;
namespace Apache.NMS.Util
{
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianSupport.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianSupport.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianSupport.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/EndianSupport.cs
Tue Feb 9 18:32:48 2010
@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System.IO;
using System;
+using System.IO;
namespace Apache.NMS.Util
{
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=908147&r1=908146&r2=908147&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 Feb 9 18:32:48 2010
@@ -20,7 +20,6 @@
using System.Globalization;
using System.Reflection;
using System.Text;
-using Apache.NMS;
#if !NETCF
using System.Web;
#endif
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/XmlUtils.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/XmlUtils.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/XmlUtils.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/Util/XmlUtils.cs
Tue Feb 9 18:32:48 2010
@@ -18,9 +18,9 @@
using System;
using System.IO;
using System.Text;
+using System.Text.RegularExpressions;
using System.Xml;
using System.Xml.Serialization;
-using System.Text.RegularExpressions;
namespace Apache.NMS.Util
{
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConnectionTest.cs
Tue Feb 9 18:32:48 2010
@@ -16,7 +16,6 @@
*/
using System;
-using System.Threading;
using NUnit.Framework;
using NUnit.Framework.Extensions;
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ConsumerTest.cs
Tue Feb 9 18:32:48 2010
@@ -17,8 +17,6 @@
using System;
using System.Threading;
-using Apache.NMS;
-using Apache.NMS.Util;
using NUnit.Framework;
using NUnit.Framework.Extensions;
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/DurableTest.cs
Tue Feb 9 18:32:48 2010
@@ -17,9 +17,9 @@
using System;
using System.Threading;
+using Apache.NMS.Util;
using NUnit.Framework;
using NUnit.Framework.Extensions;
-using Apache.NMS.Util;
namespace Apache.NMS.Test
{
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageSelectorTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageSelectorTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageSelectorTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageSelectorTest.cs
Tue Feb 9 18:32:48 2010
@@ -16,10 +16,10 @@
*/
using System;
+using System.Threading;
using Apache.NMS.Util;
using NUnit.Framework;
using NUnit.Framework.Extensions;
-using System.Threading;
namespace Apache.NMS.Test
{
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/MessageTest.cs
Tue Feb 9 18:32:48 2010
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-using System;
+using Apache.NMS.Util;
using NUnit.Framework;
using NUnit.Framework.Extensions;
-using Apache.NMS.Util;
namespace Apache.NMS.Test
{
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NMSTestSupport.cs
Tue Feb 9 18:32:48 2010
@@ -14,15 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using Apache.NMS;
-using Apache.NMS.Util;
-using NUnit.Framework;
using System;
+using System.Collections;
using System.IO;
-using System.Xml;
using System.Reflection;
-using System.Collections;
using System.Text.RegularExpressions;
+using System.Xml;
+using Apache.NMS.Util;
+using NUnit.Framework;
namespace Apache.NMS.Test
{
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NmsTracer.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NmsTracer.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NmsTracer.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/NmsTracer.cs Tue
Feb 9 18:32:48 2010
@@ -17,8 +17,6 @@
#define TRACE // Force tracing to be enabled for this class
-using System;
-
namespace Apache.NMS.Test
{
public class NmsTracer : Apache.NMS.ITrace
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ProducerTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ProducerTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ProducerTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/ProducerTest.cs
Tue Feb 9 18:32:48 2010
@@ -16,11 +16,7 @@
*/
using System;
-using System.Threading;
-using Apache.NMS;
-using Apache.NMS.Util;
using NUnit.Framework;
-using NUnit.Framework.Extensions;
namespace Apache.NMS.Test
{
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/RedeliveryPolicyTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/RedeliveryPolicyTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/RedeliveryPolicyTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/RedeliveryPolicyTest.cs
Tue Feb 9 18:32:48 2010
@@ -15,10 +15,6 @@
* limitations under the License.
*/
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Apache.NMS;
using Apache.NMS.Policies;
using NUnit.Framework;
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/StreamMessageTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/StreamMessageTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/StreamMessageTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/StreamMessageTest.cs
Tue Feb 9 18:32:48 2010
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-using System;
using Apache.NMS.Util;
using NUnit.Framework;
using NUnit.Framework.Extensions;
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationDeletionTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationDeletionTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationDeletionTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationDeletionTest.cs
Tue Feb 9 18:32:48 2010
@@ -15,11 +15,9 @@
* limitations under the License.
*/
-using System;
using Apache.NMS.Util;
using NUnit.Framework;
using NUnit.Framework.Extensions;
-using System.Threading;
namespace Apache.NMS.Test
{
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TempDestinationTest.cs
Tue Feb 9 18:32:48 2010
@@ -16,11 +16,8 @@
*/
using System;
-using System.Threading;
using System.Collections;
-using Apache.NMS.Util;
using NUnit.Framework;
-using NUnit.Framework.Extensions;
namespace Apache.NMS.Test
{
Modified:
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS/trunk/src/test/csharp/TransactionTest.cs
Tue Feb 9 18:32:48 2010
@@ -16,8 +16,6 @@
*/
using System;
-using System.Threading;
-using System.Collections;
using Apache.NMS.Util;
using NUnit.Framework;
using NUnit.Framework.Extensions;
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms-test.csproj Tue Feb 9
18:32:48 2010
@@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2F3ABCF5-EE87-43B1-9DE7-0548FD6A4E52}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -65,7 +65,6 @@
<HintPath>lib\NUnit\net-3.5\nunit.framework.extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
Modified: activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj?rev=908147&r1=908146&r2=908147&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj Tue Feb 9
18:32:48 2010
@@ -42,7 +42,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
- <Reference Include="System.Data" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" />
</ItemGroup>
