activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r908054 - in /activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x: ./ nant-common.xml nant.build src/main/csharp/ConnectionFactory.cs
Date Tue, 09 Feb 2010 14:33:03 GMT
Author: tabish
Date: Tue Feb  9 14:33:03 2010
New Revision: 908054

URL: http://svn.apache.org/viewvc?rev=908054&view=rev
Log:
Merge in fixes from trunk

Modified:
    activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml
    activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant.build
    activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/src/main/csharp/ConnectionFactory.cs

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/
------------------------------------------------------------------------------
    svn:mergeinfo = /activemq/activemq-dotnet/Apache.NMS.Stomp/trunk:907773-908045

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml?rev=908054&r1=908053&r2=908054&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant-common.xml Tue Feb  9 14:33:03
2010
@@ -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-2.0,net-3.5,mono-2.0,netcf-2.0" unless="${property::exists('build.framework.strings')}"/>
+	<property name="build.framework.strings" value="net-2.0,net-3.5,mono-2.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"
/>
@@ -194,18 +194,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="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-net-2.0-framework-configuration">
 		<property name="current.build.framework" value="net-2.0" />
 		<property name="current.build.framework.name" value=".NET 2.0" />
@@ -234,7 +222,7 @@
 		<property name="current.build.framework" value="netcf-2.0" />
 		<property name="current.build.framework.name" value=".NET Compact Framework 2.0" />
 		<property name="current.build.defines" value="${build.defines}PocketPC,NETCF,NETCF_2_0"
dynamic="true" />
-		<property name="current.build.framework.sign" value="false" />
+		<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)}">
@@ -242,6 +230,18 @@
 		</if>
 	</target>
 
+	<target name="set-netcf-3.5-framework-configuration">
+		<property name="current.build.framework" value="netcf-3.5" />
+		<property name="current.build.framework.name" value=".NET Compact Framework 3.5" />
+		<property name="current.build.defines" value="${build.defines}PocketPC,NETCF,NETCF_3_5"
dynamic="true" />
+		<property name="current.build.framework.sign" value="true" />
+		<property name="link.sdkdoc.version" value="SDK_v3_5" />
+		<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" />

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant.build
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant.build?rev=908054&r1=908053&r2=908054&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant.build (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/nant.build Tue Feb  9 14:33:03
2010
@@ -22,8 +22,8 @@
     <property name="basedir" value="${project::get-base-directory()}" />
     <property name="project.name" value="Apache.NMS.Stomp" />
     <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="RC" unless="${property::exists('project.release.type')}"
/>
+    <property name="project.version" value="1.2.1" 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 Stomp Class Library"
/>
     <property name="project.description" value="Apache NMS for Stomp Class Library (.Net
Messaging Library Implementation): An implementation of the NMS API for Stomp" />
 

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/src/main/csharp/ConnectionFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/src/main/csharp/ConnectionFactory.cs?rev=908054&r1=908053&r2=908054&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/src/main/csharp/ConnectionFactory.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.2.x/src/main/csharp/ConnectionFactory.cs
Tue Feb  9 14:33:03 2010
@@ -111,10 +111,10 @@
 
                 connection = new Connection(uri, transport, this.ClientIdGenerator);
 
-                ConfigureConnection(connection);
+                connection.UserName = userName;
+                connection.Password = password;
 
-                connection.UserName = this.connectionUserName;
-                connection.Password = this.connectionPassword;
+                ConfigureConnection(connection);
 
                 if(this.clientId != null)
                 {



Mime
View raw message