You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2017/03/06 17:00:46 UTC
[01/46] activemq-nms-api git commit: Create new working branch for
the NMS 1.2.x baseline.
Repository: activemq-nms-api
Updated Branches:
refs/heads/1.2.x [created] 08b10d5fc
refs/heads/1.3.x [created] f2417cf44
refs/heads/1.4.x [created] f722c18e2
refs/heads/1.5.x [created] 10217b2f4
refs/heads/1.6.x [created] b991204a4
refs/heads/1.7.x [created] 08fc795de
refs/heads/master [created] be5353126
Create new working branch for the NMS 1.2.x baseline.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/9d9ef76b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/9d9ef76b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/9d9ef76b
Branch: refs/heads/1.2.x
Commit: 9d9ef76b5ff79c94324d4c00dba4835c05239702
Parents: 959aff8
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Nov 23 14:25:33 2009 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Nov 23 14:25:33 2009 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[18/46] activemq-nms-api git commit: Always encode XML messages using
UTF-8. It is the most platform neutral encoding,
and is the de facto web standard. Fixes [AMQNET-230]. (See
https://issues.apache.org/activemq/browse/AMQNET-230)
Posted by ta...@apache.org.
Always encode XML messages using UTF-8. It is the most platform neutral encoding, and is the de facto web standard.
Fixes [AMQNET-230]. (See https://issues.apache.org/activemq/browse/AMQNET-230)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/08b10d5f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/08b10d5f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/08b10d5f
Branch: refs/heads/1.2.x
Commit: 08b10d5fc0f59257dbb5ce3671b6dda039ec93c7
Parents: 1ec0293
Author: Jim Gomes <jg...@apache.org>
Authored: Tue Feb 16 19:07:32 2010 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Tue Feb 16 19:07:32 2010 +0000
----------------------------------------------------------------------
src/main/csharp/Util/XmlUtils.cs | 43 +++++++++++++++++++++++++++--------
1 file changed, 33 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/08b10d5f/src/main/csharp/Util/XmlUtils.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/Util/XmlUtils.cs b/src/main/csharp/Util/XmlUtils.cs
index e250ac6..ea764d1 100644
--- a/src/main/csharp/Util/XmlUtils.cs
+++ b/src/main/csharp/Util/XmlUtils.cs
@@ -18,9 +18,9 @@
using System;
using System.IO;
using System.Text;
+using System.Text.RegularExpressions;
using System.Xml;
using System.Xml.Serialization;
-using System.Text.RegularExpressions;
namespace Apache.NMS.Util
{
@@ -29,20 +29,43 @@ namespace Apache.NMS.Util
/// </summary>
public class XmlUtil
{
+ private static XmlWriterSettings xmlWriterSettings;
+
+ /// <summary>
+ /// Static class constructor.
+ /// </summary>
+ static XmlUtil()
+ {
+ xmlWriterSettings = new XmlWriterSettings();
+ xmlWriterSettings.Encoding = new UTF8Encoding(false, false);
+ }
+
+ /// <summary>
+ /// Serialize the object to XML format. The XML encoding will be UTF-8. A Byte Order Mark (BOM)
+ /// will NOT be placed at the beginning of the string.
+ /// </summary>
+ /// <param name="obj"></param>
+ /// <returns></returns>
public static string Serialize(object obj)
{
try
{
- StringBuilder outputStringBuilder = new StringBuilder();
- XmlSerializer serializer = new XmlSerializer(obj.GetType());
- XmlWriter xmlWriter = XmlWriter.Create(outputStringBuilder);
+ byte[] encodedBytes;
- // Set the error handlers.
- serializer.UnknownNode += serializer_UnknownNode;
- serializer.UnknownElement += serializer_UnknownElement;
- serializer.UnknownAttribute += serializer_UnknownAttribute;
- serializer.Serialize(xmlWriter, obj);
- return outputStringBuilder.ToString();
+ using(MemoryStream outputStream = new MemoryStream())
+ using(XmlWriter xmlWriter = XmlWriter.Create(outputStream, xmlWriterSettings))
+ {
+ XmlSerializer serializer = new XmlSerializer(obj.GetType());
+
+ // Set the error handlers.
+ serializer.UnknownNode += serializer_UnknownNode;
+ serializer.UnknownElement += serializer_UnknownElement;
+ serializer.UnknownAttribute += serializer_UnknownAttribute;
+ serializer.Serialize(xmlWriter, obj);
+ encodedBytes = outputStream.ToArray();
+ }
+
+ return xmlWriterSettings.Encoding.GetString(encodedBytes, 0, encodedBytes.Length);
}
catch(Exception ex)
{
[40/46] activemq-nms-api git commit: Branch trunk to a 1.7.x line for
next release iteration.
Posted by ta...@apache.org.
Branch trunk to a 1.7.x line for next release iteration.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/c18bc292
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/c18bc292
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/c18bc292
Branch: refs/heads/1.7.x
Commit: c18bc292b2e84694f535210f341f20b6d1dbc7d2
Parents: e9ccac7
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Dec 15 21:16:57 2014 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Dec 15 21:16:57 2014 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[36/46] activemq-nms-api git commit: Build the version to 1.5.2
SNAPSHOT
Posted by ta...@apache.org.
Build the version to 1.5.2 SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/1fa7ff8c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/1fa7ff8c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/1fa7ff8c
Branch: refs/heads/1.5.x
Commit: 1fa7ff8c008ba87d0070f65422136cc0d8e931e8
Parents: c7da782
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Jul 2 15:26:33 2012 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Jul 2 15:26:33 2012 +0000
----------------------------------------------------------------------
nant.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/1fa7ff8c/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index e331de2..9a66023 100644
--- a/nant.build
+++ b/nant.build
@@ -23,7 +23,7 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.5.1" unless="${property::exists('project.version')}" />
+ <property name="project.version" value="1.5.2" 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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
[13/46] activemq-nms-api git commit: Bump version no. and flag as
SNAPSHOT.
Posted by ta...@apache.org.
Bump version no. and flag as SNAPSHOT.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/44f8a7a8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/44f8a7a8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/44f8a7a8
Branch: refs/heads/1.2.x
Commit: 44f8a7a80e8066369b4251734be7768156c45f2c
Parents: dfbbce8
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Jan 11 14:00:39 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Jan 11 14:00:39 2010 +0000
----------------------------------------------------------------------
nant.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/44f8a7a8/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 5a1fbcd..9b9ed94 100644
--- a/nant.build
+++ b/nant.build
@@ -23,8 +23,8 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<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="GA" 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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
<property name="project.cls.compliant" value="true" />
[46/46] activemq-nms-api git commit: Remove unused post-build
statements.
Posted by ta...@apache.org.
Remove unused post-build statements.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/be535312
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/be535312
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/be535312
Branch: refs/heads/master
Commit: be5353126590f83bcd774ff27a4bf56cf66a2b90
Parents: ea9826f
Author: Jim Gomes <jg...@apache.org>
Authored: Sat Mar 19 21:01:49 2016 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Sat Mar 19 21:01:49 2016 +0000
----------------------------------------------------------------------
vs2010-nms-net2.0.csproj | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/be535312/vs2010-nms-net2.0.csproj
----------------------------------------------------------------------
diff --git a/vs2010-nms-net2.0.csproj b/vs2010-nms-net2.0.csproj
index ce295ea..fb4cd6b 100644
--- a/vs2010-nms-net2.0.csproj
+++ b/vs2010-nms-net2.0.csproj
@@ -164,12 +164,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>
- <PostBuildEvent>if /i "$(build_extraplatforms)" equ "true" (
- cd $(ProjectDir)
- nant -nologo -q $(buildtype) -D:build.framework.strings="netcf-2.0,netcf-3.5,mono-2.0"
-)
-
-if /i "$(install_skip)" equ "true" (
+ <PostBuildEvent>if /i "$(install_skip)" equ "true" (
echo Skipping install...
goto :installskip
)
[32/46] activemq-nms-api git commit: Added command-line option to
skip downloading dependent libraries. This gives greater flexibility for
debugging with special libraries.
Posted by ta...@apache.org.
Added command-line option to skip downloading dependent libraries. This gives greater flexibility for debugging with special libraries.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/27cf9a1d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/27cf9a1d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/27cf9a1d
Branch: refs/heads/1.5.x
Commit: 27cf9a1d0a8275c42759af9ac613c70def97550d
Parents: e5be5be
Author: Jim Gomes <jg...@apache.org>
Authored: Thu Sep 1 22:21:25 2011 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Thu Sep 1 22:21:25 2011 +0000
----------------------------------------------------------------------
nant-common.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/27cf9a1d/nant-common.xml
----------------------------------------------------------------------
diff --git a/nant-common.xml b/nant-common.xml
index bf7a6ae..1f3e3d3 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -40,6 +40,7 @@
<property name="build.noskip" value="false" />
<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="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" />
@@ -416,7 +417,7 @@
<target name="download-vendor" depends="vendor-init, conditional-download"
description="Download the vendor artifacts from the nant repo" />
- <target name="conditional-download" unless="${build.skip}"
+ <target name="conditional-download" unless="${build.skip or download.skip}"
description="Download the artifacts from the nant repo">
<!-- Iterate over the defined vendor filesets. -->
<foreach item="String" in="${vendor.fileset.names}" delim="," property="current.vendor">
[39/46] activemq-nms-api git commit: Bump branch to v1.6.1 for
maintenance.
Posted by ta...@apache.org.
Bump branch to v1.6.1 for maintenance.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/b991204a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/b991204a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/b991204a
Branch: refs/heads/1.6.x
Commit: b991204a4f8ac220a1f337fba3cb1eaf62451c96
Parents: 01235de
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon May 20 21:40:26 2013 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon May 20 21:40:26 2013 +0000
----------------------------------------------------------------------
nant.build | 4 ++--
package.ps1 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/b991204a/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 55d6b10..90b3361 100644
--- a/nant.build
+++ b/nant.build
@@ -23,8 +23,8 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.6.0" unless="${property::exists('project.version')}" />
- <property name="project.release.type" value="GA" unless="${property::exists('project.release.type')}" />
+ <property name="project.version" value="1.6.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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
<property name="project.cls.compliant" value="true" />
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/b991204a/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index 4292564..d080a0f 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.6.0"
+$pkgver = "1.6.1-SNAPSHOT"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0", "netcf-3.5"
[12/46] activemq-nms-api git commit: Set version as offical release
Posted by ta...@apache.org.
Set version as offical release
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/dfbbce89
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/dfbbce89
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/dfbbce89
Branch: refs/heads/1.2.x
Commit: dfbbce89c097e5870e9b37f09a4f95af831633e5
Parents: cdf9c84
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Jan 11 13:47:55 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Jan 11 13:47:55 2010 +0000
----------------------------------------------------------------------
nant.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/dfbbce89/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 9b9ed94..5a1fbcd 100644
--- a/nant.build
+++ b/nant.build
@@ -23,8 +23,8 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <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.version" value="1.2.0" unless="${property::exists('project.version')}" />
+ <property name="project.release.type" value="GA" unless="${property::exists('project.release.type')}" />
<property name="project.short_description" value="Apache NMS Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
<property name="project.cls.compliant" value="true" />
[38/46] activemq-nms-api git commit: Create tag for future 1.6.x
releases
Posted by ta...@apache.org.
Create tag for future 1.6.x releases
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/01235de0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/01235de0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/01235de0
Branch: refs/heads/1.6.x
Commit: 01235de0c539d3b4ee1b1511b46cc4966c369840
Parents: d205dc2
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon May 20 21:34:50 2013 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon May 20 21:34:50 2013 +0000
----------------------------------------------------------------------
nant.build | 2 +-
package.ps1 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/01235de0/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 4b8bed5..55d6b10 100644
--- a/nant.build
+++ b/nant.build
@@ -24,7 +24,7 @@
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
<property name="project.version" value="1.6.0" unless="${property::exists('project.version')}" />
- <property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
+ <property name="project.release.type" value="GA" unless="${property::exists('project.release.type')}" />
<property name="project.short_description" value="Apache NMS Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
<property name="project.cls.compliant" value="true" />
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/01235de0/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index a8b3d11..4292564 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.6-SNAPSHOT"
+$pkgver = "1.6.0"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0", "netcf-3.5"
[37/46] activemq-nms-api git commit: fix for:
https://issues.apache.org/jira/browse/AMQNET-393
Posted by ta...@apache.org.
fix for: https://issues.apache.org/jira/browse/AMQNET-393
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/10217b2f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/10217b2f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/10217b2f
Branch: refs/heads/1.5.x
Commit: 10217b2f46f10bf61a1ee0d3cfda101aff4e28d1
Parents: 1fa7ff8
Author: Timothy A. Bish <ta...@apache.org>
Authored: Fri Jul 13 20:10:33 2012 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Fri Jul 13 20:10:33 2012 +0000
----------------------------------------------------------------------
nant.build | 1 +
src/main/csharp/Util/URISupport.cs | 1277 +++++++++++++++----------------
src/test/csharp/URISupportTest.cs | 25 +
3 files changed, 664 insertions(+), 639 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/10217b2f/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 9a66023..ae3b149 100644
--- a/nant.build
+++ b/nant.build
@@ -88,6 +88,7 @@
<include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
<include name="${current.build.framework.assembly.dir}/System.dll" />
<include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.Web.dll" />
<include name="${build.bin.dir}/${project.name}.dll" />
<include name="${nunit.dll}" />
</assemblyfileset>
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/10217b2f/src/main/csharp/Util/URISupport.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/Util/URISupport.cs b/src/main/csharp/Util/URISupport.cs
index e17df5a..5a3d686 100644
--- a/src/main/csharp/Util/URISupport.cs
+++ b/src/main/csharp/Util/URISupport.cs
@@ -1,639 +1,638 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Reflection;
-using System.Text;
-#if !NETCF
-using System.Web;
-#endif
-
-namespace Apache.NMS.Util
-{
- /// <summary>
- /// Class to provide support for Uri query parameters which uses .Net reflection
- /// to identify and set properties.
- /// </summary>
- public class URISupport
- {
- /// <summary>
- /// Given a string that could be a Composite Uri that uses syntax not compatible
- /// with the .NET Uri class such as an ActiveMQ failover Uri formatted as
- /// "failover://(tcp://localhost:61616)", the initial '://' must be changed
- /// to ':(' so that the Uri class doesn't attempt to parse the '(tcp:' as
- /// the Uri's Authority as that is not a valid host name.
- /// </summary>
- /// <param name="uriString">
- /// A string that could be a Composite Uri that uses syntax not compatible
- /// with the .NET Uri class
- /// </param>
- public static Uri CreateCompatibleUri(string uriString)
- {
- string sanitized = uriString.Replace("://(", ":(");
- return new Uri(sanitized);
- }
-
- /// <summary>
- /// Parse a Uri query string of the form ?x=y&z=0
- /// into a map of name/value pairs.
- /// </summary>
- /// <param name="query">The query string to parse. This string should not contain
- /// Uri escape characters.</param>
- public static StringDictionary ParseQuery(String query)
- {
- StringDictionary map = new StringDictionary();
-
- if(String.IsNullOrEmpty(query))
- {
- return EmptyMap;
- }
-
- // strip the initial "?"
- if(query.StartsWith("?"))
- {
- query = query.Substring(1);
- }
-
- // split the query into parameters
- string[] parameters = query.Split('&');
- foreach(string pair in parameters)
- {
- if(pair.Length > 0)
- {
- string[] nameValue = pair.Split('=');
-
- if(nameValue.Length != 2)
- {
- throw new NMSException(string.Format("Invalid Uri parameter: {0}", query));
- }
-
- map[nameValue[0]] = nameValue[1];
- }
- }
-
- return map;
- }
-
- public static StringDictionary ParseParameters(Uri uri)
- {
- return (uri.Query == null
- ? EmptyMap
- : ParseQuery(StripPrefix(uri.Query, "?")));
- }
-
- /// <summary>
- /// Sets the public properties of a target object using a string map.
- /// This method uses .Net reflection to identify public properties of
- /// the target object matching the keys from the passed map.
- /// </summary>
- /// <param name="target">The object whose properties will be set.</param>
- /// <param name="map">Map of key/value pairs.</param>
- public static void SetProperties(object target, StringDictionary map)
- {
- Type type = target.GetType();
-
- foreach(string key in map.Keys)
- {
- PropertyInfo prop = type.GetProperty(key,
- BindingFlags.FlattenHierarchy
- | BindingFlags.Public
- | BindingFlags.Instance
- | BindingFlags.IgnoreCase);
-
- if(null != prop)
- {
- prop.SetValue(target, Convert.ChangeType(map[key], prop.PropertyType, CultureInfo.InvariantCulture), null);
- }
- else
- {
- FieldInfo field = type.GetField(key,
- BindingFlags.FlattenHierarchy
- | BindingFlags.Public
- | BindingFlags.Instance
- | BindingFlags.IgnoreCase);
- if(null != field)
- {
- field.SetValue(target, Convert.ChangeType(map[key], field.FieldType, CultureInfo.InvariantCulture));
- }
- else
- {
- throw new NMSException(string.Format("No such property or field: {0} on class: {1}", key, target.GetType().Name));
- }
- }
- }
- }
-
- /// <summary>
- /// Sets the public properties of a target object using a string map.
- /// This method uses .Net reflection to identify public properties of
- /// the target object matching the keys from the passed map.
- /// </summary>
- /// <param name="target">The object whose properties will be set.</param>
- /// <param name="map">Map of key/value pairs.</param>
- /// <param name="prefix">Key value prefix. This is prepended to the property name
- /// before searching for a matching key value.</param>
- public static void SetProperties(object target, StringDictionary map, string prefix)
- {
- Type type = target.GetType();
-
- List<String> matches = new List<String>();
-
- foreach(string key in map.Keys)
- {
- if(key.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase))
- {
- string bareKey = key.Substring(prefix.Length);
- PropertyInfo prop = type.GetProperty(bareKey,
- BindingFlags.FlattenHierarchy
- | BindingFlags.Public
- | BindingFlags.Instance
- | BindingFlags.IgnoreCase);
-
- if(null != prop)
- {
- prop.SetValue(target, Convert.ChangeType(map[key], prop.PropertyType, CultureInfo.InvariantCulture), null);
- }
- else
- {
- FieldInfo field = type.GetField(bareKey,
- BindingFlags.FlattenHierarchy
- | BindingFlags.Public
- | BindingFlags.Instance
- | BindingFlags.IgnoreCase);
- if(null != field)
- {
- field.SetValue(target, Convert.ChangeType(map[key], field.FieldType, CultureInfo.InvariantCulture));
- }
- else
- {
- throw new NMSException(string.Format("No such property or field: {0} on class: {1}", bareKey, target.GetType().Name));
- }
- }
-
- // store for later removal.
- matches.Add(key);
- }
- }
-
- // Remove all the properties we set so they are used again later.
- foreach(string match in matches)
- {
- map.Remove(match);
- }
- }
-
- public static StringDictionary GetProperties(StringDictionary props, string prefix)
- {
-
- if(props == null)
- {
- throw new Exception("Properties Object was null");
- }
-
- StringDictionary result = new StringDictionary();
-
- foreach(string key in props.Keys)
- {
- if(key.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase))
- {
- string bareKey = key.Substring(prefix.Length);
- String value = props[key];
- result[bareKey] = value;
- }
- }
-
- return result;
- }
-
- public static StringDictionary ExtractProperties(StringDictionary props, string prefix)
- {
-
- if(props == null)
- {
- throw new Exception("Properties Object was null");
- }
-
- StringDictionary result = new StringDictionary();
- List<String> matches = new List<String>();
-
- foreach(string key in props.Keys)
- {
- if(key.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase))
- {
- String value = props[key];
- result[key] = value;
- matches.Add(key);
- }
- }
-
- foreach(string match in matches)
- {
- props.Remove(match);
- }
-
- return result;
- }
-
- public static String UrlDecode(String s)
- {
-#if !NETCF
- return HttpUtility.HtmlDecode(s);
-#else
- return Uri.UnescapeDataString(s);
-#endif
- }
-
- public static String UrlEncode(String s)
- {
-#if !NETCF
- return HttpUtility.HtmlEncode(s);
-#else
- return Uri.EscapeUriString(s);
-#endif
- }
-
- public static String CreateQueryString(StringDictionary options)
- {
- if(options != null && options.Count > 0)
- {
- StringBuilder rc = new StringBuilder();
- bool first = true;
-
- foreach(String key in options.Keys)
- {
- string value = options[key];
-
- if(first)
- {
- first = false;
- }
- else
- {
- rc.Append("&");
- }
-
- rc.Append(UrlEncode(key));
- rc.Append("=");
- rc.Append(UrlEncode(value));
- }
-
- return rc.ToString();
- }
- else
- {
- return "";
- }
- }
-
- public static Uri CreateRemainingUri(Uri originalUri, StringDictionary parameters)
- {
- string s = CreateQueryString(parameters);
-
- if(String.IsNullOrEmpty(s))
- {
- s = null;
- }
-
- return CreateUriWithQuery(originalUri, s);
- }
-
- public class CompositeData
- {
- private String host;
- private String scheme;
- private String path;
- private Uri[] components;
- private StringDictionary parameters;
- private String fragment;
-
- public Uri[] Components
- {
- get { return components; }
- set { components = value; }
- }
-
- public String Fragment
- {
- get { return fragment; }
- set { fragment = value; }
- }
-
- public StringDictionary Parameters
- {
- get { return parameters; }
- set { parameters = value; }
- }
-
- public String Scheme
- {
- get { return scheme; }
- set { scheme = value; }
- }
-
- public String Path
- {
- get { return path; }
- set { path = value; }
- }
-
- public String Host
- {
- get { return host; }
- set { host = value; }
- }
-
- public Uri toUri()
- {
- StringBuilder sb = new StringBuilder();
- if(scheme != null)
- {
- sb.Append(scheme);
- sb.Append(':');
- }
-
- if(!string.IsNullOrEmpty(host))
- {
- sb.Append(host);
- }
- else
- {
- sb.Append('(');
- for(int i = 0; i < components.Length; i++)
- {
- if(i != 0)
- {
- sb.Append(',');
- }
- sb.Append(components[i].ToString());
- }
- sb.Append(')');
- }
-
- if(path != null)
- {
- sb.Append('/');
- sb.Append(path);
- }
-
- if(parameters.Count != 0)
- {
- sb.Append("?");
- sb.Append(CreateQueryString(parameters));
- }
-
- if(fragment != null)
- {
- sb.Append("#");
- sb.Append(fragment);
- }
-
- return new Uri(sb.ToString());
- }
- }
-
- public static String StripPrefix(String value, String prefix)
- {
- if(value.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase))
- {
- return value.Substring(prefix.Length);
- }
-
- return value;
- }
-
- public static Uri CreateUriWithQuery(Uri uri, string query)
- {
- if(!String.IsNullOrEmpty(query) && !query.StartsWith("?"))
- {
- query = "?" + query;
- }
-
- if(String.IsNullOrEmpty(uri.Query))
- {
- return new Uri(uri.OriginalString + query);
- }
- else
- {
- string originalUri = uri.OriginalString;
-
- int queryDelimPos = originalUri.LastIndexOf('?');
- int compositeDelimPos = originalUri.LastIndexOf(')');
-
- if(queryDelimPos <= compositeDelimPos)
- {
- // No Query or the Query is part of an inner Composite.
- return new Uri(originalUri + query);
- }
- else
- {
- // Outer Uri has a Query or not a Composite Uri with a Query
- string strippedUri = originalUri.Substring(0, queryDelimPos);
- return new Uri(strippedUri + query);
- }
- }
- }
-
- public static Uri RemoveQuery(Uri original)
- {
- return CreateUriWithQuery(original, null);
- }
-
- public static CompositeData ParseComposite(Uri uri)
- {
- CompositeData rc = new CompositeData();
- rc.Scheme = uri.Scheme;
-
- // Start with original URI
- //String ssp = uri.Authority + uri.PathAndQuery;
- String ssp = uri.OriginalString;
-
- ssp = StripPrefix(ssp, rc.Scheme + ":");
- ssp = StripPrefix(ssp, "//");
-
- int lastPoundPos = ssp.LastIndexOf("#");
- int lastParendPos = ssp.LastIndexOf(")");
-
- // Only include a Fragment that's outside any Composte sections.
- if(lastPoundPos > lastParendPos)
- {
- rc.Fragment = ssp.Substring(lastPoundPos);
- ssp = ssp.Substring(0, lastPoundPos);
- }
-
- // Ensure any embedded URIs don't have malformed authority's by changing
- // them from '://(' which would cause the .NET Uri class to attempt to validate
- // the authority as a hostname with, ':(' which is valid.
- ssp = ssp.Replace("://(", ":(");
-
- // Handle the composite components
- ParseComposite(uri, rc, ssp);
- return rc;
- }
-
- /// <summary>
- /// </summary>
- /// <param name="uri"></param>
- /// <param name="rc"></param>
- /// <param name="ssp"></param>
- private static void ParseComposite(Uri uri, CompositeData rc, String ssp)
- {
- String componentString;
- String parms;
-
- if(!CheckParenthesis(ssp))
- {
- throw new NMSException(uri.ToString() + ": Not a matching number of '(' and ')' parenthesis");
- }
-
- int p;
- int intialParen = ssp.IndexOf("(");
-
- if(intialParen >= 0)
- {
- rc.Host = ssp.Substring(0, intialParen);
- p = rc.Host.IndexOf("/");
- if(p >= 0)
- {
- rc.Path = rc.Host.Substring(p);
- rc.Host = rc.Host.Substring(0, p);
- }
-
- p = ssp.LastIndexOf(")");
- int start = intialParen + 1;
- int len = p - start;
- componentString = ssp.Substring(start, len);
- parms = ssp.Substring(p + 1).Trim();
- }
- else
- {
- componentString = ssp;
- parms = "";
- }
-
- String[] components = SplitComponents(componentString);
- rc.Components = new Uri[components.Length];
- for(int i = 0; i < components.Length; i++)
- {
- rc.Components[i] = new Uri(components[i].Trim());
- }
-
- p = parms.IndexOf("?");
- if(p >= 0)
- {
- if(p > 0)
- {
- rc.Path = StripPrefix(parms.Substring(0, p), "/");
- }
-
- rc.Parameters = ParseQuery(parms.Substring(p + 1));
- }
- else
- {
- if(parms.Length > 0)
- {
- rc.Path = StripPrefix(parms, "/");
- }
-
- rc.Parameters = EmptyMap;
- }
- }
-
- private static StringDictionary EmptyMap
- {
- get { return new StringDictionary(); }
- }
-
- /// <summary>
- /// </summary>
- /// <param name="componentString"></param>
- private static String[] SplitComponents(String componentString)
- {
- ArrayList l = new ArrayList();
-
- int last = 0;
- int depth = 0;
- char[] chars = componentString.ToCharArray();
- for(int i = 0; i < chars.Length; i++)
- {
- switch(chars[i])
- {
- case '(':
- depth++;
- break;
-
- case ')':
- depth--;
- break;
-
- case ',':
- if(depth == 0)
- {
- String s = componentString.Substring(last, i - last);
- l.Add(s);
- last = i + 1;
- }
- break;
-
- default:
- break;
- }
- }
-
- String ending = componentString.Substring(last);
- if(ending.Length != 0)
- {
- l.Add(ending);
- }
-
- String[] rc = new String[l.Count];
- l.CopyTo(rc);
- return rc;
- }
-
- public static bool CheckParenthesis(String str)
- {
- bool result = true;
-
- if(str != null)
- {
- int open = 0;
- int closed = 0;
-
- int i = 0;
- while((i = str.IndexOf('(', i)) >= 0)
- {
- i++;
- open++;
- }
-
- i = 0;
- while((i = str.IndexOf(')', i)) >= 0)
- {
- i++;
- closed++;
- }
-
- result = (open == closed);
- }
-
- return result;
- }
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Reflection;
+using System.Text;
+#if !NETCF
+using System.Web;
+#endif
+
+namespace Apache.NMS.Util
+{
+ /// <summary>
+ /// Class to provide support for Uri query parameters which uses .Net reflection
+ /// to identify and set properties.
+ /// </summary>
+ public class URISupport
+ {
+ /// <summary>
+ /// Given a string that could be a Composite Uri that uses syntax not compatible
+ /// with the .NET Uri class such as an ActiveMQ failover Uri formatted as
+ /// "failover://(tcp://localhost:61616)", the initial '://' must be changed
+ /// to ':(' so that the Uri class doesn't attempt to parse the '(tcp:' as
+ /// the Uri's Authority as that is not a valid host name.
+ /// </summary>
+ /// <param name="uriString">
+ /// A string that could be a Composite Uri that uses syntax not compatible
+ /// with the .NET Uri class
+ /// </param>
+ public static Uri CreateCompatibleUri(string uriString)
+ {
+ string sanitized = uriString.Replace("://(", ":(");
+ return new Uri(sanitized);
+ }
+
+ /// <summary>
+ /// Parse a Uri query string of the form ?x=y&z=0
+ /// into a map of name/value pairs.
+ /// </summary>
+ /// <param name="query">The query string to parse. This string should not contain
+ /// Uri escape characters.</param>
+ public static StringDictionary ParseQuery(String query)
+ {
+ StringDictionary map = new StringDictionary();
+
+ if(String.IsNullOrEmpty(query))
+ {
+ return EmptyMap;
+ }
+
+ // strip the initial "?"
+ if(query.StartsWith("?"))
+ {
+ query = query.Substring(1);
+ }
+
+ // split the query into parameters
+ string[] parameters = query.Split('&');
+ foreach(string pair in parameters)
+ {
+ if(pair.Length > 0)
+ {
+ string[] nameValue = pair.Split('=');
+
+ if(nameValue.Length != 2)
+ {
+ throw new NMSException(string.Format("Invalid Uri parameter: {0}", query));
+ }
+
+ map[UrlDecode(nameValue[0])] = UrlDecode(nameValue[1]);
+ }
+ }
+
+ return map;
+ }
+
+ public static StringDictionary ParseParameters(Uri uri)
+ {
+ return (uri.Query == null
+ ? EmptyMap
+ : ParseQuery(StripPrefix(uri.Query, "?")));
+ }
+
+ /// <summary>
+ /// Sets the public properties of a target object using a string map.
+ /// This method uses .Net reflection to identify public properties of
+ /// the target object matching the keys from the passed map.
+ /// </summary>
+ /// <param name="target">The object whose properties will be set.</param>
+ /// <param name="map">Map of key/value pairs.</param>
+ public static void SetProperties(object target, StringDictionary map)
+ {
+ Type type = target.GetType();
+
+ foreach(string key in map.Keys)
+ {
+ PropertyInfo prop = type.GetProperty(key,
+ BindingFlags.FlattenHierarchy
+ | BindingFlags.Public
+ | BindingFlags.Instance
+ | BindingFlags.IgnoreCase);
+
+ if(null != prop)
+ {
+ prop.SetValue(target, Convert.ChangeType(map[key], prop.PropertyType, CultureInfo.InvariantCulture), null);
+ }
+ else
+ {
+ FieldInfo field = type.GetField(key,
+ BindingFlags.FlattenHierarchy
+ | BindingFlags.Public
+ | BindingFlags.Instance
+ | BindingFlags.IgnoreCase);
+ if(null != field)
+ {
+ field.SetValue(target, Convert.ChangeType(map[key], field.FieldType, CultureInfo.InvariantCulture));
+ }
+ else
+ {
+ throw new NMSException(string.Format("No such property or field: {0} on class: {1}", key, target.GetType().Name));
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// Sets the public properties of a target object using a string map.
+ /// This method uses .Net reflection to identify public properties of
+ /// the target object matching the keys from the passed map.
+ /// </summary>
+ /// <param name="target">The object whose properties will be set.</param>
+ /// <param name="map">Map of key/value pairs.</param>
+ /// <param name="prefix">Key value prefix. This is prepended to the property name
+ /// before searching for a matching key value.</param>
+ public static void SetProperties(object target, StringDictionary map, string prefix)
+ {
+ Type type = target.GetType();
+
+ List<String> matches = new List<String>();
+
+ foreach(string key in map.Keys)
+ {
+ if(key.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase))
+ {
+ string bareKey = key.Substring(prefix.Length);
+ PropertyInfo prop = type.GetProperty(bareKey,
+ BindingFlags.FlattenHierarchy
+ | BindingFlags.Public
+ | BindingFlags.Instance
+ | BindingFlags.IgnoreCase);
+
+ if(null != prop)
+ {
+ prop.SetValue(target, Convert.ChangeType(map[key], prop.PropertyType, CultureInfo.InvariantCulture), null);
+ }
+ else
+ {
+ FieldInfo field = type.GetField(bareKey,
+ BindingFlags.FlattenHierarchy
+ | BindingFlags.Public
+ | BindingFlags.Instance
+ | BindingFlags.IgnoreCase);
+ if(null != field)
+ {
+ field.SetValue(target, Convert.ChangeType(map[key], field.FieldType, CultureInfo.InvariantCulture));
+ }
+ else
+ {
+ throw new NMSException(string.Format("No such property or field: {0} on class: {1}", bareKey, target.GetType().Name));
+ }
+ }
+
+ // store for later removal.
+ matches.Add(key);
+ }
+ }
+
+ // Remove all the properties we set so they are used again later.
+ foreach(string match in matches)
+ {
+ map.Remove(match);
+ }
+ }
+
+ public static StringDictionary GetProperties(StringDictionary props, string prefix)
+ {
+ if(props == null)
+ {
+ throw new Exception("Properties Object was null");
+ }
+
+ StringDictionary result = new StringDictionary();
+
+ foreach(string key in props.Keys)
+ {
+ if(key.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase))
+ {
+ string bareKey = key.Substring(prefix.Length);
+ String value = props[key];
+ result[bareKey] = value;
+ }
+ }
+
+ return result;
+ }
+
+ public static StringDictionary ExtractProperties(StringDictionary props, string prefix)
+ {
+
+ if(props == null)
+ {
+ throw new Exception("Properties Object was null");
+ }
+
+ StringDictionary result = new StringDictionary();
+ List<String> matches = new List<String>();
+
+ foreach(string key in props.Keys)
+ {
+ if(key.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase))
+ {
+ String value = props[key];
+ result[key] = value;
+ matches.Add(key);
+ }
+ }
+
+ foreach(string match in matches)
+ {
+ props.Remove(match);
+ }
+
+ return result;
+ }
+
+ public static String UrlDecode(String s)
+ {
+#if !NETCF
+ return HttpUtility.UrlDecode(s);
+#else
+ return Uri.UnescapeDataString(s);
+#endif
+ }
+
+ public static String UrlEncode(String s)
+ {
+#if !NETCF
+ return HttpUtility.UrlEncode(s);
+#else
+ return Uri.EscapeUriString(s);
+#endif
+ }
+
+ public static String CreateQueryString(StringDictionary options)
+ {
+ if(options != null && options.Count > 0)
+ {
+ StringBuilder rc = new StringBuilder();
+ bool first = true;
+
+ foreach(String key in options.Keys)
+ {
+ string value = options[key];
+
+ if(first)
+ {
+ first = false;
+ }
+ else
+ {
+ rc.Append("&");
+ }
+
+ rc.Append(UrlEncode(key));
+ rc.Append("=");
+ rc.Append(UrlEncode(value));
+ }
+
+ return rc.ToString();
+ }
+ else
+ {
+ return "";
+ }
+ }
+
+ public static Uri CreateRemainingUri(Uri originalUri, StringDictionary parameters)
+ {
+ string s = CreateQueryString(parameters);
+
+ if(String.IsNullOrEmpty(s))
+ {
+ s = null;
+ }
+
+ return CreateUriWithQuery(originalUri, s);
+ }
+
+ public class CompositeData
+ {
+ private String host;
+ private String scheme;
+ private String path;
+ private Uri[] components;
+ private StringDictionary parameters;
+ private String fragment;
+
+ public Uri[] Components
+ {
+ get { return components; }
+ set { components = value; }
+ }
+
+ public String Fragment
+ {
+ get { return fragment; }
+ set { fragment = value; }
+ }
+
+ public StringDictionary Parameters
+ {
+ get { return parameters; }
+ set { parameters = value; }
+ }
+
+ public String Scheme
+ {
+ get { return scheme; }
+ set { scheme = value; }
+ }
+
+ public String Path
+ {
+ get { return path; }
+ set { path = value; }
+ }
+
+ public String Host
+ {
+ get { return host; }
+ set { host = value; }
+ }
+
+ public Uri toUri()
+ {
+ StringBuilder sb = new StringBuilder();
+ if(scheme != null)
+ {
+ sb.Append(scheme);
+ sb.Append(':');
+ }
+
+ if(!string.IsNullOrEmpty(host))
+ {
+ sb.Append(host);
+ }
+ else
+ {
+ sb.Append('(');
+ for(int i = 0; i < components.Length; i++)
+ {
+ if(i != 0)
+ {
+ sb.Append(',');
+ }
+ sb.Append(components[i].ToString());
+ }
+ sb.Append(')');
+ }
+
+ if(path != null)
+ {
+ sb.Append('/');
+ sb.Append(path);
+ }
+
+ if(parameters.Count != 0)
+ {
+ sb.Append("?");
+ sb.Append(CreateQueryString(parameters));
+ }
+
+ if(fragment != null)
+ {
+ sb.Append("#");
+ sb.Append(fragment);
+ }
+
+ return new Uri(sb.ToString());
+ }
+ }
+
+ public static String StripPrefix(String value, String prefix)
+ {
+ if(value.StartsWith(prefix, StringComparison.InvariantCultureIgnoreCase))
+ {
+ return value.Substring(prefix.Length);
+ }
+
+ return value;
+ }
+
+ public static Uri CreateUriWithQuery(Uri uri, string query)
+ {
+ if(!String.IsNullOrEmpty(query) && !query.StartsWith("?"))
+ {
+ query = "?" + query;
+ }
+
+ if(String.IsNullOrEmpty(uri.Query))
+ {
+ return new Uri(uri.OriginalString + query);
+ }
+ else
+ {
+ string originalUri = uri.OriginalString;
+
+ int queryDelimPos = originalUri.LastIndexOf('?');
+ int compositeDelimPos = originalUri.LastIndexOf(')');
+
+ if(queryDelimPos <= compositeDelimPos)
+ {
+ // No Query or the Query is part of an inner Composite.
+ return new Uri(originalUri + query);
+ }
+ else
+ {
+ // Outer Uri has a Query or not a Composite Uri with a Query
+ string strippedUri = originalUri.Substring(0, queryDelimPos);
+ return new Uri(strippedUri + query);
+ }
+ }
+ }
+
+ public static Uri RemoveQuery(Uri original)
+ {
+ return CreateUriWithQuery(original, null);
+ }
+
+ public static CompositeData ParseComposite(Uri uri)
+ {
+ CompositeData rc = new CompositeData();
+ rc.Scheme = uri.Scheme;
+
+ // Start with original URI
+ //String ssp = uri.Authority + uri.PathAndQuery;
+ String ssp = uri.OriginalString;
+
+ ssp = StripPrefix(ssp, rc.Scheme + ":");
+ ssp = StripPrefix(ssp, "//");
+
+ int lastPoundPos = ssp.LastIndexOf("#");
+ int lastParendPos = ssp.LastIndexOf(")");
+
+ // Only include a Fragment that's outside any Composte sections.
+ if(lastPoundPos > lastParendPos)
+ {
+ rc.Fragment = ssp.Substring(lastPoundPos);
+ ssp = ssp.Substring(0, lastPoundPos);
+ }
+
+ // Ensure any embedded URIs don't have malformed authority's by changing
+ // them from '://(' which would cause the .NET Uri class to attempt to validate
+ // the authority as a hostname with, ':(' which is valid.
+ ssp = ssp.Replace("://(", ":(");
+
+ // Handle the composite components
+ ParseComposite(uri, rc, ssp);
+ return rc;
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="uri"></param>
+ /// <param name="rc"></param>
+ /// <param name="ssp"></param>
+ private static void ParseComposite(Uri uri, CompositeData rc, String ssp)
+ {
+ String componentString;
+ String parms;
+
+ if(!CheckParenthesis(ssp))
+ {
+ throw new NMSException(uri.ToString() + ": Not a matching number of '(' and ')' parenthesis");
+ }
+
+ int p;
+ int intialParen = ssp.IndexOf("(");
+
+ if(intialParen >= 0)
+ {
+ rc.Host = ssp.Substring(0, intialParen);
+ p = rc.Host.IndexOf("/");
+ if(p >= 0)
+ {
+ rc.Path = rc.Host.Substring(p);
+ rc.Host = rc.Host.Substring(0, p);
+ }
+
+ p = ssp.LastIndexOf(")");
+ int start = intialParen + 1;
+ int len = p - start;
+ componentString = ssp.Substring(start, len);
+ parms = ssp.Substring(p + 1).Trim();
+ }
+ else
+ {
+ componentString = ssp;
+ parms = "";
+ }
+
+ String[] components = SplitComponents(componentString);
+ rc.Components = new Uri[components.Length];
+ for(int i = 0; i < components.Length; i++)
+ {
+ rc.Components[i] = new Uri(components[i].Trim());
+ }
+
+ p = parms.IndexOf("?");
+ if(p >= 0)
+ {
+ if(p > 0)
+ {
+ rc.Path = StripPrefix(parms.Substring(0, p), "/");
+ }
+
+ rc.Parameters = ParseQuery(parms.Substring(p + 1));
+ }
+ else
+ {
+ if(parms.Length > 0)
+ {
+ rc.Path = StripPrefix(parms, "/");
+ }
+
+ rc.Parameters = EmptyMap;
+ }
+ }
+
+ private static StringDictionary EmptyMap
+ {
+ get { return new StringDictionary(); }
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="componentString"></param>
+ private static String[] SplitComponents(String componentString)
+ {
+ ArrayList l = new ArrayList();
+
+ int last = 0;
+ int depth = 0;
+ char[] chars = componentString.ToCharArray();
+ for(int i = 0; i < chars.Length; i++)
+ {
+ switch(chars[i])
+ {
+ case '(':
+ depth++;
+ break;
+
+ case ')':
+ depth--;
+ break;
+
+ case ',':
+ if(depth == 0)
+ {
+ String s = componentString.Substring(last, i - last);
+ l.Add(s);
+ last = i + 1;
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ String ending = componentString.Substring(last);
+ if(ending.Length != 0)
+ {
+ l.Add(ending);
+ }
+
+ String[] rc = new String[l.Count];
+ l.CopyTo(rc);
+ return rc;
+ }
+
+ public static bool CheckParenthesis(String str)
+ {
+ bool result = true;
+
+ if(str != null)
+ {
+ int open = 0;
+ int closed = 0;
+
+ int i = 0;
+ while((i = str.IndexOf('(', i)) >= 0)
+ {
+ i++;
+ open++;
+ }
+
+ i = 0;
+ while((i = str.IndexOf(')', i)) >= 0)
+ {
+ i++;
+ closed++;
+ }
+
+ result = (open == closed);
+ }
+
+ return result;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/10217b2f/src/test/csharp/URISupportTest.cs
----------------------------------------------------------------------
diff --git a/src/test/csharp/URISupportTest.cs b/src/test/csharp/URISupportTest.cs
index 825ed9d..f60355b 100644
--- a/src/test/csharp/URISupportTest.cs
+++ b/src/test/csharp/URISupportTest.cs
@@ -21,6 +21,9 @@ using System.Collections.Specialized;
using Apache.NMS.Util;
using NUnit.Framework;
+#if !NETCF
+using System.Web;
+#endif
namespace Apache.NMS.Test
{
@@ -266,6 +269,28 @@ namespace Apache.NMS.Test
Assert.IsFalse(dest.Query.Equals(source.Query), "same uri, ssp");
}
+
+#if !NETCF
+ [Test]
+ public void TestParseQueryEncoding() {
+
+ String paramName = "name";
+ String paramValue = "CN=Test, OU=bla, ..&%/�()%3q743847)/(&%/.. hjUIFHUFH";
+
+ String uriString = "http://someserver.com:1234/?";
+
+ //encoding the param with url encode
+ uriString += paramName + "=" + HttpUtility.UrlEncode(paramValue);
+
+ Uri uri = new Uri(uriString);
+
+ StringDictionary dictionary = URISupport.ParseQuery(uri.Query);
+
+ String value = dictionary[paramName];
+
+ NUnit.Framework.Assert.AreEqual(paramValue, value);
+ }
+#endif
}
}
[29/46] activemq-nms-api git commit: Update readme files to fix typos,
and to reference the latest tool versions.
Posted by ta...@apache.org.
Update readme files to fix typos, and to reference the latest tool versions.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/0fb74377
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/0fb74377
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/0fb74377
Branch: refs/heads/1.5.x
Commit: 0fb74377749f895c08e497ec89760304636e8cb3
Parents: 69bbc26
Author: Jim Gomes <jg...@apache.org>
Authored: Wed Jan 5 18:49:57 2011 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Wed Jan 5 18:49:57 2011 +0000
----------------------------------------------------------------------
package.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/0fb74377/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index f59c436..e5398e9 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.5.1-SNAPSHOT"
+$pkgver = "1.5-SNAPSHOT"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0", "netcf-3.5"
[42/46] activemq-nms-api git commit: Move the 1.7.x branch to 1.7.1
SNAPSHOT
Posted by ta...@apache.org.
Move the 1.7.x branch to 1.7.1 SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/d94e5789
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/d94e5789
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/d94e5789
Branch: refs/heads/1.7.x
Commit: d94e57891134d0f4bd9beb0aa62dabc840584806
Parents: c18bc29
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Dec 15 21:20:12 2014 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Dec 15 21:20:12 2014 +0000
----------------------------------------------------------------------
nant.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/d94e5789/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 88b2420..2ea4c94 100644
--- a/nant.build
+++ b/nant.build
@@ -23,7 +23,7 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.7.0" unless="${property::exists('project.version')}" />
+ <property name="project.version" value="1.7.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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
[15/46] activemq-nms-api git commit: Updated package scripts.
Posted by ta...@apache.org.
Updated package scripts.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/12bc71c7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/12bc71c7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/12bc71c7
Branch: refs/heads/1.2.x
Commit: 12bc71c7d1df560020387d3edb259f9a694903d7
Parents: 5bc3a67
Author: Jim Gomes <jg...@apache.org>
Authored: Sat Jan 16 00:32:33 2010 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Sat Jan 16 00:32:33 2010 +0000
----------------------------------------------------------------------
package.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/12bc71c7/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index ba981a0..4fbe44e 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.2.0"
+$pkgver = "1.2.x"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0"
[19/46] activemq-nms-api git commit: Tag next release maintenance
branch. 1.3.x
Posted by ta...@apache.org.
Tag next release maintenance branch. 1.3.x
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/26c0552e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/26c0552e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/26c0552e
Branch: refs/heads/1.3.x
Commit: 26c0552eb339abc8f879bebd66d57b9627a54bc1
Parents: 130bd34
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon May 10 13:13:55 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon May 10 13:13:55 2010 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/46] activemq-nms-api git commit: Update Version to for new RC-2
tagging.
Posted by ta...@apache.org.
Update Version to for new RC-2 tagging.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/f3f393f4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/f3f393f4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/f3f393f4
Branch: refs/heads/1.2.x
Commit: f3f393f49d2c3e83988f63f1606fa06ce038c9e8
Parents: 35c427b
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Dec 29 15:02:21 2009 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Dec 29 15:02:21 2009 +0000
----------------------------------------------------------------------
nant.build | 164 ++++++++++++++++++++++++++++----------------------------
1 file changed, 82 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/f3f393f4/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 87892a9..fb1f143 100644
--- a/nant.build
+++ b/nant.build
@@ -1,98 +1,98 @@
\ufeff<?xml version="1.0"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<project name="Apache.NMS" default="default" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
- <!-- ============================================================================================ -->
- <!-- I N I T I A L I Z A T I O N -->
- <!-- ============================================================================================ -->
- <property name="basedir" value="${project::get-base-directory()}" />
- <property name="project.name" value="Apache.NMS" />
- <property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.2.1" unless="${property::exists('project.version')}" />
- <property name="project.release.type" value="RC" unless="${property::exists('project.release.type')}" />
- <property name="project.short_description" value="Apache NMS Class Library" />
- <property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
- <property name="project.cls.compliant" value="true" />
- <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
- <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
+ <!-- ============================================================================================ -->
+ <!-- I N I T I A L I Z A T I O N -->
+ <!-- ============================================================================================ -->
+ <property name="basedir" value="${project::get-base-directory()}" />
+ <property name="project.name" value="Apache.NMS" />
+ <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.short_description" value="Apache NMS Class Library" />
+ <property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
+ <property name="project.cls.compliant" value="true" />
+ <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+ <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
- <target name="vendor-init" description="Initializes Vendor library from local repository.">
- <!--
- Vendor specific info. The prefix of 'vendor.apache.org' is taken from the property
- vendor.fileset.names'. This comma-delimited list is iterated, and properties with
- well-known suffixes are used to access and copy down vendor file dependencies.
- -->
- <property name="vendor.fileset.names" value="vendor.nunit.org" />
+ <target name="vendor-init" description="Initializes Vendor library from local repository.">
+ <!--
+ Vendor specific info. The prefix of 'vendor.apache.org' is taken from the property
+ vendor.fileset.names'. This comma-delimited list is iterated, and properties with
+ well-known suffixes are used to access and copy down vendor file dependencies.
+ -->
+ <property name="vendor.fileset.names" value="vendor.nunit.org" />
- <!-- Property grouping for 'vendor.nunit.org' -->
- <property name="vendor.nunit.org.name" value="NUnit" />
- <property name="vendor.nunit.org.group" value="org.nunit" />
- <property name="vendor.nunit.org.version" value="2.4.8" />
- <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
- </target>
+ <!-- Property grouping for 'vendor.nunit.org' -->
+ <property name="vendor.nunit.org.name" value="NUnit" />
+ <property name="vendor.nunit.org.group" value="org.nunit" />
+ <property name="vendor.nunit.org.version" value="2.4.8" />
+ <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+ </target>
- <target name="dependency-init" description="Initializes build dependencies">
- <if test="${current.build.framework == 'net-3.5' or current.build.framework == 'mono-2.0'}">
- <assemblyfileset failonempty="true" id="dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <include name="${current.build.framework.assembly.dir}/System.dll" />
- <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" />
- </assemblyfileset>
- </if>
- <if test="${current.build.framework != 'net-3.5'}">
- <assemblyfileset failonempty="true" id="dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <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" />
- </assemblyfileset>
- </if>
+ <target name="dependency-init" description="Initializes build dependencies">
+ <if test="${current.build.framework == 'net-3.5' or current.build.framework == 'mono-2.0'}">
+ <assemblyfileset failonempty="true" id="dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.dll" />
+ <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" />
+ </assemblyfileset>
+ </if>
+ <if test="${current.build.framework != 'net-3.5'}">
+ <assemblyfileset failonempty="true" id="dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <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" />
+ </assemblyfileset>
+ </if>
- <assemblyfileset failonempty="true" id="test.dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <include name="${current.build.framework.assembly.dir}/System.dll" />
- <include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
- <include name="${build.bin.dir}/${project.name}.dll" />
- <include name="${nunit.dll}" />
- <include name="${nunit.extensions.dll}" />
- </assemblyfileset>
+ <assemblyfileset failonempty="true" id="test.dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+ <include name="${build.bin.dir}/${project.name}.dll" />
+ <include name="${nunit.dll}" />
+ <include name="${nunit.extensions.dll}" />
+ </assemblyfileset>
- <fileset id="content.filenames">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- </fileset>
+ <fileset id="content.filenames">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
- <fileset id="install.filenames">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- <include name="${build.bin.dir}/${project.name}.dll" />
- <include name="${build.bin.dir}/${project.name}.pdb" />
- <include name="${build.bin.dir}/${project.name}.dll.mdb" />
- <include name="${build.bin.dir}/${project.name}.Test.dll" />
- <include name="${build.bin.dir}/${project.name}.Test.pdb" />
- <include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
- </fileset>
- </target>
+ <fileset id="install.filenames">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ <include name="${build.bin.dir}/${project.name}.dll" />
+ <include name="${build.bin.dir}/${project.name}.pdb" />
+ <include name="${build.bin.dir}/${project.name}.dll.mdb" />
+ <include name="${build.bin.dir}/${project.name}.Test.dll" />
+ <include name="${build.bin.dir}/${project.name}.Test.pdb" />
+ <include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
+ </fileset>
+ </target>
- <target name="default" depends="install-all" />
+ <target name="default" depends="install-all" />
- <!-- Load the common target definitions -->
- <include buildfile="${basedir}/nant-common.xml" />
+ <!-- Load the common target definitions -->
+ <include buildfile="${basedir}/nant-common.xml" />
</project>
[23/46] activemq-nms-api git commit: Set the release status to GA so
a release build can be made.
Posted by ta...@apache.org.
Set the release status to GA so a release build can be made.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/1cc10669
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/1cc10669
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/1cc10669
Branch: refs/heads/1.4.x
Commit: 1cc10669d737cb5857a2074acc44f5c3980fc73f
Parents: 21e5523
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Sep 7 12:49:02 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Sep 7 12:49:02 2010 +0000
----------------------------------------------------------------------
nant.build | 2 +-
package.ps1 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/1cc10669/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index ed05ceb..3396f06 100644
--- a/nant.build
+++ b/nant.build
@@ -24,7 +24,7 @@
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
<property name="project.version" value="1.4.0" unless="${property::exists('project.version')}" />
- <property name="project.release.type" value="SNAPSHOT" unless="${property::exists('project.release.type')}" />
+ <property name="project.release.type" value="GA" unless="${property::exists('project.release.type')}" />
<property name="project.short_description" value="Apache NMS Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
<property name="project.cls.compliant" value="true" />
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/1cc10669/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index 65e16d5..c397e00 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.4-SNAPSHOT"
+$pkgver = "1.4.0"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0", "netcf-3.5"
[20/46] activemq-nms-api git commit: Mark branch as 1.3.0 RC
Posted by ta...@apache.org.
Mark branch as 1.3.0 RC
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/027ae9a5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/027ae9a5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/027ae9a5
Branch: refs/heads/1.3.x
Commit: 027ae9a523e93b78a2bc2f238052d91cdca3be4a
Parents: 26c0552
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon May 10 13:26:30 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon May 10 13:26:30 2010 +0000
----------------------------------------------------------------------
nant.build | 140 +++++++++++++++++++++++++++----------------------------
package.ps1 | 58 +++++++++++------------
2 files changed, 99 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/027ae9a5/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index d8e4b64..6d09831 100644
--- a/nant.build
+++ b/nant.build
@@ -17,82 +17,82 @@
-->
<project name="Apache.NMS" default="default" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
- <!-- ============================================================================================ -->
- <!-- I N I T I A L I Z A T I O N -->
- <!-- ============================================================================================ -->
- <property name="basedir" value="${project::get-base-directory()}" />
- <property name="project.name" value="Apache.NMS" />
- <property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.3.0" 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 Class Library" />
- <property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
- <property name="project.cls.compliant" value="true" />
- <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
- <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
+ <!-- ============================================================================================ -->
+ <!-- I N I T I A L I Z A T I O N -->
+ <!-- ============================================================================================ -->
+ <property name="basedir" value="${project::get-base-directory()}" />
+ <property name="project.name" value="Apache.NMS" />
+ <property name="project.group" value="org.apache.activemq" />
+ <property name="project.version" value="1.3.0" unless="${property::exists('project.version')}" />
+ <property name="project.release.type" value="RC" unless="${property::exists('project.release.type')}" />
+ <property name="project.short_description" value="Apache NMS Class Library" />
+ <property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
+ <property name="project.cls.compliant" value="true" />
+ <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+ <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
- <target name="vendor-init" description="Initializes Vendor library from local repository.">
- <!--
- Vendor specific info. The prefix of 'vendor.apache.org' is taken from the property
- vendor.fileset.names'. This comma-delimited list is iterated, and properties with
- well-known suffixes are used to access and copy down vendor file dependencies.
- -->
- <property name="vendor.fileset.names" value="vendor.nunit.org" />
+ <target name="vendor-init" description="Initializes Vendor library from local repository.">
+ <!--
+ Vendor specific info. The prefix of 'vendor.apache.org' is taken from the property
+ vendor.fileset.names'. This comma-delimited list is iterated, and properties with
+ well-known suffixes are used to access and copy down vendor file dependencies.
+ -->
+ <property name="vendor.fileset.names" value="vendor.nunit.org" />
- <!-- Property grouping for 'vendor.nunit.org' -->
- <property name="vendor.nunit.org.name" value="NUnit" />
- <property name="vendor.nunit.org.group" value="org.nunit" />
- <property name="vendor.nunit.org.version" value="2.4.8" />
- <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
- </target>
+ <!-- Property grouping for 'vendor.nunit.org' -->
+ <property name="vendor.nunit.org.name" value="NUnit" />
+ <property name="vendor.nunit.org.group" value="org.nunit" />
+ <property name="vendor.nunit.org.version" value="2.4.8" />
+ <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+ </target>
- <target name="dependency-init" description="Initializes build dependencies">
- <if test="${current.build.framework == 'net-3.5' or current.build.framework == 'mono-2.0'}">
- <assemblyfileset failonempty="true" id="dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <include name="${current.build.framework.assembly.dir}/System.dll" />
- <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" />
- </assemblyfileset>
- </if>
- <if test="${current.build.framework != 'net-3.5'}">
- <assemblyfileset failonempty="true" id="dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <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" />
- </assemblyfileset>
- </if>
+ <target name="dependency-init" description="Initializes build dependencies">
+ <if test="${current.build.framework == 'net-3.5' or current.build.framework == 'mono-2.0'}">
+ <assemblyfileset failonempty="true" id="dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.dll" />
+ <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" />
+ </assemblyfileset>
+ </if>
+ <if test="${current.build.framework != 'net-3.5'}">
+ <assemblyfileset failonempty="true" id="dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <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" />
+ </assemblyfileset>
+ </if>
- <assemblyfileset failonempty="true" id="test.dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <include name="${current.build.framework.assembly.dir}/System.dll" />
- <include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
- <include name="${build.bin.dir}/${project.name}.dll" />
- <include name="${nunit.dll}" />
- <include name="${nunit.extensions.dll}" />
- </assemblyfileset>
+ <assemblyfileset failonempty="true" id="test.dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+ <include name="${build.bin.dir}/${project.name}.dll" />
+ <include name="${nunit.dll}" />
+ <include name="${nunit.extensions.dll}" />
+ </assemblyfileset>
- <fileset id="content.filenames">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- </fileset>
+ <fileset id="content.filenames">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
- <fileset id="install.filenames">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- <include name="${build.bin.dir}/${project.name}.dll" />
- <include name="${build.bin.dir}/${project.name}.pdb" />
- <include name="${build.bin.dir}/${project.name}.dll.mdb" />
- <include name="${build.bin.dir}/${project.name}.Test.dll" />
- <include name="${build.bin.dir}/${project.name}.Test.pdb" />
- <include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
- </fileset>
- </target>
+ <fileset id="install.filenames">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ <include name="${build.bin.dir}/${project.name}.dll" />
+ <include name="${build.bin.dir}/${project.name}.pdb" />
+ <include name="${build.bin.dir}/${project.name}.dll.mdb" />
+ <include name="${build.bin.dir}/${project.name}.Test.dll" />
+ <include name="${build.bin.dir}/${project.name}.Test.pdb" />
+ <include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
+ </fileset>
+ </target>
- <target name="default" depends="install-all" />
+ <target name="default" depends="install-all" />
- <!-- Load the common target definitions -->
- <include buildfile="${basedir}/nant-common.xml" />
+ <!-- Load the common target definitions -->
+ <include buildfile="${basedir}/nant-common.xml" />
</project>
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/027ae9a5/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index b412796..2532ad5 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,48 +14,48 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.3-SNAPSHOT"
+$pkgver = "1.3-RC1"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0", "netcf-3.5"
write-progress "Creating package directory." "Initializing..."
if(!(test-path package))
{
- md package
+ md package
}
if(test-path build)
{
- pushd build
+ pushd build
- $pkgdir = "..\package"
+ $pkgdir = "..\package"
- write-progress "Packaging Application files." "Scanning..."
- $zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
- zip -9 -u -j "$zipfile" ..\LICENSE.txt
- zip -9 -u -j "$zipfile" ..\NOTICE.txt
- foreach($configuration in $configurations)
- {
- foreach($framework in $frameworks)
- {
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
- if($framework -ieq "mono-2.0")
- {
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
- }
- else
- {
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
- }
- }
- }
+ write-progress "Packaging Application files." "Scanning..."
+ $zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
+ zip -9 -u -j "$zipfile" ..\LICENSE.txt
+ zip -9 -u -j "$zipfile" ..\NOTICE.txt
+ foreach($configuration in $configurations)
+ {
+ foreach($framework in $frameworks)
+ {
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
+ if($framework -ieq "mono-2.0")
+ {
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
+ }
+ else
+ {
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
+ }
+ }
+ }
- popd
+ popd
}
write-progress "Packaging Source code files." "Scanning..."
[16/46] activemq-nms-api git commit: Merge fix for Byte Order Mark
bug. Fixes [AMQNET-230]. (See
https://issues.apache.org/activemq/browse/AMQNET-230)
Posted by ta...@apache.org.
Merge fix for Byte Order Mark bug.
Fixes [AMQNET-230]. (See https://issues.apache.org/activemq/browse/AMQNET-230)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/43872751
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/43872751
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/43872751
Branch: refs/heads/1.2.x
Commit: 438727516b86710db5c3e4788cba34f1f5d324b6
Parents: 12bc71c
Author: Jim Gomes <jg...@apache.org>
Authored: Tue Feb 9 22:43:52 2010 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Tue Feb 9 22:43:52 2010 +0000
----------------------------------------------------------------------
src/main/csharp/MessageExtensions.cs | 18 +-----
src/main/csharp/MessageProducerExtensions.cs | 44 +--------------
src/main/csharp/SessionExtensions.cs | 10 +---
src/main/csharp/Util/Convert.cs | 38 +++----------
src/main/csharp/Util/XmlUtils.cs | 69 ++++++++++++-----------
5 files changed, 48 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/43872751/src/main/csharp/MessageExtensions.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/MessageExtensions.cs b/src/main/csharp/MessageExtensions.cs
index bd1aab3..c62ac57 100644
--- a/src/main/csharp/MessageExtensions.cs
+++ b/src/main/csharp/MessageExtensions.cs
@@ -35,29 +35,13 @@ namespace Apache.NMS
/// <summary>
/// Deserializes the object from Xml, and returns it.
/// </summary>
- public static object ToObject(this IMessage message, Encoding encoding)
- {
- return ToObject<object>(message, encoding);
- }
-
- /// <summary>
- /// Deserializes the object from Xml, and returns it.
- /// </summary>
public static T ToObject<T>(this IMessage message) where T : class
{
- return ToObject<T>(message, Encoding.Unicode);
- }
-
- /// <summary>
- /// Deserializes the object from Xml, and returns it.
- /// </summary>
- public static T ToObject<T>(this IMessage message, Encoding encoding) where T : class
- {
try
{
if(null != message)
{
- return (T) NMSConvert.DeserializeObjFromMessage(message, encoding);
+ return (T) NMSConvert.DeserializeObjFromMessage(message);
}
}
catch(Exception ex)
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/43872751/src/main/csharp/MessageProducerExtensions.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/MessageProducerExtensions.cs b/src/main/csharp/MessageProducerExtensions.cs
index 3493cc0..c1b5c9d 100644
--- a/src/main/csharp/MessageProducerExtensions.cs
+++ b/src/main/csharp/MessageProducerExtensions.cs
@@ -1,4 +1,4 @@
-\ufeff/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -29,15 +29,7 @@ namespace Apache.NMS
/// </summary>
public static ITextMessage CreateXmlMessage(this IMessageProducer producer, object obj)
{
- return CreateXmlMessage(producer, obj, Encoding.Unicode);
- }
-
- /// <summary>
- /// Extension function to create a text message from an object. The object must be serializable to XML.
- /// </summary>
- public static ITextMessage CreateXmlMessage(this IMessageProducer producer, object obj, Encoding encoding)
- {
- return NMSConvert.SerializeObjToMessage(producer.CreateTextMessage(), obj, encoding);
+ return NMSConvert.SerializeObjToMessage(producer.CreateTextMessage(), obj);
}
/// <summary>
@@ -49,14 +41,6 @@ namespace Apache.NMS
}
/// <summary>
- /// Sends the message to the default destination for this producer. The object must be serializable to XML.
- /// </summary>
- public static void Send(this IMessageProducer producer, object objMessage, Encoding encoding)
- {
- producer.Send(producer.CreateXmlMessage(objMessage, encoding));
- }
-
- /// <summary>
/// Sends the message to the default destination with the explicit QoS configuration. The object must be serializable to XML.
/// </summary>
public static void Send(this IMessageProducer producer, object objMessage, MsgDeliveryMode deliveryMode, MsgPriority priority, TimeSpan timeToLive)
@@ -65,14 +49,6 @@ namespace Apache.NMS
}
/// <summary>
- /// Sends the message to the default destination with the explicit QoS configuration. The object must be serializable to XML.
- /// </summary>
- public static void Send(this IMessageProducer producer, object objMessage, Encoding encoding, MsgDeliveryMode deliveryMode, MsgPriority priority, TimeSpan timeToLive)
- {
- producer.Send(producer.CreateXmlMessage(objMessage, encoding), deliveryMode, priority, timeToLive);
- }
-
- /// <summary>
/// Sends the message to the given destination
/// </summary>
public static void Send(this IMessageProducer producer, IDestination destination, object objMessage)
@@ -81,28 +57,12 @@ namespace Apache.NMS
}
/// <summary>
- /// Sends the message to the given destination
- /// </summary>
- public static void Send(this IMessageProducer producer, IDestination destination, object objMessage, Encoding encoding)
- {
- producer.Send(destination, producer.CreateXmlMessage(objMessage, encoding));
- }
-
- /// <summary>
/// Sends the message to the given destination with the explicit QoS configuration. The object must be serializable to XML.
/// </summary>
public static void Send(this IMessageProducer producer, IDestination destination, object objMessage, MsgDeliveryMode deliveryMode, MsgPriority priority, TimeSpan timeToLive)
{
producer.Send(destination, producer.CreateXmlMessage(objMessage), deliveryMode, priority, timeToLive);
}
-
- /// <summary>
- /// Sends the message to the given destination with the explicit QoS configuration. The object must be serializable to XML.
- /// </summary>
- public static void Send(this IMessageProducer producer, IDestination destination, object objMessage, Encoding encoding, MsgDeliveryMode deliveryMode, MsgPriority priority, TimeSpan timeToLive)
- {
- producer.Send(destination, producer.CreateXmlMessage(objMessage, encoding), deliveryMode, priority, timeToLive);
- }
}
#endif
}
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/43872751/src/main/csharp/SessionExtensions.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/SessionExtensions.cs b/src/main/csharp/SessionExtensions.cs
index 342d2ee..850aa9d 100644
--- a/src/main/csharp/SessionExtensions.cs
+++ b/src/main/csharp/SessionExtensions.cs
@@ -28,15 +28,7 @@ namespace Apache.NMS
/// </summary>
public static ITextMessage CreateXmlMessage(this ISession session, object obj)
{
- return CreateXmlMessage(session, obj, Encoding.Unicode);
- }
-
- /// <summary>
- /// Extension function to create a text message from an object. The object must be serializable to XML.
- /// </summary>
- public static ITextMessage CreateXmlMessage(this ISession session, object obj, Encoding encoding)
- {
- return NMSConvert.SerializeObjToMessage(session.CreateTextMessage(), obj, encoding);
+ return NMSConvert.SerializeObjToMessage(session.CreateTextMessage(), obj);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/43872751/src/main/csharp/Util/Convert.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/Util/Convert.cs b/src/main/csharp/Util/Convert.cs
index 5431e7c..51183a6 100644
--- a/src/main/csharp/Util/Convert.cs
+++ b/src/main/csharp/Util/Convert.cs
@@ -64,18 +64,7 @@ namespace Apache.NMS.Util
#endif
public static ITextMessage ToXmlMessage(IMessageProducer producer, object obj)
{
- return ToXmlMessage(producer, obj, Encoding.Unicode);
- }
-
- /// <summary>
- /// Convert an object into a text message. The object must be serializable to XML.
- /// </summary>
-#if NET_3_5 || MONO
- [Obsolete]
-#endif
- public static ITextMessage ToXmlMessage(IMessageProducer producer, object obj, Encoding encoding)
- {
- return SerializeObjToMessage(producer.CreateTextMessage(), obj, encoding);
+ return SerializeObjToMessage(producer.CreateTextMessage(), obj);
}
/// <summary>
@@ -86,18 +75,7 @@ namespace Apache.NMS.Util
#endif
public static ITextMessage ToXmlMessage(ISession session, object obj)
{
- return ToXmlMessage(session, obj, Encoding.Unicode);
- }
-
- /// <summary>
- /// Convert an object into a text message. The object must be serializable to XML.
- /// </summary>
-#if NET_3_5 || MONO
- [Obsolete]
-#endif
- public static ITextMessage ToXmlMessage(ISession session, object obj, Encoding encoding)
- {
- return SerializeObjToMessage(session.CreateTextMessage(), obj, encoding);
+ return SerializeObjToMessage(session.CreateTextMessage(), obj);
}
/// <summary>
@@ -108,7 +86,7 @@ namespace Apache.NMS.Util
#endif
public static object FromXmlMessage(IMessage message)
{
- return DeserializeObjFromMessage(message, Encoding.Unicode);
+ return DeserializeObjFromMessage(message);
}
/// <summary>
@@ -117,13 +95,12 @@ namespace Apache.NMS.Util
/// </summary>
/// <param name="message"></param>
/// <param name="obj"></param>
- /// <param name="encoding"></param>
/// <returns></returns>
- internal static ITextMessage SerializeObjToMessage(ITextMessage message, object obj, Encoding encoding)
+ internal static ITextMessage SerializeObjToMessage(ITextMessage message, object obj)
{
// Embed the type into the message
message.NMSType = obj.GetType().FullName;
- message.Text = XmlUtil.Serialize(obj, encoding);
+ message.Text = XmlUtil.Serialize(obj);
return message;
}
@@ -131,9 +108,8 @@ namespace Apache.NMS.Util
/// Deserialize the object from the text message. The object must be serializable from XML.
/// </summary>
/// <param name="message"></param>
- /// <param name="encoding"></param>
/// <returns></returns>
- internal static object DeserializeObjFromMessage(IMessage message, Encoding encoding)
+ internal static object DeserializeObjFromMessage(IMessage message)
{
ITextMessage textMessage = message as ITextMessage;
@@ -155,7 +131,7 @@ namespace Apache.NMS.Util
return null;
}
- return XmlUtil.Deserialize(objType, textMessage.Text, encoding);
+ return XmlUtil.Deserialize(objType, textMessage.Text);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/43872751/src/main/csharp/Util/XmlUtils.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/Util/XmlUtils.cs b/src/main/csharp/Util/XmlUtils.cs
index 5b837ce..e250ac6 100644
--- a/src/main/csharp/Util/XmlUtils.cs
+++ b/src/main/csharp/Util/XmlUtils.cs
@@ -20,6 +20,7 @@ using System.IO;
using System.Text;
using System.Xml;
using System.Xml.Serialization;
+using System.Text.RegularExpressions;
namespace Apache.NMS.Util
{
@@ -30,28 +31,18 @@ namespace Apache.NMS.Util
{
public static string Serialize(object obj)
{
- return Serialize(obj, Encoding.Unicode);
- }
-
- public static string Serialize(object obj, Encoding encoding)
- {
try
{
- MemoryStream memoryStream = new MemoryStream();
+ StringBuilder outputStringBuilder = new StringBuilder();
XmlSerializer serializer = new XmlSerializer(obj.GetType());
- XmlTextWriter xmlTextWriter = new XmlTextWriter(memoryStream, encoding);
+ XmlWriter xmlWriter = XmlWriter.Create(outputStringBuilder);
- /*
- * If the XML document has been altered with unknown
- * nodes or attributes, handle them with the
- * UnknownNode and UnknownAttribute events.
- */
- serializer.UnknownNode += new XmlNodeEventHandler(serializer_UnknownNode);
- serializer.UnknownAttribute += new XmlAttributeEventHandler(serializer_UnknownAttribute);
- serializer.Serialize(xmlTextWriter, obj);
- memoryStream = (MemoryStream) xmlTextWriter.BaseStream;
- byte[] encodedBytes = memoryStream.ToArray();
- return encoding.GetString(encodedBytes, 0, encodedBytes.Length);
+ // Set the error handlers.
+ serializer.UnknownNode += serializer_UnknownNode;
+ serializer.UnknownElement += serializer_UnknownElement;
+ serializer.UnknownAttribute += serializer_UnknownAttribute;
+ serializer.Serialize(xmlWriter, obj);
+ return outputStringBuilder.ToString();
}
catch(Exception ex)
{
@@ -62,11 +53,6 @@ namespace Apache.NMS.Util
public static object Deserialize(Type objType, string text)
{
- return Deserialize(objType, text, Encoding.Unicode);
- }
-
- public static object Deserialize(Type objType, string text, Encoding encoding)
- {
if(null == text)
{
return null;
@@ -75,16 +61,12 @@ namespace Apache.NMS.Util
try
{
XmlSerializer serializer = new XmlSerializer(objType);
- MemoryStream memoryStream = new MemoryStream(encoding.GetBytes(text));
- /*
- * If the XML document has been altered with unknown
- * nodes or attributes, handle them with the
- * UnknownNode and UnknownAttribute events.
- */
- serializer.UnknownNode += new XmlNodeEventHandler(serializer_UnknownNode);
- serializer.UnknownAttribute += new XmlAttributeEventHandler(serializer_UnknownAttribute);
- return serializer.Deserialize(memoryStream);
+ // Set the error handlers.
+ serializer.UnknownNode += serializer_UnknownNode;
+ serializer.UnknownElement += serializer_UnknownElement;
+ serializer.UnknownAttribute += serializer_UnknownAttribute;
+ return serializer.Deserialize(new StringReader(text));
}
catch(Exception ex)
{
@@ -93,11 +75,34 @@ namespace Apache.NMS.Util
}
}
+ /// <summary>
+ /// From xml spec valid chars:
+ /// #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+ /// any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
+ /// </summary>
+ private static string invalidXMLMatch = @"[^\x09\x0A\x0D\x20-\xD7FF\xE000-\xFFFD\x10000-x10FFFF]";
+ private static Regex regexInvalidXMLChars = new Regex(invalidXMLMatch);
+
+ /// <summary>
+ /// This removes characters that are invalid for xml encoding
+ /// </summary>
+ /// <param name="text">Text to be encoded.</param>
+ /// <returns>Text with invalid xml characters removed.</returns>
+ public static string CleanInvalidXmlChars(string text)
+ {
+ return regexInvalidXMLChars.Replace(text, "");
+ }
+
private static void serializer_UnknownNode(object sender, XmlNodeEventArgs e)
{
Tracer.ErrorFormat("Unknown Node: {0}\t{1}", e.Name, e.Text);
}
+ private static void serializer_UnknownElement(object sender, XmlElementEventArgs e)
+ {
+ Tracer.ErrorFormat("Unknown Element: {0}\t{1}", e.Element.Name, e.Element.Value);
+ }
+
private static void serializer_UnknownAttribute(object sender, XmlAttributeEventArgs e)
{
Tracer.ErrorFormat("Unknown attribute: {0}='{1}'", e.Attr.Name, e.Attr.Value);
[03/46] activemq-nms-api git commit: Fixed version numbering.
Posted by ta...@apache.org.
Fixed version numbering.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/c335762c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/c335762c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/c335762c
Branch: refs/heads/1.2.x
Commit: c335762c9e2dd16f184e8e3ee6c88a564971d2d5
Parents: eafa962
Author: Jim Gomes <jg...@apache.org>
Authored: Thu Dec 3 01:10:55 2009 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Thu Dec 3 01:10:55 2009 +0000
----------------------------------------------------------------------
nant.build | 164 ++++++++++++++++++++++++++++----------------------------
1 file changed, 82 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/c335762c/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index fb1f143..87892a9 100644
--- a/nant.build
+++ b/nant.build
@@ -1,98 +1,98 @@
\ufeff<?xml version="1.0"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<project name="Apache.NMS" default="default" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
- <!-- ============================================================================================ -->
- <!-- I N I T I A L I Z A T I O N -->
- <!-- ============================================================================================ -->
- <property name="basedir" value="${project::get-base-directory()}" />
- <property name="project.name" value="Apache.NMS" />
- <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.short_description" value="Apache NMS Class Library" />
- <property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
- <property name="project.cls.compliant" value="true" />
- <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
- <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
+ <!-- ============================================================================================ -->
+ <!-- I N I T I A L I Z A T I O N -->
+ <!-- ============================================================================================ -->
+ <property name="basedir" value="${project::get-base-directory()}" />
+ <property name="project.name" value="Apache.NMS" />
+ <property name="project.group" value="org.apache.activemq" />
+ <property name="project.version" value="1.2.1" unless="${property::exists('project.version')}" />
+ <property name="project.release.type" value="RC" unless="${property::exists('project.release.type')}" />
+ <property name="project.short_description" value="Apache NMS Class Library" />
+ <property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
+ <property name="project.cls.compliant" value="true" />
+ <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+ <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
- <target name="vendor-init" description="Initializes Vendor library from local repository.">
- <!--
- Vendor specific info. The prefix of 'vendor.apache.org' is taken from the property
- vendor.fileset.names'. This comma-delimited list is iterated, and properties with
- well-known suffixes are used to access and copy down vendor file dependencies.
- -->
- <property name="vendor.fileset.names" value="vendor.nunit.org" />
+ <target name="vendor-init" description="Initializes Vendor library from local repository.">
+ <!--
+ Vendor specific info. The prefix of 'vendor.apache.org' is taken from the property
+ vendor.fileset.names'. This comma-delimited list is iterated, and properties with
+ well-known suffixes are used to access and copy down vendor file dependencies.
+ -->
+ <property name="vendor.fileset.names" value="vendor.nunit.org" />
- <!-- Property grouping for 'vendor.nunit.org' -->
- <property name="vendor.nunit.org.name" value="NUnit" />
- <property name="vendor.nunit.org.group" value="org.nunit" />
- <property name="vendor.nunit.org.version" value="2.4.8" />
- <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
- </target>
+ <!-- Property grouping for 'vendor.nunit.org' -->
+ <property name="vendor.nunit.org.name" value="NUnit" />
+ <property name="vendor.nunit.org.group" value="org.nunit" />
+ <property name="vendor.nunit.org.version" value="2.4.8" />
+ <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+ </target>
- <target name="dependency-init" description="Initializes build dependencies">
- <if test="${current.build.framework == 'net-3.5' or current.build.framework == 'mono-2.0'}">
- <assemblyfileset failonempty="true" id="dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <include name="${current.build.framework.assembly.dir}/System.dll" />
- <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" />
- </assemblyfileset>
- </if>
- <if test="${current.build.framework != 'net-3.5'}">
- <assemblyfileset failonempty="true" id="dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <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" />
- </assemblyfileset>
- </if>
+ <target name="dependency-init" description="Initializes build dependencies">
+ <if test="${current.build.framework == 'net-3.5' or current.build.framework == 'mono-2.0'}">
+ <assemblyfileset failonempty="true" id="dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.dll" />
+ <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" />
+ </assemblyfileset>
+ </if>
+ <if test="${current.build.framework != 'net-3.5'}">
+ <assemblyfileset failonempty="true" id="dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <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" />
+ </assemblyfileset>
+ </if>
- <assemblyfileset failonempty="true" id="test.dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <include name="${current.build.framework.assembly.dir}/System.dll" />
- <include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
- <include name="${build.bin.dir}/${project.name}.dll" />
- <include name="${nunit.dll}" />
- <include name="${nunit.extensions.dll}" />
- </assemblyfileset>
+ <assemblyfileset failonempty="true" id="test.dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+ <include name="${build.bin.dir}/${project.name}.dll" />
+ <include name="${nunit.dll}" />
+ <include name="${nunit.extensions.dll}" />
+ </assemblyfileset>
- <fileset id="content.filenames">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- </fileset>
+ <fileset id="content.filenames">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
- <fileset id="install.filenames">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- <include name="${build.bin.dir}/${project.name}.dll" />
- <include name="${build.bin.dir}/${project.name}.pdb" />
- <include name="${build.bin.dir}/${project.name}.dll.mdb" />
- <include name="${build.bin.dir}/${project.name}.Test.dll" />
- <include name="${build.bin.dir}/${project.name}.Test.pdb" />
- <include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
- </fileset>
- </target>
+ <fileset id="install.filenames">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ <include name="${build.bin.dir}/${project.name}.dll" />
+ <include name="${build.bin.dir}/${project.name}.pdb" />
+ <include name="${build.bin.dir}/${project.name}.dll.mdb" />
+ <include name="${build.bin.dir}/${project.name}.Test.dll" />
+ <include name="${build.bin.dir}/${project.name}.Test.pdb" />
+ <include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
+ </fileset>
+ </target>
- <target name="default" depends="install-all" />
+ <target name="default" depends="install-all" />
- <!-- Load the common target definitions -->
- <include buildfile="${basedir}/nant-common.xml" />
+ <!-- Load the common target definitions -->
+ <include buildfile="${basedir}/nant-common.xml" />
</project>
[26/46] activemq-nms-api git commit: Create EMS 1.4.x branch. Create
EMS 1.4.0 tag. Create MSMQ 1.4.x branch. Create MSMQ 1.4.0 tag. Create WCF
1.4.x branch. Create WCF 1.4.0 tag. Standardize all trunk, branch,
and tag build file version names for the 1.
Posted by ta...@apache.org.
Create EMS 1.4.x branch.
Create EMS 1.4.0 tag.
Create MSMQ 1.4.x branch.
Create MSMQ 1.4.0 tag.
Create WCF 1.4.x branch.
Create WCF 1.4.0 tag.
Standardize all trunk, branch, and tag build file version names for the 1.4 series and 1.5 trunk series.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/1f4fc20f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/1f4fc20f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/1f4fc20f
Branch: refs/heads/1.4.x
Commit: 1f4fc20ff412d5b9a9fdadb5ccedc881bbf4cbc0
Parents: a34211b
Author: Jim Gomes <jg...@apache.org>
Authored: Tue Sep 21 21:02:11 2010 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Tue Sep 21 21:02:11 2010 +0000
----------------------------------------------------------------------
package.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/1f4fc20f/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index c397e00..65e16d5 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.4.0"
+$pkgver = "1.4-SNAPSHOT"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0", "netcf-3.5"
[25/46] activemq-nms-api git commit: bump to v1.4.1-SNAPSHOT
Posted by ta...@apache.org.
bump to v1.4.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/a34211b4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/a34211b4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/a34211b4
Branch: refs/heads/1.4.x
Commit: a34211b40141509efecccbda3da72d3b5ba08d5b
Parents: d359604
Author: Timothy A. Bish <ta...@apache.org>
Authored: Fri Sep 10 13:18:40 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Fri Sep 10 13:18:40 2010 +0000
----------------------------------------------------------------------
nant.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/a34211b4/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 3396f06..864abcb 100644
--- a/nant.build
+++ b/nant.build
@@ -23,8 +23,8 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.4.0" unless="${property::exists('project.version')}" />
- <property name="project.release.type" value="GA" unless="${property::exists('project.release.type')}" />
+ <property name="project.version" value="1.4.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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
<property name="project.cls.compliant" value="true" />
[02/46] activemq-nms-api git commit: Change the release type to RC to
reflect the Release Candidate status.
Posted by ta...@apache.org.
Change the release type to RC to reflect the Release Candidate status.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/eafa962f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/eafa962f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/eafa962f
Branch: refs/heads/1.2.x
Commit: eafa962fb7b998d938082d3e9e0bce178a34ecd6
Parents: 9d9ef76
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Nov 24 13:08:04 2009 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Nov 24 13:08:04 2009 +0000
----------------------------------------------------------------------
nant.build | 140 ++++++++++++++++++++++++++++----------------------------
1 file changed, 70 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/eafa962f/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index ee8e2ac..fb1f143 100644
--- a/nant.build
+++ b/nant.build
@@ -17,82 +17,82 @@
-->
<project name="Apache.NMS" default="default" xmlns="http://nant.sourceforge.net/release/0.85/nant.xsd">
- <!-- ============================================================================================ -->
- <!-- I N I T I A L I Z A T I O N -->
- <!-- ============================================================================================ -->
- <property name="basedir" value="${project::get-base-directory()}" />
- <property name="project.name" value="Apache.NMS" />
- <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="SNAPSHOT" unless="${property::exists('project.release.type')}" />
- <property name="project.short_description" value="Apache NMS Class Library" />
- <property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
- <property name="project.cls.compliant" value="true" />
- <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
- <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
+ <!-- ============================================================================================ -->
+ <!-- I N I T I A L I Z A T I O N -->
+ <!-- ============================================================================================ -->
+ <property name="basedir" value="${project::get-base-directory()}" />
+ <property name="project.name" value="Apache.NMS" />
+ <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.short_description" value="Apache NMS Class Library" />
+ <property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
+ <property name="project.cls.compliant" value="true" />
+ <property name="nunit.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.dll" dynamic="true" />
+ <property name="nunit.extensions.dll" value="${basedir}/lib/NUnit/${current.build.framework}/nunit.framework.extensions.dll" dynamic="true" />
- <target name="vendor-init" description="Initializes Vendor library from local repository.">
- <!--
- Vendor specific info. The prefix of 'vendor.apache.org' is taken from the property
- vendor.fileset.names'. This comma-delimited list is iterated, and properties with
- well-known suffixes are used to access and copy down vendor file dependencies.
- -->
- <property name="vendor.fileset.names" value="vendor.nunit.org" />
+ <target name="vendor-init" description="Initializes Vendor library from local repository.">
+ <!--
+ Vendor specific info. The prefix of 'vendor.apache.org' is taken from the property
+ vendor.fileset.names'. This comma-delimited list is iterated, and properties with
+ well-known suffixes are used to access and copy down vendor file dependencies.
+ -->
+ <property name="vendor.fileset.names" value="vendor.nunit.org" />
- <!-- Property grouping for 'vendor.nunit.org' -->
- <property name="vendor.nunit.org.name" value="NUnit" />
- <property name="vendor.nunit.org.group" value="org.nunit" />
- <property name="vendor.nunit.org.version" value="2.4.8" />
- <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
- </target>
+ <!-- Property grouping for 'vendor.nunit.org' -->
+ <property name="vendor.nunit.org.name" value="NUnit" />
+ <property name="vendor.nunit.org.group" value="org.nunit" />
+ <property name="vendor.nunit.org.version" value="2.4.8" />
+ <property name="vendor.nunit.org.filenames" value="nunit.framework.dll,nunit.framework.extensions.dll" />
+ </target>
- <target name="dependency-init" description="Initializes build dependencies">
- <if test="${current.build.framework == 'net-3.5' or current.build.framework == 'mono-2.0'}">
- <assemblyfileset failonempty="true" id="dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <include name="${current.build.framework.assembly.dir}/System.dll" />
- <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" />
- </assemblyfileset>
- </if>
- <if test="${current.build.framework != 'net-3.5'}">
- <assemblyfileset failonempty="true" id="dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <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" />
- </assemblyfileset>
- </if>
+ <target name="dependency-init" description="Initializes build dependencies">
+ <if test="${current.build.framework == 'net-3.5' or current.build.framework == 'mono-2.0'}">
+ <assemblyfileset failonempty="true" id="dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.dll" />
+ <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" />
+ </assemblyfileset>
+ </if>
+ <if test="${current.build.framework != 'net-3.5'}">
+ <assemblyfileset failonempty="true" id="dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <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" />
+ </assemblyfileset>
+ </if>
- <assemblyfileset failonempty="true" id="test.dependencies">
- <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
- <include name="${current.build.framework.assembly.dir}/System.dll" />
- <include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
- <include name="${build.bin.dir}/${project.name}.dll" />
- <include name="${nunit.dll}" />
- <include name="${nunit.extensions.dll}" />
- </assemblyfileset>
+ <assemblyfileset failonempty="true" id="test.dependencies">
+ <include name="${current.build.framework.assembly.dir}/mscorlib.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.dll" />
+ <include name="${current.build.framework.assembly.dir}/System.Xml.dll" />
+ <include name="${build.bin.dir}/${project.name}.dll" />
+ <include name="${nunit.dll}" />
+ <include name="${nunit.extensions.dll}" />
+ </assemblyfileset>
- <fileset id="content.filenames">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- </fileset>
+ <fileset id="content.filenames">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
- <fileset id="install.filenames">
- <include name="LICENSE.txt" />
- <include name="NOTICE.txt" />
- <include name="${build.bin.dir}/${project.name}.dll" />
- <include name="${build.bin.dir}/${project.name}.pdb" />
- <include name="${build.bin.dir}/${project.name}.dll.mdb" />
- <include name="${build.bin.dir}/${project.name}.Test.dll" />
- <include name="${build.bin.dir}/${project.name}.Test.pdb" />
- <include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
- </fileset>
- </target>
+ <fileset id="install.filenames">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ <include name="${build.bin.dir}/${project.name}.dll" />
+ <include name="${build.bin.dir}/${project.name}.pdb" />
+ <include name="${build.bin.dir}/${project.name}.dll.mdb" />
+ <include name="${build.bin.dir}/${project.name}.Test.dll" />
+ <include name="${build.bin.dir}/${project.name}.Test.pdb" />
+ <include name="${build.bin.dir}/${project.name}.Test.dll.mdb" />
+ </fileset>
+ </target>
- <target name="default" depends="install-all" />
+ <target name="default" depends="install-all" />
- <!-- Load the common target definitions -->
- <include buildfile="${basedir}/nant-common.xml" />
+ <!-- Load the common target definitions -->
+ <include buildfile="${basedir}/nant-common.xml" />
</project>
[17/46] activemq-nms-api git commit: Added inclusion of XML
documentation files in ZIP package.
Posted by ta...@apache.org.
Added inclusion of XML documentation files in ZIP package.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/1ec0293d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/1ec0293d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/1ec0293d
Branch: refs/heads/1.2.x
Commit: 1ec0293dbb80964758fae81a37513216c75a3338
Parents: 4387275
Author: Jim Gomes <jg...@apache.org>
Authored: Fri Feb 12 21:50:23 2010 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Fri Feb 12 21:50:23 2010 +0000
----------------------------------------------------------------------
package.ps1 | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/1ec0293d/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index 4fbe44e..e73a44d 100644
--- a/package.ps1
+++ b/package.ps1
@@ -39,7 +39,9 @@ if(test-path build)
foreach($framework in $frameworks)
{
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
if($framework -ieq "mono-2.0")
{
zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
[06/46] activemq-nms-api git commit: Update version number
Posted by ta...@apache.org.
Update version number
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/21266a1d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/21266a1d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/21266a1d
Branch: refs/heads/1.2.x
Commit: 21266a1d90604f1b86624b9f1c6db489bfd35ff7
Parents: f3f393f
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Dec 29 15:11:15 2009 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Dec 29 15:11:15 2009 +0000
----------------------------------------------------------------------
nant.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/21266a1d/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index fb1f143..90cf0a2 100644
--- a/nant.build
+++ b/nant.build
@@ -23,7 +23,7 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.2.0" unless="${property::exists('project.version')}" />
+ <property name="project.version" value="1.2.1" unless="${property::exists('project.version')}" />
<property name="project.release.type" value="RC" unless="${property::exists('project.release.type')}" />
<property name="project.short_description" value="Apache NMS Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
[14/46] activemq-nms-api git commit: Remove the .settings folder,
not supposed to be in there.
Posted by ta...@apache.org.
Remove the .settings folder, not supposed to be in there.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/5bc3a672
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/5bc3a672
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/5bc3a672
Branch: refs/heads/1.2.x
Commit: 5bc3a672634f394dad21ad4f7c3b344234996291
Parents: 44f8a7a
Author: Timothy A. Bish <ta...@apache.org>
Authored: Fri Jan 15 16:39:12 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Fri Jan 15 16:39:12 2010 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[33/46] activemq-nms-api git commit: Add exception handling around
directory name parsing. Fixes [AMQNET-337]. (See
https://issues.apache.org/jira/browse/AMQNET-337)
Posted by ta...@apache.org.
Add exception handling around directory name parsing.
Fixes [AMQNET-337]. (See https://issues.apache.org/jira/browse/AMQNET-337)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/3c2315d6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/3c2315d6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/3c2315d6
Branch: refs/heads/1.5.x
Commit: 3c2315d6aee82aab3e8db844dc9e1dad3aae344c
Parents: 27cf9a1
Author: Jim Gomes <jg...@apache.org>
Authored: Mon Oct 17 18:34:25 2011 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Mon Oct 17 18:34:25 2011 +0000
----------------------------------------------------------------------
src/main/csharp/NMSConnectionFactory.cs | 34 ++++++++++++++++++++--------
1 file changed, 25 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/3c2315d6/src/main/csharp/NMSConnectionFactory.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/NMSConnectionFactory.cs b/src/main/csharp/NMSConnectionFactory.cs
index 015786d..2c1d323 100644
--- a/src/main/csharp/NMSConnectionFactory.cs
+++ b/src/main/csharp/NMSConnectionFactory.cs
@@ -314,18 +314,34 @@ namespace Apache.NMS
// Check the current folder first.
pathList.Add("");
#if !NETCF
- AppDomain currentDomain = AppDomain.CurrentDomain;
-
- // Check the folder the assembly is located in.
- pathList.Add(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location));
- if(null != currentDomain.BaseDirectory)
+ try
{
- pathList.Add(currentDomain.BaseDirectory);
- }
+ AppDomain currentDomain = AppDomain.CurrentDomain;
- if(null != currentDomain.RelativeSearchPath)
+ // Check the folder the assembly is located in.
+ Assembly executingAssembly = Assembly.GetExecutingAssembly();
+ try
+ {
+ pathList.Add(Path.GetDirectoryName(executingAssembly.Location));
+ }
+ catch(Exception ex)
+ {
+ Tracer.DebugFormat("Error parsing executing assembly location: {0} : {1}", executingAssembly.Location, ex.Message);
+ }
+
+ if(null != currentDomain.BaseDirectory)
+ {
+ pathList.Add(currentDomain.BaseDirectory);
+ }
+
+ if(null != currentDomain.RelativeSearchPath)
+ {
+ pathList.Add(currentDomain.RelativeSearchPath);
+ }
+ }
+ catch(Exception ex)
{
- pathList.Add(currentDomain.RelativeSearchPath);
+ Tracer.DebugFormat("Error configuring search paths: {0}", ex.Message);
}
#endif
[22/46] activemq-nms-api git commit: Branch for next release of the
NMS API
Posted by ta...@apache.org.
Branch for next release of the NMS API
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/21e55239
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/21e55239
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/21e55239
Branch: refs/heads/1.4.x
Commit: 21e55239e71b87066bae0f2d3c7c6f902fbc6781
Parents: 9da9bef
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Sep 7 12:44:51 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Sep 7 12:44:51 2010 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/46] activemq-nms-api git commit: Update version number
Posted by ta...@apache.org.
Update version number
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/7b5256da
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/7b5256da
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/7b5256da
Branch: refs/heads/1.2.x
Commit: 7b5256da93cf7d609355b839241a0f287679af41
Parents: d4f183a
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Dec 29 15:17:50 2009 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Dec 29 15:17:50 2009 +0000
----------------------------------------------------------------------
nant.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/7b5256da/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index fb1f143..90cf0a2 100644
--- a/nant.build
+++ b/nant.build
@@ -23,7 +23,7 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.2.0" unless="${property::exists('project.version')}" />
+ <property name="project.version" value="1.2.1" unless="${property::exists('project.version')}" />
<property name="project.release.type" value="RC" unless="${property::exists('project.release.type')}" />
<property name="project.short_description" value="Apache NMS Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
[04/46] activemq-nms-api git commit:
https://issues.apache.org/activemq/browse/AMQNET-224
Posted by ta...@apache.org.
https://issues.apache.org/activemq/browse/AMQNET-224
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/35c427be
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/35c427be
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/35c427be
Branch: refs/heads/1.2.x
Commit: 35c427be0ba80921db964d2698f7efe3ccd2bf4a
Parents: c335762
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Dec 15 14:42:37 2009 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Dec 15 14:42:37 2009 +0000
----------------------------------------------------------------------
src/main/csharp/policies/RedeliveryPolicy.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/35c427be/src/main/csharp/policies/RedeliveryPolicy.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/policies/RedeliveryPolicy.cs b/src/main/csharp/policies/RedeliveryPolicy.cs
index b662cd5..30cff90 100644
--- a/src/main/csharp/policies/RedeliveryPolicy.cs
+++ b/src/main/csharp/policies/RedeliveryPolicy.cs
@@ -62,10 +62,10 @@ namespace Apache.NMS.Policies
set { this.maximumRedeliveries = value; }
}
- public int RedeliveryDelay(int redeliveredCounter)
+ public virtual int RedeliveryDelay(int redeliveredCounter)
{
int delay = 0;
-
+
if(redeliveredCounter == 0)
{
// The first time through there is no delay, the Rollback should be immediate.
[24/46] activemq-nms-api git commit: Update the svn:ignore properties.
Posted by ta...@apache.org.
Update the svn:ignore properties.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/d359604f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/d359604f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/d359604f
Branch: refs/heads/1.4.x
Commit: d359604f04fd8b89bca85ab8afdc2bfbae455260
Parents: 1cc1066
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Sep 7 12:50:11 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Sep 7 12:50:11 2010 +0000
----------------------------------------------------------------------
----------------------------------------------------------------------
[45/46] activemq-nms-api git commit: Update version to 1.7.2-SNAPSHOT
Posted by ta...@apache.org.
Update version to 1.7.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/08fc795d
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/08fc795d
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/08fc795d
Branch: refs/heads/1.7.x
Commit: 08fc795defee77650175f4d01905e9f096dd45c4
Parents: 17f55c2
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Aug 31 18:07:01 2015 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Aug 31 18:07:01 2015 +0000
----------------------------------------------------------------------
nant.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/08fc795d/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 2ea4c94..223fcc3 100644
--- a/nant.build
+++ b/nant.build
@@ -23,7 +23,7 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.7.1" unless="${property::exists('project.version')}" />
+ <property name="project.version" value="1.7.2" 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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
[10/46] activemq-nms-api git commit: Commit build file with official
release version info.
Posted by ta...@apache.org.
Commit build file with official release version info.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/84ebe8c3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/84ebe8c3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/84ebe8c3
Branch: refs/heads/1.2.x
Commit: 84ebe8c3cabafb7ef7e1b7b5d93717dbd1d870f1
Parents: 03dc12a
Author: Timothy A. Bish <ta...@apache.org>
Authored: Thu Jan 7 20:20:57 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Thu Jan 7 20:20:57 2010 +0000
----------------------------------------------------------------------
nant.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/84ebe8c3/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 90cf0a2..5a1fbcd 100644
--- a/nant.build
+++ b/nant.build
@@ -23,8 +23,8 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.2.1" 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.0" unless="${property::exists('project.version')}" />
+ <property name="project.release.type" value="GA" unless="${property::exists('project.release.type')}" />
<property name="project.short_description" value="Apache NMS Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
<property name="project.cls.compliant" value="true" />
[41/46] activemq-nms-api git commit: Move trunk to v1.8.x line
Posted by ta...@apache.org.
Move trunk to v1.8.x line
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/9a7b5eea
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/9a7b5eea
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/9a7b5eea
Branch: refs/heads/master
Commit: 9a7b5eea9a2130154736f8c79cc319d840e8b015
Parents: e9ccac7
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Dec 15 21:17:33 2014 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Dec 15 21:17:33 2014 +0000
----------------------------------------------------------------------
nant.build | 2 +-
package.ps1 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/9a7b5eea/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 88b2420..5d87fdd 100644
--- a/nant.build
+++ b/nant.build
@@ -23,7 +23,7 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.7.0" unless="${property::exists('project.version')}" />
+ <property name="project.version" value="1.8.0" 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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/9a7b5eea/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index f6044e4..039e2d0 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.7-SNAPSHOT"
+$pkgver = "1.8-SNAPSHOT"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0", "netcf-3.5"
[21/46] activemq-nms-api git commit: Update maintenance branch
version to 1.3.1-SNAPSHOT
Posted by ta...@apache.org.
Update maintenance branch version to 1.3.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/f2417cf4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/f2417cf4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/f2417cf4
Branch: refs/heads/1.3.x
Commit: f2417cf441ce8d9b0e72d455787e49c7dff8315b
Parents: 027ae9a
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon May 10 14:38:10 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon May 10 14:38:10 2010 +0000
----------------------------------------------------------------------
nant.build | 4 ++--
package.ps1 | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/f2417cf4/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 6d09831..d100279 100644
--- a/nant.build
+++ b/nant.build
@@ -23,8 +23,8 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.3.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.3.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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
<property name="project.cls.compliant" value="true" />
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/f2417cf4/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index 2532ad5..7316e2b 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.3-RC1"
+$pkgver = "1.3.1-SNAPSHOT"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0", "netcf-3.5"
[43/46] activemq-nms-api git commit: Apply patch from Jose Alvarado.
Thanks, Jose! Fixes [AMQNET-503]. (See
https://issues.apache.org/jira/browse/AMQNET-503)
Posted by ta...@apache.org.
Apply patch from Jose Alvarado. Thanks, Jose!
Fixes [AMQNET-503]. (See https://issues.apache.org/jira/browse/AMQNET-503)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/ea9826fa
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/ea9826fa
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/ea9826fa
Branch: refs/heads/master
Commit: ea9826fa118e3a1bd8db43a0cc983d572a24b8fe
Parents: 9a7b5ee
Author: Jim Gomes <jg...@apache.org>
Authored: Mon Jul 6 22:41:04 2015 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Mon Jul 6 22:41:04 2015 +0000
----------------------------------------------------------------------
src/main/csharp/INetTxConnection.cs | 4 ++++
src/main/csharp/INetTxSession.cs | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/ea9826fa/src/main/csharp/INetTxConnection.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/INetTxConnection.cs b/src/main/csharp/INetTxConnection.cs
index cf955fe..12ce89c 100644
--- a/src/main/csharp/INetTxConnection.cs
+++ b/src/main/csharp/INetTxConnection.cs
@@ -40,6 +40,10 @@ namespace Apache.NMS
/// Creates a INetTxSession object and enlists in the specified Transaction.
/// </summary>
INetTxSession CreateNetTxSession(Transaction tx);
+
+ INetTxSession CreateNetTxSession(bool enlistsNativeMsDtcResource);
+
+ INetTxSession CreateNetTxSession(Transaction tx, bool enlistsNativeMsDtcResource);
#endif
}
}
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/ea9826fa/src/main/csharp/INetTxSession.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/INetTxSession.cs b/src/main/csharp/INetTxSession.cs
index 259ba3f..603460e 100644
--- a/src/main/csharp/INetTxSession.cs
+++ b/src/main/csharp/INetTxSession.cs
@@ -29,7 +29,7 @@ namespace Apache.NMS
/// The NMS Provider implements this interface by participating in the current ambient transaction
/// as defined by the System.Transactions.Transaction.Current static member. Whenever a new
/// Transaction is entered the NMS provider should enlist in that transaction. When there is no
- /// ambient transaction then the NMS Prodiver should allow the INetTxSession instance to behave
+ /// ambient transaction then the NMS Provider should allow the INetTxSession instance to behave
/// as a session that is in Auto Acknowledge mode.
///
/// Calling the Commit or Rollback methods on a INetTxSession instance should throw an exception
@@ -49,6 +49,8 @@ namespace Apache.NMS
/// be thrown.
/// </summary>
void Enlist(Transaction tx);
+
+ bool EnlistsMsDtcNativeResource { get; set; }
#endif
}
}
[07/46] activemq-nms-api git commit: Update Version to for new RC-2
tagging.
Posted by ta...@apache.org.
Update Version to for new RC-2 tagging.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/d4f183a6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/d4f183a6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/d4f183a6
Branch: refs/heads/1.2.x
Commit: d4f183a6c8d131743b22595332828fa5042f7de6
Parents: 21266a1
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Dec 29 15:15:06 2009 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Dec 29 15:15:06 2009 +0000
----------------------------------------------------------------------
nant.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/d4f183a6/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 90cf0a2..fb1f143 100644
--- a/nant.build
+++ b/nant.build
@@ -23,7 +23,7 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.2.1" unless="${property::exists('project.version')}" />
+ <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.short_description" value="Apache NMS Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
[35/46] activemq-nms-api git commit: fix for:
https://issues.apache.org/jira/browse/AMQNET-390
Posted by ta...@apache.org.
fix for: https://issues.apache.org/jira/browse/AMQNET-390
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/c7da7828
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/c7da7828
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/c7da7828
Branch: refs/heads/1.5.x
Commit: c7da7828372105d588c89d98d1bd7fca8c62d9a0
Parents: 8481593
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Jun 25 15:18:00 2012 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Jun 25 15:18:00 2012 +0000
----------------------------------------------------------------------
src/main/csharp/Util/PrimitiveMap.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/c7da7828/src/main/csharp/Util/PrimitiveMap.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/Util/PrimitiveMap.cs b/src/main/csharp/Util/PrimitiveMap.cs
index dda5871..e62cfa1 100644
--- a/src/main/csharp/Util/PrimitiveMap.cs
+++ b/src/main/csharp/Util/PrimitiveMap.cs
@@ -375,7 +375,7 @@ namespace Apache.NMS.Util
MarshalPrimitiveMap(map, new EndianBinaryWriter(memoryStream));
}
- return memoryStream.GetBuffer();
+ return memoryStream.ToArray();
}
public static void MarshalPrimitiveMap(IDictionary map, Stream stream)
[11/46] activemq-nms-api git commit: Bump version no. and flag as
SNAPSHOT.
Posted by ta...@apache.org.
Bump version no. and flag as SNAPSHOT.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/cdf9c84f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/cdf9c84f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/cdf9c84f
Branch: refs/heads/1.2.x
Commit: cdf9c84f2d1c76d43d871c72e04d34152762ac55
Parents: 84ebe8c
Author: Timothy A. Bish <ta...@apache.org>
Authored: Thu Jan 7 20:23:17 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Thu Jan 7 20:23:17 2010 +0000
----------------------------------------------------------------------
nant.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/cdf9c84f/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 5a1fbcd..9b9ed94 100644
--- a/nant.build
+++ b/nant.build
@@ -23,8 +23,8 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<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="GA" 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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
<property name="project.cls.compliant" value="true" />
[30/46] activemq-nms-api git commit: Update README with instructions
on how to generate API documentation. Fix reference path to NUnit for
documentation generation task. Fixes [AMQNET-302]. (See
https://issues.apache.org/activemq/browse/AMQNET-302)
Posted by ta...@apache.org.
Update README with instructions on how to generate API documentation.
Fix reference path to NUnit for documentation generation task.
Fixes [AMQNET-302]. (See https://issues.apache.org/activemq/browse/AMQNET-302)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/ec2155d9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/ec2155d9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/ec2155d9
Branch: refs/heads/1.5.x
Commit: ec2155d99aede1e234b79340d0a0532bb1a447ab
Parents: 0fb7437
Author: Jim Gomes <jg...@apache.org>
Authored: Thu Jan 6 19:35:21 2011 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Thu Jan 6 19:35:21 2011 +0000
----------------------------------------------------------------------
nant-common.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/ec2155d9/nant-common.xml
----------------------------------------------------------------------
diff --git a/nant-common.xml b/nant-common.xml
index 02c4d14..bf7a6ae 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -545,7 +545,7 @@
<property name="sandcastle.style" value="vs2005" unless="${property::exists('sandcastle.style')}" />
<property name="documentation.dir" value="${build.bin.dir}" />
<property name="bin.intern.dir" value="${build.bin.dir}" />
- <property name="bin.extern.dir" value="${basedir}\vendor\NUnit\net-2.0" />
+ <property name="bin.extern.dir" value="${basedir}\lib\NUnit\net-2.0" />
<property name="sandcastle.dir" value="${environment::get-variable('DXROOT')}" />
<property name="sandcastle.workingdir" value="${build.dir}\doc\${sandcastle.style}" />
<property name="sandcastle.output.dir" value="${sandcastle.workingdir}\Output" />
[27/46] activemq-nms-api git commit: Update branch projects to use
NUnit 2.5.8.
Posted by ta...@apache.org.
Update branch projects to use NUnit 2.5.8.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/f722c18e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/f722c18e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/f722c18e
Branch: refs/heads/1.4.x
Commit: f722c18e2a6593608502e9f91cbc8bd68b7c8940
Parents: 1f4fc20
Author: Jim Gomes <jg...@apache.org>
Authored: Thu Nov 11 00:40:11 2010 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Thu Nov 11 00:40:11 2010 +0000
----------------------------------------------------------------------
nant.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/f722c18e/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index 864abcb..b779e04 100644
--- a/nant.build
+++ b/nant.build
@@ -61,7 +61,7 @@
<!-- Property grouping for 'vendor.nunit.org' -->
<property name="vendor.nunit.org.name" value="NUnit" />
<property name="vendor.nunit.org.group" value="org.nunit" />
- <property name="vendor.nunit.org.version" value="2.5.5" />
+ <property name="vendor.nunit.org.version" value="2.5.8" />
<property name="vendor.nunit.org.filenames" value="nunit.framework.dll" />
</target>
[34/46] activemq-nms-api git commit: Add missing framework exists
check.
Posted by ta...@apache.org.
Add missing framework exists check.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/84815934
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/84815934
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/84815934
Branch: refs/heads/1.5.x
Commit: 8481593453b8cd4136518a7992a7e978d5e6075d
Parents: 3c2315d
Author: Timothy A. Bish <ta...@apache.org>
Authored: Mon Oct 31 18:27:16 2011 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Mon Oct 31 18:27:16 2011 +0000
----------------------------------------------------------------------
nant-common.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/84815934/nant-common.xml
----------------------------------------------------------------------
diff --git a/nant-common.xml b/nant-common.xml
index 1f3e3d3..2210d76 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -230,7 +230,9 @@
<property name="current.build.framework.sign" value="true" />
<property name="link.sdkdoc.version" value="SDK_v7_0" />
<property name="link.sdkdoc.web" value="true" />
- <property name="nant.settings.currentframework" value="${current.build.framework}" />
+ <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">
[31/46] activemq-nms-api git commit: Add direct support for ZeroMQ
provider implementation. Fixes [AMQNET-333]. (See
https://issues.apache.org/jira/browse/AMQNET-333)
Posted by ta...@apache.org.
Add direct support for ZeroMQ provider implementation.
Fixes [AMQNET-333]. (See https://issues.apache.org/jira/browse/AMQNET-333)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/e5be5bed
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/e5be5bed
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/e5be5bed
Branch: refs/heads/1.5.x
Commit: e5be5bed8558639c76119c8797c9fbb97f28f501
Parents: ec2155d
Author: Jim Gomes <jg...@apache.org>
Authored: Thu Jul 7 19:29:16 2011 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Thu Jul 7 19:29:16 2011 +0000
----------------------------------------------------------------------
src/main/csharp/NMSConnectionFactory.cs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/e5be5bed/src/main/csharp/NMSConnectionFactory.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/NMSConnectionFactory.cs b/src/main/csharp/NMSConnectionFactory.cs
index 402fc58..015786d 100644
--- a/src/main/csharp/NMSConnectionFactory.cs
+++ b/src/main/csharp/NMSConnectionFactory.cs
@@ -21,8 +21,8 @@ using System.Collections.Generic;
using System.IO;
using System.Reflection;
using System.Xml;
-
-using Apache.NMS.Util;
+
+using Apache.NMS.Util;
namespace Apache.NMS
{
@@ -61,6 +61,7 @@ namespace Apache.NMS
schemaProviderFactoryMap["msmq"] = new ProviderFactoryInfo("Apache.NMS.MSMQ", "Apache.NMS.MSMQ.ConnectionFactory");
schemaProviderFactoryMap["stomp"] = new ProviderFactoryInfo("Apache.NMS.Stomp", "Apache.NMS.Stomp.ConnectionFactory");
schemaProviderFactoryMap["xms"] = new ProviderFactoryInfo("Apache.NMS.XMS", "Apache.NMS.XMS.ConnectionFactory");
+ schemaProviderFactoryMap["zmq"] = new ProviderFactoryInfo("Apache.NMS.ZMQ", "Apache.NMS.ZMQ.ConnectionFactory");
}
/// <summary>
@@ -71,7 +72,7 @@ namespace Apache.NMS
/// <param name="constructorParams">Optional parameters to use when creating the ConnectionFactory.</param>
public NMSConnectionFactory(string providerURI, params object[] constructorParams)
: this(URISupport.CreateCompatibleUri(providerURI), constructorParams)
- {
+ {
}
/// <summary>
[28/46] activemq-nms-api git commit: create new working tag for NMS
1.5.x patch releases.
Posted by ta...@apache.org.
create new working tag for NMS 1.5.x patch releases.
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/69bbc263
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/69bbc263
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/69bbc263
Branch: refs/heads/1.5.x
Commit: 69bbc2634bb16e33ec5be70e753184b90146a2af
Parents: fcb9895
Author: Timothy A. Bish <ta...@apache.org>
Authored: Tue Jan 4 21:54:34 2011 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Tue Jan 4 21:54:34 2011 +0000
----------------------------------------------------------------------
nant.build | 2 +-
package.ps1 | 58 ++++++++++++++++++++++++++++----------------------------
2 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/69bbc263/nant.build
----------------------------------------------------------------------
diff --git a/nant.build b/nant.build
index da83fc7..e331de2 100644
--- a/nant.build
+++ b/nant.build
@@ -23,7 +23,7 @@
<property name="basedir" value="${project::get-base-directory()}" />
<property name="project.name" value="Apache.NMS" />
<property name="project.group" value="org.apache.activemq" />
- <property name="project.version" value="1.5.0" unless="${property::exists('project.version')}" />
+ <property name="project.version" value="1.5.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 Class Library" />
<property name="project.description" value="Apache NMS (.Net Messaging Library): An abstract interface to Message Oriented Middleware (MOM) providers" />
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/69bbc263/package.ps1
----------------------------------------------------------------------
diff --git a/package.ps1 b/package.ps1
index 4268b1d..f59c436 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,48 +14,48 @@
# limitations under the License.
$pkgname = "Apache.NMS"
-$pkgver = "1.5-SNAPSHOT"
+$pkgver = "1.5.1-SNAPSHOT"
$configurations = "release", "debug"
$frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0", "netcf-3.5"
write-progress "Creating package directory." "Initializing..."
if(!(test-path package))
{
- md package
+ md package
}
if(test-path build)
{
- pushd build
+ pushd build
- $pkgdir = "..\package"
+ $pkgdir = "..\package"
- write-progress "Packaging Application files." "Scanning..."
- $zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
- zip -9 -u -j "$zipfile" ..\LICENSE.txt
- zip -9 -u -j "$zipfile" ..\NOTICE.txt
- foreach($configuration in $configurations)
- {
- foreach($framework in $frameworks)
- {
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
- if($framework -ieq "mono-2.0")
- {
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
- }
- else
- {
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
- zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
- }
- }
- }
+ write-progress "Packaging Application files." "Scanning..."
+ $zipfile = "$pkgdir\$pkgname-$pkgver-bin.zip"
+ zip -9 -u -j "$zipfile" ..\LICENSE.txt
+ zip -9 -u -j "$zipfile" ..\NOTICE.txt
+ foreach($configuration in $configurations)
+ {
+ foreach($framework in $frameworks)
+ {
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.xml"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.xml"
+ if($framework -ieq "mono-2.0")
+ {
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.dll.mdb"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.dll.mdb"
+ }
+ else
+ {
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.pdb"
+ zip -9 -u "$zipfile" "$framework\$configuration\$pkgname.Test.pdb"
+ }
+ }
+ }
- popd
+ popd
}
write-progress "Packaging Source code files." "Scanning..."
[09/46] activemq-nms-api git commit: Add missing Apache license header
Posted by ta...@apache.org.
Add missing Apache license header
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/03dc12a9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/03dc12a9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/03dc12a9
Branch: refs/heads/1.2.x
Commit: 03dc12a9a969b3ef5de006599d8cdbc198220814
Parents: 7b5256d
Author: Timothy A. Bish <ta...@apache.org>
Authored: Thu Jan 7 20:18:53 2010 +0000
Committer: Timothy A. Bish <ta...@apache.org>
Committed: Thu Jan 7 20:18:53 2010 +0000
----------------------------------------------------------------------
src/test/csharp/RedeliveryPolicyTest.cs | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/03dc12a9/src/test/csharp/RedeliveryPolicyTest.cs
----------------------------------------------------------------------
diff --git a/src/test/csharp/RedeliveryPolicyTest.cs b/src/test/csharp/RedeliveryPolicyTest.cs
index fd62f0d..c0d4931 100644
--- a/src/test/csharp/RedeliveryPolicyTest.cs
+++ b/src/test/csharp/RedeliveryPolicyTest.cs
@@ -1,4 +1,21 @@
-\ufeffusing System;
+\ufeff/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
using System.Collections.Generic;
using System.Text;
using Apache.NMS;
[44/46] activemq-nms-api git commit: Merged revision(s) 1689516 from
activemq/activemq-dotnet/Apache.NMS/trunk: Apply patch from Jose Alvarado.
Thanks, Jose! Fixes [AMQNET-503]. (See
https://issues.apache.org/jira/browse/AMQNET-503)
Posted by ta...@apache.org.
Merged revision(s) 1689516 from activemq/activemq-dotnet/Apache.NMS/trunk:
Apply patch from Jose Alvarado. Thanks, Jose!
Fixes [AMQNET-503]. (See https://issues.apache.org/jira/browse/AMQNET-503)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/17f55c2a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/17f55c2a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/17f55c2a
Branch: refs/heads/1.7.x
Commit: 17f55c2a54ddcf3bcd35b3410e9c26028201ee0f
Parents: d94e578
Author: Jim Gomes <jg...@apache.org>
Authored: Tue Jul 7 00:01:40 2015 +0000
Committer: Jim Gomes <jg...@apache.org>
Committed: Tue Jul 7 00:01:40 2015 +0000
----------------------------------------------------------------------
src/main/csharp/INetTxConnection.cs | 4 ++++
src/main/csharp/INetTxSession.cs | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/17f55c2a/src/main/csharp/INetTxConnection.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/INetTxConnection.cs b/src/main/csharp/INetTxConnection.cs
index cf955fe..12ce89c 100644
--- a/src/main/csharp/INetTxConnection.cs
+++ b/src/main/csharp/INetTxConnection.cs
@@ -40,6 +40,10 @@ namespace Apache.NMS
/// Creates a INetTxSession object and enlists in the specified Transaction.
/// </summary>
INetTxSession CreateNetTxSession(Transaction tx);
+
+ INetTxSession CreateNetTxSession(bool enlistsNativeMsDtcResource);
+
+ INetTxSession CreateNetTxSession(Transaction tx, bool enlistsNativeMsDtcResource);
#endif
}
}
http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/17f55c2a/src/main/csharp/INetTxSession.cs
----------------------------------------------------------------------
diff --git a/src/main/csharp/INetTxSession.cs b/src/main/csharp/INetTxSession.cs
index 259ba3f..603460e 100644
--- a/src/main/csharp/INetTxSession.cs
+++ b/src/main/csharp/INetTxSession.cs
@@ -29,7 +29,7 @@ namespace Apache.NMS
/// The NMS Provider implements this interface by participating in the current ambient transaction
/// as defined by the System.Transactions.Transaction.Current static member. Whenever a new
/// Transaction is entered the NMS provider should enlist in that transaction. When there is no
- /// ambient transaction then the NMS Prodiver should allow the INetTxSession instance to behave
+ /// ambient transaction then the NMS Provider should allow the INetTxSession instance to behave
/// as a session that is in Auto Acknowledge mode.
///
/// Calling the Commit or Rollback methods on a INetTxSession instance should throw an exception
@@ -49,6 +49,8 @@ namespace Apache.NMS
/// be thrown.
/// </summary>
void Enlist(Transaction tx);
+
+ bool EnlistsMsDtcNativeResource { get; set; }
#endif
}
}