Author: jgomes
Date: Fri Aug 8 11:41:25 2008
New Revision: 684044
URL: http://svn.apache.org/viewvc?rev=684044&view=rev
Log:
Refactoring unit tests and the build process. Removed support for obsolete
platforms MONO 1.0, .NET 1.0, and .NET Compact Framework 1.0.
Upgraded NUnit version to 2.4.7 and included the assembly in the main
repository so that it can be easily upgraded in future.
Fixes [AMQNET-71]. (See https://issues.apache.org/activemq/browse/AMQNET-71)
Modified:
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/MessageProducer.cs
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/InheritedTests.cs
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=684044&r1=684043&r2=684044&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Fri Aug 8
11:41:25 2008
@@ -198,18 +198,6 @@
<property name="csc.optimize" value="true" />
</target>
- <target name="set-net-1.0-framework-configuration">
- <property name="current.build.framework" value="net-1.0" />
- <property name="current.build.framework.name" value=".NET 1.0"/>
- <property name="current.build.defines" value="${build.defines}NET,NET_1_0"
dynamic="true" />
- <property name="current.build.framework.sign" value="true" />
- <property name="link.sdkdoc.version" value="SDK_v1_0" />
- <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-1.1-framework-configuration">
<property name="current.build.framework" value="net-1.1" />
<property name="current.build.framework.name" value=".NET 1.1"/>
@@ -246,18 +234,6 @@
</if>
</target>
- <target name="set-netcf-1.0-framework-configuration">
- <property name="current.build.framework" value="netcf-1.0" />
- <property name="current.build.framework.name" value=".NET Compact
Framework 1.0"/>
- <property name="current.build.defines"
value="${build.defines}PocketPC,NETCF,NETCF_1_0" dynamic="true" />
- <property name="current.build.framework.sign" value="false" />
- <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-netcf-2.0-framework-configuration">
<property name="current.build.framework" value="netcf-2.0" />
<property name="current.build.framework.name" value=".NET Compact
Framework 2.0"/>
@@ -270,18 +246,6 @@
</if>
</target>
- <target name="set-mono-1.0-framework-configuration">
- <property name="current.build.framework" value="mono-1.0" />
- <property name="current.build.framework.name" value="Mono 1.0"/>
- <property name="current.build.defines"
value="${build.defines}MONO,MONO_1_0" 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-mono-2.0-framework-configuration">
<property name="current.build.framework" value="mono-2.0" />
<property name="current.build.framework.name" value="Mono 2.0"/>
@@ -300,25 +264,19 @@
<target name="compile-all" depends="release-init" description="Compile all
build configurations for all runtime configurations">
<echo message="Compiling all build configurations for all runtime
configurations." />
<call target="set-debug-configuration" />
- <call target="set-net-1.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-net-1.1-framework-configuration" /><call
target="conditional-compile" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-net-3.5-framework-configuration" /><call
target="conditional-compile" />
- <call target="set-mono-1.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-compile" />
- <call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-compile" />
<call target="set-netcf-2.0-framework-configuration"/><call
target="conditional-compile" />
<!-- we can only do a release skip if the Key file is available -->
<if test="${not build.skip.release}">
<call target="set-release-configuration" />
- <call target="set-net-1.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-net-1.1-framework-configuration" /><call
target="conditional-compile" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-net-3.5-framework-configuration" /><call
target="conditional-compile" />
- <call target="set-mono-1.0-framework-configuration" /><call
target="conditional-compile" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-compile" />
- <call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-compile" />
<call target="set-netcf-2.0-framework-configuration"/><call
target="conditional-compile" />
</if>
</target>
@@ -453,25 +411,19 @@
<target name="install-all" depends="release-init" description="Install all
build configurations for all runtime configurations">
<echo message="Installing all build configurations for all runtime
configurations." />
<call target="set-debug-configuration" />
- <call target="set-net-1.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-net-1.1-framework-configuration" /><call
target="conditional-install" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-net-3.5-framework-configuration" /><call
target="conditional-install" />
- <call target="set-mono-1.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-install" />
- <call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-install" />
<call target="set-netcf-2.0-framework-configuration"/><call
target="conditional-install" />
<!-- we can only do a release skip if the Key file is available -->
<if test="${not build.skip.release}">
<call target="set-release-configuration" />
- <call target="set-net-1.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-net-1.1-framework-configuration" /><call
target="conditional-install" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-net-3.5-framework-configuration" /><call
target="conditional-install" />
- <call target="set-mono-1.0-framework-configuration" /><call
target="conditional-install" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-install" />
- <call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-install" />
<call target="set-netcf-2.0-framework-configuration"/><call
target="conditional-install" />
</if>
</target>
@@ -505,25 +457,19 @@
<echo message="Deploying all build configurations for all runtime
configurations." />
<call target="set-debug-configuration" />
- <call target="set-net-1.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-1.1-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-3.5-framework-configuration" /><call
target="conditional-deploy" />
- <call target="set-mono-1.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-deploy" />
- <call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-deploy" />
<call target="set-netcf-2.0-framework-configuration"/><call
target="conditional-deploy" />
<!-- we can only do a release skip if the Key file is available -->
<if test="${not build.skip.release}">
<call target="set-release-configuration" />
- <call target="set-net-1.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-1.1-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-2.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-net-3.5-framework-configuration" /><call
target="conditional-deploy" />
- <call target="set-mono-1.0-framework-configuration" /><call
target="conditional-deploy" />
<call target="set-mono-2.0-framework-configuration" /><call
target="conditional-deploy" />
- <call target="set-netcf-1.0-framework-configuration"/><call
target="conditional-deploy" />
<call target="set-netcf-2.0-framework-configuration"/><call
target="conditional-deploy" />
</if>
</target>
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=684044&r1=684043&r2=684044&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build Fri Aug 8
11:41:25 2008
@@ -36,7 +36,7 @@
<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="org.nunit/nunit/2.2.8/all/nunit.framework.dll"/>
+ <property name="nunit.dll"
value="${basedir}/vendor/Apache.NMS/lib/nunit.framework.dll"/>
<property name="Apache.NMS.dll"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.dll"
dynamic="true"/>
<property name="Apache.NMS.pdb"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.pdb"
dynamic="true"/>
<property name="Apache.NMS.xml"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.xml"
dynamic="true"/>
@@ -45,10 +45,6 @@
<property name="Apache.NMS.Test.xml"
value="${basedir}/vendor/Apache.NMS/build/${current.build.framework}/${current.build.config}/Apache.NMS.Test.xml"
dynamic="true"/>
<target name="vendor-init" description="Initializes the vendor libraries.">
- <!-- The following does a poor man's maven style dependency install to the
local repo -->
- <property name="repo.task.artifact" value="${nunit.dll}"/>
- <call target="repo-download"/>
-
<nant buildfile="${basedir}/vendor/Apache.NMS/nant.build"/>
</target>
@@ -69,6 +65,7 @@
<assemblyfileset failonempty="true" id="dependencies">
<include name="mscorlib.dll" asis="true"/>
<include name="System.dll" asis="true"/>
+ <include name="System.Xml.dll" asis="true"/>
<include name="${lib.dir}/TIBCO.EMS.dll"/>
<include name="${Apache.NMS.dll}"/>
</assemblyfileset>
@@ -76,11 +73,12 @@
<assemblyfileset failonempty="true" id="test.dependencies">
<include name="mscorlib.dll" asis="true"/>
<include name="System.dll" asis="true"/>
+ <include name="System.Xml.dll" asis="true"/>
<include name="${lib.dir}/TIBCO.EMS.dll"/>
<include name="${Apache.NMS.dll}"/>
<include name="${Apache.NMS.Test.dll}"/>
<include name="${build.bin.dir}/${project.name}.dll"/>
- <include name="${nant.local.repo}/${nunit.dll}"/>
+ <include name="${nunit.dll}"/>
</assemblyfileset>
<fileset id="content.filenames">
Modified:
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageProducer.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageProducer.cs?rev=684044&r1=684043&r2=684044&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageProducer.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/MessageProducer.cs
Fri Aug 8 11:41:25 2008
@@ -16,6 +16,7 @@
*/
using System;
+using System.Threading;
namespace Apache.NMS.EMS
{
@@ -124,6 +125,12 @@
set { this.tibcoMessageProducer.TimeToLive = (long)
value.TotalMilliseconds; }
}
+ public TimeSpan RequestTimeout
+ {
+ get { return
TimeSpan.FromMilliseconds(Timeout.Infinite); }
+ set { }
+ }
+
public byte Priority
{
get { return (byte) this.tibcoMessageProducer.Priority;
}
Modified:
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs?rev=684044&r1=684043&r2=684044&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/main/csharp/Session.cs
Fri Aug 8 11:41:25 2008
@@ -114,6 +114,12 @@
this.tibcoSession.Unsubscribe(name);
}
+ public void DeleteDurableConsumer(string name, TimeSpan
requestTimeout)
+ {
+ // Ignore: requestTimeout
+ DeleteDurableConsumer(name);
+ }
+
public Apache.NMS.IQueue GetQueue(string name)
{
return
EMSConvert.ToNMSQueue(this.tibcoSession.CreateQueue(name));
Modified:
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/InheritedTests.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/InheritedTests.cs?rev=684044&r1=684043&r2=684044&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/InheritedTests.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.EMS/trunk/src/test/csharp/InheritedTests.cs
Fri Aug 8 11:41:25 2008
@@ -69,7 +69,7 @@
}
[TestFixture]
- public class TextMessage : Apache.NMS.Test.TextMessage
+ public class TextMessageTest : Apache.NMS.Test.TextMessageTest
{
}
