Return-Path: <commits-return-45962-archive-asf-public=cust-asf.ponee.io@activemq.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 4B25F200C53
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  7 Mar 2017 00:29:27 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 4A205160B89; Mon,  6 Mar 2017 23:29:27 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 76585160B76
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  7 Mar 2017 00:29:26 +0100 (CET)
Received: (qmail 19724 invoked by uid 500); 6 Mar 2017 23:29:25 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 19715 invoked by uid 99); 6 Mar 2017 23:29:25 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2017 23:29:25 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 93793DFBD9; Mon,  6 Mar 2017 23:29:25 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tabish@apache.org
To: commits@activemq.apache.org
Date: Mon, 06 Mar 2017 23:29:25 -0000
Message-Id: <4eb312cf45504de28dfef7461a3790f9@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [01/50] [abbrv] activemq-nms-stomp git commit: Merge in fixes from
 trunk
archived-at: Mon, 06 Mar 2017 23:29:27 -0000

Repository: activemq-nms-stomp
Updated Branches:
  refs/heads/1.2.x [created] ddd11a496
  refs/heads/1.3.x [created] 7e3beeb6b
  refs/heads/1.4.x [created] 3c866c59d
  refs/heads/1.5.x [created] 77473f8ec
  refs/heads/1.6.x [created] 3c7acacab
  refs/heads/1.7.x [created] 627095830
  refs/heads/master [created] 4ba60e96c


Merge in fixes from trunk


Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/commit/ecfa0000
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/tree/ecfa0000
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/diff/ecfa0000

Branch: refs/heads/1.2.x
Commit: ecfa00005976279160c5839f3e58f37d676781ee
Parents: 4b981ae
Author: Timothy A. Bish <tabish@apache.org>
Authored: Tue Feb 9 14:33:03 2010 +0000
Committer: Timothy A. Bish <tabish@apache.org>
Committed: Tue Feb 9 14:33:03 2010 +0000

----------------------------------------------------------------------
 nant-common.xml                      | 28 ++++++++++++++--------------
 nant.build                           |  4 ++--
 src/main/csharp/ConnectionFactory.cs |  6 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/ecfa0000/nant-common.xml
----------------------------------------------------------------------
diff --git a/nant-common.xml b/nant-common.xml
index 1be2614..4099f39 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -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" />

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/ecfa0000/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 3605c1a..1b1a499 100644
--- a/nant.build
+++ b/nant.build
@@ -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" />
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/ecfa0000/src/main/csharp/ConnectionFactory.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/ConnectionFactory.cs b/src/main/csharp/ConnectionFactory.cs
index 4374e97..d34cd5f 100755
--- a/src/main/csharp/ConnectionFactory.cs
+++ b/src/main/csharp/ConnectionFactory.cs
@@ -111,10 +111,10 @@ namespace Apache.NMS.Stomp
 
                 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)
                 {