activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r1403939 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk: nant-common.xml nant.build src/test/csharp/NetTxTransactionTest.cs src/test/csharp/TempDestinationTest.cs
Date Wed, 31 Oct 2012 00:18:27 GMT
Author: jgomes
Date: Wed Oct 31 00:18:27 2012
New Revision: 1403939

URL: http://svn.apache.org/viewvc?rev=1403939&view=rev
Log:
Add support for Mono 4.0.  Fix compiler warnings in unit tests.

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/test/csharp/NetTxTransactionTest.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TempDestinationTest.cs

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml?rev=1403939&r1=1403938&r2=1403939&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Wed Oct 31 00:18:27
2012
@@ -41,11 +41,12 @@
     <property name="build.skip"              value="false" />
     <property name="build.skip.release"      value="false" unless="${property::exists('build.skip.release')}"
/>
     <property name="download.skip"           value="false" unless="${property::exists('download.skip')}"/>
+    <property name="install.skip"            value="false" unless="${property::exists('install.skip')}"/>
     <property name="compile.skip"            value="false" unless="${property::exists('compile.skip')}"
/>
     <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-2.0,net-3.5,net-4.0,mono-2.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
+    <property name="build.framework.strings" value="net-2.0,net-3.5,net-4.0,mono-2.0,mono-4.0,netcf-2.0,netcf-3.5"
unless="${property::exists('build.framework.strings')}"/>
     <property name="current.build.framework.assembly.dir" value="${framework::get-assembly-directory(framework::get-target-framework())}"
dynamic="true" />
 
     <property name="build.config.strings"    value="${if(property::exists('configuration'),
configuration, if(build.skip.release == 'true', 'debug', 'debug,release'))}" dynamic="true"
/>
@@ -271,6 +272,18 @@
         </if>
     </target>
 
+    <target name="set-mono-4.0-framework-configuration">
+        <property name="current.build.framework" value="mono-4.0" />
+        <property name="current.build.framework.name" value="Mono 4.0" />
+        <property name="current.build.defines" value="${build.defines}MONO,MONO_4_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>
+
     <!-- ============================================================================================
-->
     <!--     C O M P I L E    T A R G E T S                                          
                -->
     <!-- ============================================================================================
-->
@@ -387,7 +400,7 @@
     <target name="install" depends="init, compile-target, conditional-install"
             description="Install the artifacts into the nant repo" />
 
-    <target name="conditional-install" unless="${build.skip}"
+    <target name="conditional-install" unless="${build.skip or install.skip}"
             description="Install the artifacts into the nant repo">
         <property name="path" value="${project.group}/${project.name}/${project.version.full}/${current.build.framework}/${current.build.config}"
/>
         <foreach item="File" property="install.filename">

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=1403939&r1=1403938&r2=1403939&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Wed Oct 31 00:18:27 2012
@@ -52,10 +52,10 @@
         <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.6.0" />
-        <if test="${current.build.framework == 'mono-2.0'}">
+        <if test="${current.build.framework == 'mono-2.0' or current.build.framework ==
'mono-4.0'}">
             <property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.dll.mdb,Apache.NMS.Test.dll,Apache.NMS.Test.dll.mdb"
/>
         </if>
-        <if test="${not (current.build.framework == 'mono-2.0')}">
+        <if test="${not (current.build.framework == 'mono-2.0' or current.build.framework
== 'mono-4.0')}">
             <property name="vendor.apache.org.filenames" value="Apache.NMS.dll,Apache.NMS.pdb,Apache.NMS.Test.dll,Apache.NMS.Test.pdb"
/>
         </if>
 

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/NetTxTransactionTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/NetTxTransactionTest.cs?rev=1403939&r1=1403938&r2=1403939&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/NetTxTransactionTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/NetTxTransactionTest.cs
Wed Oct 31 00:18:27 2012
@@ -247,6 +247,7 @@ namespace Apache.NMS.ActiveMQ.Test
 
                         Assert.IsFalse(this.transactionStarted, "TX Should have Committed
and cleared Started");
                         Assert.IsTrue(this.transactionCommitted, "TX Should have Committed");
+                        Assert.IsFalse(this.transactionRolledBack, "TX Should not have Rolledback");
 
                         session.Close();
                     }
@@ -277,6 +278,7 @@ namespace Apache.NMS.ActiveMQ.Test
 
                         Assert.IsFalse(this.transactionStarted, "TX Should have Committed
and cleared Started");
                         Assert.IsTrue(this.transactionCommitted, "TX Should have Committed");
+                        Assert.IsFalse(this.transactionRolledBack, "TX Should not have Rolledback");
 
                         session.Close();
                     }

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TempDestinationTest.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TempDestinationTest.cs?rev=1403939&r1=1403938&r2=1403939&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TempDestinationTest.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/test/csharp/TempDestinationTest.cs
Wed Oct 31 00:18:27 2012
@@ -313,7 +313,6 @@ namespace Apache.NMS.ActiveMQ.Test
 				IDestination producerDestination = producerSession.GetQueue(msgQueueName);
 				IMessageProducer producer = producerSession.CreateProducer(producerDestination);
 				IDestination replyDestination = producerSession.CreateTemporaryQueue();
-				IMessageConsumer replyConsumer = producerSession.CreateConsumer(replyDestination);
 
 				producerConnection.Start();
 



Mime
View raw message