activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1083091 - in /activemq/activemq-dotnet/Apache.NMS/trunk: nant.build src/main/csharp/INetTxConnection.cs src/main/csharp/INetTxSession.cs vs2008-nms.csproj
Date Fri, 18 Mar 2011 22:16:59 GMT
Author: tabish
Date: Fri Mar 18 22:16:59 2011
New Revision: 1083091

URL: http://svn.apache.org/viewvc?rev=1083091&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQNET-321

Add the new Enlist methods into the .NET NMS API v1.6.0.

Transaction bits are ifdef'd out for .NETCF

Modified:
    activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
    activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxConnection.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs
    activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant.build?rev=1083091&r1=1083090&r2=1083091&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/nant.build Fri Mar 18 22:16:59 2011
@@ -73,6 +73,7 @@
                 <include name="${current.build.framework.assembly.dir}/System.Core.dll"
/>
                 <include name="${current.build.framework.assembly.dir}/System.Web.dll"
/>
                 <include name="${current.build.framework.assembly.dir}/System.Xml.dll"
/>
+                <include name="${current.build.framework.assembly.dir}/System.Transactions.dll"
/>
             </assemblyfileset>
         </if>
         <if test="${current.build.framework != 'net-3.5' and current.build.framework !=
'net-4.0'}">
@@ -81,6 +82,7 @@
                 <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"
/>
+                <include name="${current.build.framework.assembly.dir}/System.Transactions.dll"
/>
             </assemblyfileset>
         </if>
 

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxConnection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxConnection.cs?rev=1083091&r1=1083090&r2=1083091&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxConnection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxConnection.cs Fri Mar
18 22:16:59 2011
@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-using System;
+#if !NETCF
+using System.Transactions;
+#endif
 
 namespace Apache.NMS
 {
@@ -32,6 +34,13 @@ namespace Apache.NMS
         /// Creates a INetTxSession object.
         /// </summary>
         INetTxSession CreateNetTxSession();
+
+#if !NETCF
+        /// <summary>
+        /// Creates a INetTxSession object.
+        /// </summary>
+        INetTxSession CreateNetTxSession(Transaction tx);
+#endif
     }
 }
 

Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs?rev=1083091&r1=1083090&r2=1083091&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs Fri Mar 18
22:16:59 2011
@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-using System;
+#if !NETCF
+using System.Transactions;
+#endif
 
 namespace Apache.NMS
 {
@@ -38,6 +40,16 @@ namespace Apache.NMS
     /// </summary>
     public interface INetTxSession : ISession
     {
+#if !NETCF
+        /// <summary>
+        /// Enlist the Session in the specified Transaction.
+        /// 
+        /// If the Session is already enlisted in a Transaction or there is an Ambient
+        /// Transaction and the given TX is not that Transaction then an exception should
+        /// be thrown.
+        /// </summary>
+        void Enlist(Transaction tx);
+#endif
     }
 }
 

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=1083091&r1=1083090&r2=1083091&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj (original)
+++ activemq/activemq-dotnet/Apache.NMS/trunk/vs2008-nms.csproj Fri Mar 18 22:16:59 2011
@@ -42,6 +42,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
   </ItemGroup>



Mime
View raw message