Jenkins build is still unstable: ActiveMQ-Java8 #969

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: Unit Tests #969

[Apache Jenkins Server]

See 

Jenkins build became unstable: ActiveMQ-Java8 » ActiveMQ :: MQTT Protocol #969

[Apache Jenkins Server]

See 

Jenkins build became unstable: ActiveMQ-Java8 » ActiveMQ :: HTTP Protocol Support #969

[Apache Jenkins Server]

See 

[1/2] activemq-artemis git commit: NO-JIRA cite reference for commit msg format

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 5316a8048 -> b63c8fa9a


NO-JIRA cite reference for commit msg format


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/414db3ad
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/414db3ad
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/414db3ad

Branch: refs/heads/master
Commit: 414db3add9924e71027d0b984ce855aa2953cfee
Parents: 5316a80
Author: Justin Bertram 
Authored: Mon Mar 6 14:39:15 2017 -0600
Committer: Clebert Suconic 
Committed: Mon Mar 6 22:13:04 2017 -0500

--
 docs/hacking-guide/en/maintainers.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/414db3ad/docs/hacking-guide/en/maintainers.md
--
diff --git a/docs/hacking-guide/en/maintainers.md 
b/docs/hacking-guide/en/maintainers.md
index 4319f5a..3095679 100644
--- a/docs/hacking-guide/en/maintainers.md
+++ b/docs/hacking-guide/en/maintainers.md
@@ -31,7 +31,8 @@ Developers are encouraged also to use the Dev profile, which 
will activate check
 
 ## Commit Messages
 
-Please ensure the commit messages follow the 50/72 format as described 
[here](code.md#commitMessageDetails).
+Please ensure the commit messages follow the 50/72 format as described 
[here](code.md#commitMessageDetails). This
+format follows the recommendation from the [official Git 
book](https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project).
 
 ## Configuring git repositories
 

[2/2] activemq-artemis git commit: This closes #1067

[clebertsuconic]

This closes #1067


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

Branch: refs/heads/master
Commit: b63c8fa9ac7f5cada7727e740961228dfd0f4b5d
Parents: 5316a80 414db3a
Author: Clebert Suconic 
Authored: Mon Mar 6 22:13:05 2017 -0500
Committer: Clebert Suconic 
Committed: Mon Mar 6 22:13:05 2017 -0500

--
 docs/hacking-guide/en/maintainers.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[3/3] activemq-artemis git commit: This closes #1068

[clebertsuconic]

This closes #1068


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5316a804
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5316a804
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5316a804

Branch: refs/heads/master
Commit: 5316a80484283bc66e1b93d5e498c75b9ba9c503
Parents: 973c519 b851a59
Author: Clebert Suconic 
Authored: Mon Mar 6 22:12:25 2017 -0500
Committer: Clebert Suconic 
Committed: Mon Mar 6 22:12:25 2017 -0500

--
 .../apache/activemq/artemis/core/message/impl/CoreMessage.java| 2 +-
 .../java/org/apache/activemq/artemis/message/CoreMessageTest.java | 2 +-
 .../artemis/jms/example/AddForwardingTimeTransformer.java | 3 +++
 .../activemq/artemis/tests/integration/client/ConsumerTest.java   | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)
--

[2/3] activemq-artemis git commit: ARTEMIS-1009 Fixing compatibility

[clebertsuconic]

ARTEMIS-1009 Fixing compatibility

there was an issue with running older clients
Found by this testsuite:

https://github.com/clebertsuconic/messaging-versioning

this will fix further compatibility issues


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/94b47e37
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/94b47e37
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/94b47e37

Branch: refs/heads/master
Commit: 94b47e370b530e1ce01b0e1f1cc1b1c1aa57c4c1
Parents: 973c519
Author: Clebert Suconic 
Authored: Mon Mar 6 17:19:35 2017 -0500
Committer: Clebert Suconic 
Committed: Mon Mar 6 22:09:41 2017 -0500

--
 .../org/apache/activemq/artemis/core/message/impl/CoreMessage.java | 2 +-
 .../java/org/apache/activemq/artemis/message/CoreMessageTest.java  | 2 +-
 .../activemq/artemis/tests/integration/client/ConsumerTest.java| 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/94b47e37/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
index a9e2900..e8d7cc5 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -514,7 +514,7 @@ public class CoreMessage extends RefCountMessage implements 
ICoreMessage {
  // so we always need to take the BUFFER_HEADER_SPACE from packet impl 
into consideration
  endOfBodyPosition = writableBuffer.writerIndex() + 
BUFFER_HEADER_SPACE - 4;
   } else if (endOfBodyPosition <= 0) {
- endOfBodyPosition = BUFFER_HEADER_SPACE;
+ endOfBodyPosition = BUFFER_HEADER_SPACE + DataConstants.SIZE_INT;
   }
 
   buffer.setIndex(0, 0);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/94b47e37/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMessageTest.java
--
diff --git 
a/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMessageTest.java
 
b/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMessageTest.java
index 5e92eaf..ec94011 100644
--- 
a/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMessageTest.java
+++ 
b/artemis-core-client/src/test/java/org/apache/activemq/artemis/message/CoreMessageTest.java
@@ -197,7 +197,7 @@ public class CoreMessageTest {
   empty2.receiveBuffer(buffer);
 
   try {
- empty2.getBodyBuffer().readByte();
+ empty2.getBodyBuffer().readLong();
  Assert.fail("should throw exception");
   } catch (Exception expected) {
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/94b47e37/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
index b957291..a2f6534 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerTest.java
@@ -190,6 +190,8 @@ public class ConsumerTest extends ActiveMQTestBase {
 
   Assert.assertEquals("hi", message2.getReadOnlyBodyBuffer().readString());
 
+  Assert.assertNull(consumer.receiveImmediate());
+
   session.close();
}
 

[1/3] activemq-artemis git commit: ARTEMIS-1009 Fixing example

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 973c51921 -> 5316a8048


ARTEMIS-1009 Fixing example


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

Branch: refs/heads/master
Commit: b851a59ec58daa883ed8ed1a92722de5746c5860
Parents: 94b47e3
Author: Clebert Suconic 
Authored: Mon Mar 6 17:39:57 2017 -0500
Committer: Clebert Suconic 
Committed: Mon Mar 6 22:09:41 2017 -0500

--
 .../artemis/jms/example/AddForwardingTimeTransformer.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b851a59e/examples/features/standard/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
--
diff --git 
a/examples/features/standard/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
 
b/examples/features/standard/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
index 2f75d4c..37fe747 100644
--- 
a/examples/features/standard/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
+++ 
b/examples/features/standard/divert/src/main/java/org/apache/activemq/artemis/jms/example/AddForwardingTimeTransformer.java
@@ -17,12 +17,15 @@
 package org.apache.activemq.artemis.jms.example;
 
 import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.server.cluster.Transformer;
 
 public class AddForwardingTimeTransformer implements Transformer {
 
@Override
public Message transform(final Message message) {
+  message.putLongProperty(new SimpleString("time_of_forward"), 
System.currentTimeMillis());
+
   return message;
}
 

[12/50] [abbrv] activemq-nms-stomp git commit: Update branch projects to use NUnit 2.5.8.

[tabish]

Update branch projects to use NUnit 2.5.8.


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

Branch: refs/heads/1.4.x
Commit: 3c866c59d786fa85510a933fd123d9ea2e61438d
Parents: 4a6b1b4
Author: Jim Gomes 
Authored: Thu Nov 11 00:40:11 2010 +
Committer: Jim Gomes 
Committed: Thu Nov 11 00:40:11 2010 +

--
 nant.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/3c866c59/nant.build
--
diff --git a/nant.build b/nant.build
index 68e9038..16811e8 100644
--- a/nant.build
+++ b/nant.build
@@ -57,7 +57,7 @@
 
 
 
-
+
 
 
 

[02/50] [abbrv] activemq-nms-stomp git commit: Revert unintended merge.

[tabish]

Revert unintended merge.


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

Branch: refs/heads/1.2.x
Commit: 7d932d29ac90687fbdfc4dbf263d84bd5d7a2faf
Parents: ecfa000
Author: Jim Gomes 
Authored: Tue Feb 9 22:39:24 2010 +
Committer: Jim Gomes 
Committed: Tue Feb 9 22:39:24 2010 +

--
 nant-common.xml | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/7d932d29/nant-common.xml
--
diff --git a/nant-common.xml b/nant-common.xml
index 4099f39..1be2614 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -41,7 +41,7 @@



-   
+   

 

@@ -194,6 +194,18 @@


 
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+



@@ -222,7 +234,7 @@



-   
+   



@@ -230,18 +242,6 @@


 
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-

[25/50] [abbrv] activemq-nms-stomp git commit: Refactor the CheckConnected function to handle multiple threads attempting to check connection status against an offline broker. Guard against unwanted e

[tabish]

Refactor the CheckConnected function to handle multiple threads attempting to 
check connection status against an offline broker.  Guard against unwanted 
exceptions being thrown when indexing into a connection state array that has 
not been fully set up because the broker is offline.

Fixes [AMQNET-331]. (See https://issues.apache.org/jira/browse/AMQNET-331)



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

Branch: refs/heads/1.5.x
Commit: 3d2d37af432882cbc44713d46c1acf4cc8208a01
Parents: 67916c2
Author: Jim Gomes 
Authored: Fri Jun 17 23:58:06 2011 +
Committer: Jim Gomes 
Committed: Fri Jun 17 23:58:06 2011 +

--
 src/main/csharp/Connection.cs   | 71 +++-
 src/main/csharp/State/ConnectionState.cs| 38 +--
 src/main/csharp/State/ConnectionStateTracker.cs | 23 ---
 src/main/csharp/State/SynchronizedObjects.cs|  8 +++
 src/main/csharp/Transport/MutexTransport.cs |  6 +-
 5 files changed, 99 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/3d2d37af/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index ffaf180..4ca6aa5 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -501,14 +501,7 @@ namespace Apache.NMS.Stomp
 
 public Response SyncRequest(Command command)
 {
-try
-{
-return SyncRequest(command, this.RequestTimeout);
-}
-catch(Exception ex)
-{
-throw NMSExceptionSupport.Create(ex);
-}
+return SyncRequest(command, this.RequestTimeout);
 }
 
 public Response SyncRequest(Command command, TimeSpan requestTimeout)
@@ -546,7 +539,13 @@ namespace Apache.NMS.Stomp
 }
 }
 
-protected void CheckConnected()
+private object checkConnectedLock = new object();
+
+/// 
+/// Check and ensure that the connection objcet is connected.  If it 
is not
+/// connected or is closed, a ConnectionClosedException is thrown.
+/// 
+internal void CheckConnected()
 {
 if(closed.Value)
 {
@@ -555,17 +554,57 @@ namespace Apache.NMS.Stomp
 
 if(!connected.Value)
 {
-if(!this.userSpecifiedClientID)
+DateTime timeoutTime = DateTime.Now + this.RequestTimeout;
+int waitCount = 1;
+
+while(true)
 {
-this.info.ClientId = this.clientIdGenerator.GenerateId();
+if(Monitor.TryEnter(checkConnectedLock))
+{
+try
+{
+if(!connected.Value)
+{
+if(!this.userSpecifiedClientID)
+{
+this.info.ClientId = 
this.clientIdGenerator.GenerateId();
+}
+
+try
+{
+if(null != transport)
+{
+// Send the connection and see if an 
ack/nak is returned.
+Response response = 
transport.Request(this.info, this.RequestTimeout);
+if(!(response is ExceptionResponse))
+{
+connected.Value = true;
+}
+}
+}
+catch
+{
+}
+}
+}
+finally
+{
+Monitor.Exit(checkConnectedLock);
+}
+}
+
+if(connected.Value || DateTime.Now > timeoutTime)
+{
+break;
+}
+
+// Back off from being overly aggressive.  Having too many 
threads
+// aggressively trying to connect to a down broker pegs 
the CPU.
+

[45/50] [abbrv] activemq-nms-stomp git commit: Branch NMS.Stomp trunk to 1.7.x, using NMS API 1.7.1. Update trunk to 1.8.0.

[tabish]

Branch NMS.Stomp trunk to 1.7.x, using NMS API 1.7.1. Update trunk to 1.8.0.


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

Branch: refs/heads/master
Commit: 10816663a787ebd507353c078188f684b6b28899
Parents: 52e49cc
Author: Jim Gomes 
Authored: Tue Jul 7 20:26:21 2015 +
Committer: Jim Gomes 
Committed: Tue Jul 7 20:26:21 2015 +

--
 nant.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/10816663/nant.build
--
diff --git a/nant.build b/nant.build
index 0966e76..63fa6b1 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 

[07/50] [abbrv] activemq-nms-stomp git commit: Branch code for the 1.4 release

[tabish]

Branch code for the 1.4 release


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

Branch: refs/heads/1.4.x
Commit: 0b497f196b92c9ee8a6bf1e0f1ceb3575fdf03fe
Parents: 7c79740
Author: Timothy A. Bish 
Authored: Tue Sep 7 14:18:08 2010 +
Committer: Timothy A. Bish 
Committed: Tue Sep 7 14:18:08 2010 +

--

--

[40/50] [abbrv] activemq-nms-stomp git commit: Bump to v1.5.4 SNAPSHOT

[tabish]

Bump to v1.5.4 SNAPSHOT


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

Branch: refs/heads/1.5.x
Commit: 5ba89b383182af93625ca7465755e29fdd11dc77
Parents: ca08c34
Author: Timothy A. Bish 
Authored: Mon Aug 27 12:56:44 2012 +
Committer: Timothy A. Bish 
Committed: Mon Aug 27 12:56:44 2012 +

--
 nant.build  | 2 +-
 package.ps1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/5ba89b38/nant.build
--
diff --git a/nant.build b/nant.build
index 45a29ac..176493b 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/5ba89b38/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index a0a625b..9904fd5 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 $pkgname = "Apache.NMS.Stomp"
-$pkgver = "1.5.3-SNAPSHOT"
+$pkgver = "1.5.4-SNAPSHOT"
 $configurations = "release", "debug"
 $frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0"
 

[30/50] [abbrv] activemq-nms-stomp git commit: Push version to 1.5.3 SNAPSHOT

[tabish]

Push version to 1.5.3 SNAPSHOT


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

Branch: refs/heads/1.5.x
Commit: 8e02b7442591f62cbdd106bb3ff605b3ac310a3a
Parents: 23302e8
Author: Timothy A. Bish 
Authored: Mon Nov 14 15:54:34 2011 +
Committer: Timothy A. Bish 
Committed: Mon Nov 14 15:54:34 2011 +

--
 README.txt  | 18 +-
 nant.build  |  2 +-
 package.ps1 |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/8e02b744/README.txt
--
diff --git a/README.txt b/README.txt
index abba406..8456037 100644
--- a/README.txt
+++ b/README.txt
@@ -6,10 +6,10 @@ Welcome to:
 For more information see http://activemq.apache.org/nms
 
 ===
-Building With NAnt 0.86 see http://nant.sourceforge.net/
+Building With NAnt 0.90 see http://nant.sourceforge.net/
 ===
 
-NAnt version 0.86 or newer is required to build Apache.NMS.Stomp.  Version 0.90
+NAnt version 0.90 or newer is required to build Apache.NMS.Stomp.  Version 0.91
 or newer is highly recommended.
 To build the code using NAnt, run:
 
@@ -39,19 +39,19 @@ To generate the documentation, run:
 Building With Visual Studio 2008
 ===
 
-First build the project with nant, this will download and install 
+First build the project with nant, this will download and install
 all the 3rd party dependencies for you.
 
-Open the solution File.  Build using "Build"->"Build Solution" 
+Open the solution File.  Build using "Build"->"Build Solution"
 menu option.
 
-The resulting DLLs will be in build\${framework}\debug or the 
-build\${framework}\release directories depending on your settings 
+The resulting DLLs will be in build\${framework}\debug or the
+build\${framework}\release directories depending on your settings
 under "Build"->"Configuration Manager"
 
-If you have the Resharper plugin installed in Visual Studio, you can run 
-all the Unit Tests by using the "ReSharper"->"Unit Testing"->"Run All 
-Tests from Solution" menu option.  Please note that you must run an 
+If you have the Resharper plugin installed in Visual Studio, you can run
+all the Unit Tests by using the "ReSharper"->"Unit Testing"->"Run All
+Tests from Solution" menu option.  Please note that you must run an
 Apache ActiveMQ Broker before kicking off the unit tests.  Otherwise,
 the standalone NUnit test runner can be used.  NUnit version 2.5.8
 is required to build and run the unit tests.

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/8e02b744/nant.build
--
diff --git a/nant.build b/nant.build
index 087e10f..2806560 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/8e02b744/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index bfa1448..a0a625b 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 $pkgname = "Apache.NMS.Stomp"
-$pkgver = "1.5.2-SNAPSHOT"
+$pkgver = "1.5.3-SNAPSHOT"
 $configurations = "release", "debug"
 $frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0"
 

[05/50] [abbrv] activemq-nms-stomp git commit: Create a new branch for version 1.3.x releases

[tabish]

Create a new branch for version 1.3.x releases


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

Branch: refs/heads/1.3.x
Commit: 14e592065046f98b91bab17da139e6decf0b75a6
Parents: 0d37113
Author: Timothy A. Bish 
Authored: Mon May 24 21:11:12 2010 +
Committer: Timothy A. Bish 
Committed: Mon May 24 21:11:12 2010 +

--

--

[36/50] [abbrv] activemq-nms-stomp git commit: Fix call to ErrorFormat().

[tabish]

Fix call to ErrorFormat().


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

Branch: refs/heads/1.5.x
Commit: a15a3fd9d6fe83a5f674e77e7e6144e247aefc67
Parents: e15675c
Author: Jim Gomes 
Authored: Mon Aug 20 19:21:28 2012 +
Committer: Jim Gomes 
Committed: Mon Aug 20 19:21:28 2012 +

--
 src/main/csharp/Connection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/a15a3fd9/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index 45e03ec..1ccb6de 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -682,7 +682,7 @@ namespace Apache.NMS.Stomp
 }
 }
 
-Tracer.Error("No such consumer active: {0}.  Removing...", 
dispatch.ConsumerId);
+Tracer.ErrorFormat("No such consumer active: {0}.  Removing...", 
dispatch.ConsumerId);
 RemoveInfo info  = new RemoveInfo();
 info.ObjectId = dispatch.ConsumerId;
 transport.Oneway(info);

[20/50] [abbrv] activemq-nms-stomp git commit: Merge all fixes from trunk in preparation for a v1.5.1 release.

[tabish]

Merge all fixes from trunk in preparation for a v1.5.1 release.


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

Branch: refs/heads/1.5.x
Commit: c0368061e8b6bfa688406f27b2d55026832bdc51
Parents: 4d2a816
Author: Timothy A. Bish 
Authored: Wed Jan 26 21:25:30 2011 +
Committer: Timothy A. Bish 
Committed: Wed Jan 26 21:25:30 2011 +

--
 src/main/csharp/Connection.cs   | 145 ++---
 src/main/csharp/Threads/ThreadPoolExecutor.cs   | 167 +++
 src/main/csharp/Transport/InactivityMonitor.cs  |  49 +++--
 src/main/csharp/Util/MessageDispatchChannel.cs  |  21 +-
 .../csharp/Threads/ThreadPoolExecutorTest.cs| 202 +++
 vs2008-stomp-test.csproj|   1 +
 vs2008-stomp.csproj |   1 +
 7 files changed, 534 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/c0368061/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index 6ce7003..ffaf180 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -20,6 +20,7 @@ using System.Collections;
 using System.Collections.Specialized;
 using System.Threading;
 using Apache.NMS.Stomp.Commands;
+using Apache.NMS.Stomp.Threads;
 using Apache.NMS.Stomp.Transport;
 using Apache.NMS.Stomp.Util;
 using Apache.NMS.Util;
@@ -52,9 +53,11 @@ namespace Apache.NMS.Stomp
 private readonly IList sessions = ArrayList.Synchronized(new 
ArrayList());
 private readonly IDictionary dispatchers = Hashtable.Synchronized(new 
Hashtable());
 private readonly object myLock = new object();
-private bool connected = false;
-private bool closed = false;
-private bool closing = false;
+private readonly Atomic connected = new Atomic(false);
+private readonly Atomic closed = new Atomic(false);
+private readonly Atomic closing = new Atomic(false);
+private readonly Atomic transportFailed = new 
Atomic(false);
+private Exception firstFailureError = null;
 private int sessionCounter = 0;
 private int temporaryDestinationCounter = 0;
 private int localTransactionCounter;
@@ -64,6 +67,7 @@ namespace Apache.NMS.Stomp
 private readonly IdGenerator clientIdGenerator;
 private CountDownLatch transportInterruptionProcessingComplete;
 private readonly MessageTransformation messageTransformation;
+private readonly ThreadPoolExecutor executor = new 
ThreadPoolExecutor();
 
 public Connection(Uri connectionUri, ITransport transport, IdGenerator 
clientIdGenerator)
 {
@@ -72,7 +76,7 @@ namespace Apache.NMS.Stomp
 
 this.transport = transport;
 this.transport.Command = new CommandHandler(OnCommand);
-this.transport.Exception = new ExceptionHandler(OnException);
+this.transport.Exception = new 
ExceptionHandler(OnTransportException);
 this.transport.Interrupted = new 
InterruptedHandler(OnTransportInterrupted);
 this.transport.Resumed = new ResumedHandler(OnTransportResumed);
 
@@ -215,6 +219,16 @@ namespace Apache.NMS.Stomp
 set { this.transport = value; }
 }
 
+public bool TransportFailed
+{
+get { return this.transportFailed.Value; }
+}
+
+public Exception FirstFailureError
+{
+get { return this.firstFailureError; }
+}
+
 public TimeSpan RequestTimeout
 {
 get { return this.requestTimeout; }
@@ -232,7 +246,7 @@ namespace Apache.NMS.Stomp
 get { return info.ClientId; }
 set
 {
-if(this.connected)
+if(this.connected.Value)
 {
 throw new NMSException("You cannot change the ClientId 
once the Connection is connected");
 }
@@ -384,7 +398,7 @@ namespace Apache.NMS.Stomp
 
 internal void RemoveSession(Session session)
 {
-if(!this.closing)
+if(!this.closing.Value)
 {
 sessions.Remove(session);
 }
@@ -404,7 +418,7 @@ namespace Apache.NMS.Stomp
 {
 lock(myLock)
 {
-if(this.closed)
+if(this.closed.Value)
 {
 return;
 }
@@ -412,7 +426,7 @@ 

[13/50] [abbrv] activemq-nms-stomp git commit: branch for future 1.5.x maintenance releases.

[tabish]

branch for future 1.5.x maintenance releases.


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

Branch: refs/heads/1.5.x
Commit: 9ece1245076edbc06d94508581a936da0f9cfb64
Parents: e87fcbd
Author: Timothy A. Bish 
Authored: Mon Jan 10 19:15:31 2011 +
Committer: Timothy A. Bish 
Committed: Mon Jan 10 19:15:31 2011 +

--
 nant.build  |  4 ++--
 package.ps1 | 60 
 2 files changed, 32 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/9ece1245/nant.build
--
diff --git a/nant.build b/nant.build
index 5ba0c72..3068a57 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/9ece1245/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index 54dc571..832b4eb 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,49 +14,49 @@
 # limitations under the License.
 
 $pkgname = "Apache.NMS.Stomp"
-$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"
 
 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\nmsprovider*.config"
-   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\nmsprovider*.config"
+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..."

[19/50] [abbrv] activemq-nms-stomp git commit: Stub out WaitHandle.WaitAny() with platform wrapper implementation in ThreadUtil.WaitAny().

[tabish]

Stub out WaitHandle.WaitAny() with platform wrapper implementation in 
ThreadUtil.WaitAny().


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

Branch: refs/heads/1.5.x
Commit: 4d2a8164f37e32520ceb90379259ad01a093da53
Parents: b615721
Author: Jim Gomes 
Authored: Mon Jan 24 21:33:43 2011 +
Committer: Jim Gomes 
Committed: Mon Jan 24 21:33:43 2011 +

--
 src/main/csharp/Util/MessageDispatchChannel.cs | 2 +-
 src/main/csharp/Util/ThreadUtil.cs | 9 +
 2 files changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/4d2a8164/src/main/csharp/Util/MessageDispatchChannel.cs
--
diff --git a/src/main/csharp/Util/MessageDispatchChannel.cs 
b/src/main/csharp/Util/MessageDispatchChannel.cs
index d2d33dc..a1d7cfc 100644
--- a/src/main/csharp/Util/MessageDispatchChannel.cs
+++ b/src/main/csharp/Util/MessageDispatchChannel.cs
@@ -170,7 +170,7 @@ namespace Apache.NMS.Stomp.Util
 {
 this.mutex.ReleaseMutex();
 this.waiter.Reset();
-WaitHandle.WaitAny(this.waiters, 
(int)timeout.TotalMilliseconds, false);
+ThreadUtil.WaitAny(this.waiters, 
(int)timeout.TotalMilliseconds, false);
 this.mutex.WaitOne();
 }
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/4d2a8164/src/main/csharp/Util/ThreadUtil.cs
--
diff --git a/src/main/csharp/Util/ThreadUtil.cs 
b/src/main/csharp/Util/ThreadUtil.cs
index c267395..c54b325 100644
--- a/src/main/csharp/Util/ThreadUtil.cs
+++ b/src/main/csharp/Util/ThreadUtil.cs
@@ -33,5 +33,14 @@ namespace Apache.NMS.Stomp.Util
 shutdownEvent.WaitOne(timeout, false);
 #endif
}
+
+   public static void WaitAny(WaitHandle[] waitHandles, int 
millisecondsTimeout, bool exitContext)
+   {
+#if NETCF
+   // TODO: Implement .NET CF version of WaitAny().
+#else
+   WaitHandle.WaitAny(waitHandles, millisecondsTimeout, exitContext);
+#endif
+   }
 }
 }

[29/50] [abbrv] activemq-nms-stomp git commit: Remove reference to non-existent file

[tabish]

Remove reference to non-existent file


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

Branch: refs/heads/1.5.x
Commit: 23302e81bbdceffb7fd5ffa641f829048de72ace
Parents: 5ccb711
Author: Timothy A. Bish 
Authored: Wed Nov 9 13:54:20 2011 +
Committer: Timothy A. Bish 
Committed: Wed Nov 9 13:54:20 2011 +

--
 vs2008-stomp.csproj | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/23302e81/vs2008-stomp.csproj
--
diff --git a/vs2008-stomp.csproj b/vs2008-stomp.csproj
index 6921324..af8ae79 100644
--- a/vs2008-stomp.csproj
+++ b/vs2008-stomp.csproj
@@ -104,7 +104,6 @@
 
 
 
-
 
 
 

[28/50] [abbrv] activemq-nms-stomp git commit: fix for: https://issues.apache.org/jira/browse/AMQNET-345

[tabish]

fix for: https://issues.apache.org/jira/browse/AMQNET-345


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

Branch: refs/heads/1.5.x
Commit: 5ccb7111e907e75ec0d3b88b063851dd0782f24e
Parents: b7a52e8
Author: Timothy A. Bish 
Authored: Thu Nov 3 23:46:52 2011 +
Committer: Timothy A. Bish 
Committed: Thu Nov 3 23:46:52 2011 +

--
 src/main/csharp/Protocol/StompFrame.cs | 113 +-
 src/main/csharp/Protocol/StompFrameStream.cs   | 124 
 src/main/csharp/Protocol/StompWireFormat.cs|  25 ++--
 src/main/csharp/Transport/InactivityMonitor.cs |   3 +-
 4 files changed, 126 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/5ccb7111/src/main/csharp/Protocol/StompFrame.cs
--
diff --git a/src/main/csharp/Protocol/StompFrame.cs 
b/src/main/csharp/Protocol/StompFrame.cs
index 52ef99b..527f298 100644
--- a/src/main/csharp/Protocol/StompFrame.cs
+++ b/src/main/csharp/Protocol/StompFrame.cs
@@ -33,10 +33,18 @@ namespace Apache.NMS.Stomp.Protocol
 public const byte FRAME_TERMINUS = (byte) 0;
 /// Used to denote a Special KeepAlive command that consists of a 
single newline.
 public const String KEEPALIVE = "KEEPALIVE";
-
+
+public const byte BREAK = (byte)('\n');
+public const byte COLON = (byte)(':');
+public const byte ESCAPE = (byte)('\\');
+public readonly byte[] ESCAPE_ESCAPE_SEQ = new byte[2]{ 92, 92 };
+public readonly byte[] COLON_ESCAPE_SEQ = new byte[2]{ 92, 99 };
+public readonly byte[] NEWLINE_ESCAPE_SEQ = new byte[2]{ 92, 110 };
+
 private string command;
 private IDictionary properties = new Hashtable();
 private byte[] content;
+private bool encodingEnabled;
 
 private readonly Encoding encoding = new UTF8Encoding();
 
@@ -44,10 +52,27 @@ namespace Apache.NMS.Stomp.Protocol
 {
 }
 
+public StompFrame(bool encodingEnabled)
+{
+this.encodingEnabled = encodingEnabled;
+}
+
 public StompFrame(string command)
 {
 this.command = command;
 }
+
+public StompFrame(string command, bool encodingEnabled)
+{
+this.command = command;
+this.encodingEnabled = encodingEnabled;
+}
+
+public bool EncodingEnabled
+{
+get { return this.encodingEnabled; }
+set { this.encodingEnabled = value; }
+}
 
 public byte[] Content
 {
@@ -152,7 +177,7 @@ namespace Apache.NMS.Stomp.Protocol
 {
 builder.Append(key);
 builder.Append(SEPARATOR);
-builder.Append(this.Properties[key] as string);
+builder.Append(EncodeHeader(this.Properties[key] as string));
 builder.Append(NEWLINE);
 }
 
@@ -205,7 +230,7 @@ namespace Apache.NMS.Stomp.Protocol
 // to store them all but for now we just throw the rest 
out.
 if(!this.properties.Contains(key))
 {
-this.properties[key] = value;
+this.properties[key] = DecodeHeader(value);
 }
 }
 else
@@ -267,6 +292,86 @@ namespace Apache.NMS.Stomp.Protocol
 
 byte[] data = ms.ToArray();
 return encoding.GetString(data, 0, data.Length);
-}
+}
+
+private String EncodeHeader(String header)
+{
+String result = header;
+if(this.encodingEnabled)
+{
+byte[] utf8buf = this.encoding.GetBytes(header);
+MemoryStream stream = new MemoryStream(utf8buf.Length);
+foreach(byte val in utf8buf)
+{
+switch(val)
+{
+case ESCAPE:
+stream.Write(ESCAPE_ESCAPE_SEQ, 0, 
ESCAPE_ESCAPE_SEQ.Length);
+break;
+case BREAK:
+stream.Write(NEWLINE_ESCAPE_SEQ, 0, 
NEWLINE_ESCAPE_SEQ.Length);
+break;
+case COLON:
+stream.Write(COLON_ESCAPE_SEQ, 0, 
COLON_ESCAPE_SEQ.Length);
+break;
+default:
+stream.WriteByte(val);

[03/50] [abbrv] activemq-nms-stomp git commit: Added inclusion of XML documentation files in ZIP package.

[tabish]

Added inclusion of XML documentation files in ZIP package.


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

Branch: refs/heads/1.2.x
Commit: 47dc8fb7d06a96801515836aa8a35d8b2c4a0c2e
Parents: 7d932d2
Author: Jim Gomes 
Authored: Fri Feb 12 21:50:23 2010 +
Committer: Jim Gomes 
Committed: Fri Feb 12 21:50:23 2010 +

--
 package.ps1 | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/47dc8fb7/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index 017c3dd..2a1ef63 100644
--- a/package.ps1
+++ b/package.ps1
@@ -39,8 +39,10 @@ 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\nmsprovider*.config"
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"

[39/50] [abbrv] activemq-nms-stomp git commit: Call Stop() on the transport layer before disposing of it to ensure that the ResponseCorrelator (and other transports) are properly cleaned up. Fixes htt

[tabish]

Call Stop() on the transport layer before disposing of it to ensure that the 
ResponseCorrelator (and other transports) are properly cleaned up.
Fixes https://issues.apache.org/jira/browse/AMQNET-395


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

Branch: refs/heads/1.5.x
Commit: ca08c348e986b870d69b1a64deb15a3de11f4627
Parents: f9535df
Author: Jim Gomes 
Authored: Thu Aug 23 23:42:36 2012 +
Committer: Jim Gomes 
Committed: Thu Aug 23 23:42:36 2012 +

--
 src/main/csharp/Connection.cs | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/ca08c348/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index 283158d..b62889e 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -443,6 +443,7 @@ namespace Apache.NMS.Stomp
 }
 
 Tracer.Info("Disposing of the Transport.");
+   transport.Stop();
 transport.Dispose();
 }
 catch(Exception ex)

[27/50] [abbrv] activemq-nms-stomp git commit: Add missing framework exists check.

[tabish]

Add missing framework exists check.


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

Branch: refs/heads/1.5.x
Commit: b7a52e8eef2b187a25580ab0057593ea895ba051
Parents: 179185b
Author: Timothy A. Bish 
Authored: Mon Oct 31 18:27:16 2011 +
Committer: Timothy A. Bish 
Committed: Mon Oct 31 18:27:16 2011 +

--
 nant-common.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/b7a52e8e/nant-common.xml
--
diff --git a/nant-common.xml b/nant-common.xml
index 5fcad45..d79bc7b 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -230,7 +230,9 @@
 
 
 
-
+
+
+
 
 
 

[47/50] [abbrv] activemq-nms-stomp git commit: Fix exception being thrown when attempting to parse an ID that does not have an embedded ProducerSequenceId. Fixes [AMQNET-492]. (See https://issues.apac

[tabish]

Fix exception being thrown when attempting to parse an ID that does not have an 
embedded ProducerSequenceId.
Fixes [AMQNET-492]. (See https://issues.apache.org/jira/browse/AMQNET-492)



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

Branch: refs/heads/1.7.x
Commit: 35d3fb6d44764c7c39d5f284204a2c51b186cbd3
Parents: 7cabda2
Author: Jim Gomes 
Authored: Wed Jul 8 22:05:36 2015 +
Committer: Jim Gomes 
Committed: Wed Jul 8 22:05:36 2015 +

--
 src/main/csharp/Commands/MessageId.cs | 73 ++
 1 file changed, 35 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/35d3fb6d/src/main/csharp/Commands/MessageId.cs
--
diff --git a/src/main/csharp/Commands/MessageId.cs 
b/src/main/csharp/Commands/MessageId.cs
index b559bc3..dd7e202 100644
--- a/src/main/csharp/Commands/MessageId.cs
+++ b/src/main/csharp/Commands/MessageId.cs
@@ -21,20 +21,19 @@ namespace Apache.NMS.Stomp.Commands
 {
 public class MessageId : BaseDataStructure
 {
-ProducerId producerId;
-long producerSequenceId;
-long brokerSequenceId;
-
+private ProducerId producerId;
+private long producerSequenceId;
+private long brokerSequenceId;
 private string key = null;
 
 public MessageId() : base()
 {
 }
 
-public MessageId(ProducerId producerId, long producerSequenceId) : 
base()
+public MessageId(ProducerId prodId, long producerSeqId) : base()
 {
-this.producerId = producerId;
-this.producerSequenceId = producerSequenceId;
+this.producerId = prodId;
+this.producerSequenceId = producerSeqId;
 }
 
 public MessageId(string value) : base()
@@ -61,12 +60,12 @@ namespace Apache.NMS.Stomp.Commands
 ///
 public override string ToString()
 {
-if( key == null )
+if(null == this.key)
 {
-key = producerId.ToString() + ":" + producerSequenceId;
+this.key = string.Format("{0}:{1}", 
this.producerId.ToString(), this.producerSequenceId);
 }
 
-return key;
+return this.key;
 }
 
 /// 
@@ -74,33 +73,42 @@ namespace Apache.NMS.Stomp.Commands
 /// 
 public void SetValue(string messageKey)
 {
-this.key = messageKey;
+string mkey = messageKey;
+
+this.key = mkey;
 
 // Parse off the sequenceId
-int p = messageKey.LastIndexOf(":");
+int p = mkey.LastIndexOf(":");
 if(p >= 0)
 {
-producerSequenceId = Int64.Parse(messageKey.Substring(p + 1));
-messageKey = messageKey.Substring(0, p);
+if(Int64.TryParse(mkey.Substring(p + 1), out 
this.producerSequenceId))
+{
+mkey = mkey.Substring(0, p);
+}
+else
+{
+this.producerSequenceId = 0;
+}
 }
-producerId = new ProducerId(messageKey);
+
+producerId = new ProducerId(mkey);
 }
 
 public ProducerId ProducerId
 {
-get { return producerId; }
+get { return this.producerId; }
 set { this.producerId = value; }
 }
 
 public long ProducerSequenceId
 {
-get { return producerSequenceId; }
+get { return this.producerSequenceId; }
 set { this.producerSequenceId = value; }
 }
 
 public long BrokerSequenceId
 {
-get { return brokerSequenceId; }
+get { return this.brokerSequenceId; }
 set { this.brokerSequenceId = value; }
 }
 
@@ -108,9 +116,9 @@ namespace Apache.NMS.Stomp.Commands
 {
 int answer = 0;
 
-answer = (answer * 37) + HashCode(ProducerId);
-answer = (answer * 37) + HashCode(ProducerSequenceId);
-answer = (answer * 37) + HashCode(BrokerSequenceId);
+answer = (answer * 37) + HashCode(this.ProducerId);
+answer = (answer * 37) + HashCode(this.ProducerSequenceId);
+answer = (answer * 37) + HashCode(this.BrokerSequenceId);
 
 return answer;
 }
@@ -121,26 +129,15 @@ namespace Apache.NMS.Stomp.Commands
 {
 return 

[09/50] [abbrv] activemq-nms-stomp git commit: fix for: https://issues.apache.org/activemq/browse/AMQNET-281

[tabish]

fix for: https://issues.apache.org/activemq/browse/AMQNET-281


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

Branch: refs/heads/1.4.x
Commit: 434a58821f8c47f74d02e99f5359e247dbfcd960
Parents: 88513eb
Author: Timothy A. Bish 
Authored: Thu Sep 9 20:39:04 2010 +
Committer: Timothy A. Bish 
Committed: Thu Sep 9 20:39:04 2010 +

--
 src/main/csharp/ConnectionFactory.cs| 8 ++--
 src/test/csharp/NMSConnectionFactoryTest.cs | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/434a5882/src/main/csharp/ConnectionFactory.cs
--
diff --git a/src/main/csharp/ConnectionFactory.cs 
b/src/main/csharp/ConnectionFactory.cs
index ae2e3bd..608fa21 100755
--- a/src/main/csharp/ConnectionFactory.cs
+++ b/src/main/csharp/ConnectionFactory.cs
@@ -160,9 +160,13 @@ namespace Apache.NMS.Stomp
 {
 brokerUri = new 
Uri(URISupport.StripPrefix(value.OriginalString, "stomp:"));
 
-if(brokerUri.Query != null)
+if(!String.IsNullOrEmpty(brokerUri.Query) && 
!brokerUri.OriginalString.EndsWith(")"))
 {
-StringDictionary properties = 
URISupport.ParseQuery(brokerUri.Query);
+// Since the Uri class will return the end of a Query 
string found in a Composite
+// URI we must ensure that we trim that off before we 
proceed.
+string query = 
brokerUri.Query.Substring(brokerUri.Query.LastIndexOf(")") + 1);
+
+StringDictionary properties = URISupport.ParseQuery(query);
 
 StringDictionary connection = 
URISupport.ExtractProperties(properties, "connection.");
 StringDictionary nms = 
URISupport.ExtractProperties(properties, "nms.");

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/434a5882/src/test/csharp/NMSConnectionFactoryTest.cs
--
diff --git a/src/test/csharp/NMSConnectionFactoryTest.cs 
b/src/test/csharp/NMSConnectionFactoryTest.cs
index 42c3842..238b0b9 100755
--- a/src/test/csharp/NMSConnectionFactoryTest.cs
+++ b/src/test/csharp/NMSConnectionFactoryTest.cs
@@ -28,6 +28,8 @@ namespace Apache.NMS.Stomp.Test
 [Test]
 #if !NETCF
 [TestCase("stomp:tcp://${activemqhost}:61613")]
+
[TestCase("stomp:failover:(tcp://${activemqhost}:61616?keepAlive=false=1000)")]
+
[TestCase("stomp:failover:(tcp://${activemqhost}:61616?keepAlive=false=1000)?connection.asyncSend=false")]

[TestCase("stomp:tcp://${activemqhost}:61613?connection.asyncsend=false")]

[TestCase("stomp:tcp://${activemqhost}:61613?connection.InvalidParameter=true", 
ExpectedException = typeof(NMSConnectionException))]

[TestCase("stomp:tcp://${activemqhost}:61613?connection.InvalidParameter=true", 
ExpectedException = typeof(NMSConnectionException))]

[44/50] [abbrv] activemq-nms-stomp git commit: Clean the individual configurations. Fixes [AMQNET-486]. (See https://issues.apache.org/jira/browse/AMQNET-486)

[tabish]

Clean the individual configurations.
Fixes [AMQNET-486]. (See https://issues.apache.org/jira/browse/AMQNET-486)



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

Branch: refs/heads/1.6.x
Commit: 3c7acacab8af0fbb26a16e74d5d6be7c37b1d872
Parents: f895eff
Author: Jim Gomes 
Authored: Wed Aug 6 01:05:35 2014 +
Committer: Jim Gomes 
Committed: Wed Aug 6 01:05:35 2014 +

--
 nant-common.xml | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/3c7acaca/nant-common.xml
--
diff --git a/nant-common.xml b/nant-common.xml
index be40af6..55694f9 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -506,9 +506,18 @@
 
 
 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

[activemq-nms-stomp] Git Push Summary

[tabish]

Repository: activemq-nms-stomp
Updated Tags:  refs/tags/1.2.0 [created] 336c99763
  refs/tags/1.2.0-RC1 [created] 7e2ff28ae
  refs/tags/1.3.0 [created] f487daadb
  refs/tags/1.3.0-RC1 [created] e7270
  refs/tags/1.4.0 [created] 2d0f35cef
  refs/tags/1.5.0 [created] bfa665776
  refs/tags/1.5.1 [created] 92b080ac9
  refs/tags/1.5.2 [created] 3acff911c
  refs/tags/1.5.3 [created] f653b61c6
  refs/tags/1.5.4 [created] 3271037c9
  refs/tags/1.7.1 [created] 40695b128

[35/50] [abbrv] activemq-nms-stomp git commit: Fix compile for .NET-CF 2.0. Fixes https://issues.apache.org/jira/browse/AMQNET-394

[tabish]

Fix compile for .NET-CF 2.0.  Fixes 
https://issues.apache.org/jira/browse/AMQNET-394


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

Branch: refs/heads/1.5.x
Commit: e15675c137961695510abb87cd6ce259e09b94ed
Parents: fd6ddc4
Author: Jim Gomes 
Authored: Mon Aug 20 18:13:06 2012 +
Committer: Jim Gomes 
Committed: Mon Aug 20 18:13:06 2012 +

--
 src/main/csharp/Connection.cs | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/e15675c1/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index ba3ccd3..45e03ec 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -682,8 +682,10 @@ namespace Apache.NMS.Stomp
 }
 }
 
-Tracer.Error("No such consumer active: " + dispatch.ConsumerId);
-transport.Oneway(new RemoveInfo() { ObjectId = dispatch.ConsumerId 
});
+Tracer.Error("No such consumer active: {0}.  Removing...", 
dispatch.ConsumerId);
+RemoveInfo info  = new RemoveInfo();
+info.ObjectId = dispatch.ConsumerId;
+transport.Oneway(info);
 }
 
 protected void OnTransportException(ITransport sender, Exception 
exception)

[24/50] [abbrv] activemq-nms-stomp git commit: Add support for transport timeout while waiting for mutex lock. Fixes [AMQNET-330]. (See https://issues.apache.org/activemq/browse/AMQNET-330)

[tabish]

Add support for transport timeout while waiting for mutex lock.
Fixes [AMQNET-330]. (See https://issues.apache.org/activemq/browse/AMQNET-330)



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

Branch: refs/heads/1.5.x
Commit: 67916c249ec3dff2ed1da77849e70d8d9a9fe55e
Parents: 1f46042
Author: Jim Gomes 
Authored: Tue Jun 14 22:36:38 2011 +
Committer: Jim Gomes 
Committed: Tue Jun 14 22:36:38 2011 +

--
 .../Transport/Failover/FailoverTransport.cs | 13 -
 src/main/csharp/Transport/ITransport.cs | 20 
 src/main/csharp/Transport/MutexTransport.cs | 54 +---
 src/main/csharp/Transport/Tcp/TcpTransport.cs   | 24 -
 src/main/csharp/Transport/TransportFilter.cs| 20 
 vs2008-stomp-test.csproj| 14 +++--
 6 files changed, 132 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/67916c24/src/main/csharp/Transport/Failover/FailoverTransport.cs
--
diff --git a/src/main/csharp/Transport/Failover/FailoverTransport.cs 
b/src/main/csharp/Transport/Failover/FailoverTransport.cs
index 4d4d0ff..12c23af 100644
--- a/src/main/csharp/Transport/Failover/FailoverTransport.cs
+++ b/src/main/csharp/Transport/Failover/FailoverTransport.cs
@@ -55,6 +55,7 @@ namespace Apache.NMS.Stomp.Transport.Failover
 private bool started;
 
 private int timeout = -1;
+   private int asyncTimeout = 45000;
 private int initialReconnectDelay = 10;
 private int maxReconnectDelay = 1000 * 30;
 private int backOffMultiplier = 2;
@@ -217,7 +218,17 @@ namespace Apache.NMS.Stomp.Transport.Failover
 
 #endregion
 
-public bool IsFaultTolerant
+   /// 
+   /// If doing an asynchronous connect, the milliseconds before 
timing out if no connection can be made
+   /// 
+   /// The async timeout.
+   public int AsyncTimeout
+   {
+   get { return asyncTimeout; }
+   set { asyncTimeout = value; }
+   }
+
+   public bool IsFaultTolerant
 {
 get { return true; }
 }

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/67916c24/src/main/csharp/Transport/ITransport.cs
--
diff --git a/src/main/csharp/Transport/ITransport.cs 
b/src/main/csharp/Transport/ITransport.cs
index 2d7f7a7..1e60307 100755
--- a/src/main/csharp/Transport/ITransport.cs
+++ b/src/main/csharp/Transport/ITransport.cs
@@ -70,6 +70,26 @@ namespace Apache.NMS.Stomp.Transport
 /// 
 Object Narrow(Type type);
 
+   /// 
+   /// Timeout in milliseconds to wait for sending synchronous 
messages or commands.
+   /// Set to -1 for infinite timeout.
+   /// 
+   int Timeout
+   {
+   get;
+   set;
+   }
+
+   /// 
+   /// Timeout in milliseconds to wait for sending asynchronous 
messages or commands.
+   /// Set to -1 for infinite timeout.
+   /// 
+   int AsyncTimeout
+   {
+   get;
+   set;
+   }
+
CommandHandler Command
{
get;

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/67916c24/src/main/csharp/Transport/MutexTransport.cs
--
diff --git a/src/main/csharp/Transport/MutexTransport.cs 
b/src/main/csharp/Transport/MutexTransport.cs
index 7fe6134..c5cbc31 100644
--- a/src/main/csharp/Transport/MutexTransport.cs
+++ b/src/main/csharp/Transport/MutexTransport.cs
@@ -14,44 +14,86 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-using Apache.NMS.Stomp.Commands;
 using System;
+using System.Threading;
+using Apache.NMS.Stomp.Commands;
 
 namespace Apache.NMS.Stomp.Transport
 {
-   /// 
/// A Transport which guards access to the next transport using a mutex.
/// 
public class MutexTransport : TransportFilter
{
private readonly object transmissionLock = new object();
 
+   private void GetTransmissionLock(int timeout)
+   {
+ 

[49/50] [abbrv] activemq-nms-stomp git commit: Update to Apache.NMS 1.7.2.

[tabish]

Update to Apache.NMS 1.7.2.


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

Branch: refs/heads/1.7.x
Commit: 62709583077101ef0842f5902a01fc5c0e8503eb
Parents: 35d3fb6
Author: Jim Gomes 
Authored: Fri Dec 11 19:48:37 2015 +
Committer: Jim Gomes 
Committed: Fri Dec 11 19:48:37 2015 +

--
 nant.build  | 4 ++--
 package.ps1 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/62709583/nant.build
--
diff --git a/nant.build b/nant.build
index 5b3a667..4ed1a32 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/62709583/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index dec6a78..8a558e4 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 $pkgname = "Apache.NMS.Stomp"
-$pkgver = "1.6-SNAPSHOT"
+$pkgver = "1.7-SNAPSHOT"
 $configurations = "release", "debug"
 $frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0"
 

[46/50] [abbrv] activemq-nms-stomp git commit: Branch NMS.Stomp trunk to 1.7.x, using NMS API 1.7.1. Update trunk to 1.8.0.

[tabish]

Branch NMS.Stomp trunk to 1.7.x, using NMS API 1.7.1. Update trunk to 1.8.0.


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

Branch: refs/heads/1.7.x
Commit: 7cabda2212bae41e249ad2c5843fd0da5706b433
Parents: 52e49cc
Author: Jim Gomes 
Authored: Tue Jul 7 20:26:21 2015 +
Committer: Jim Gomes 
Committed: Tue Jul 7 20:26:21 2015 +

--
 nant.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/7cabda22/nant.build
--
diff --git a/nant.build b/nant.build
index 0966e76..5b3a667 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 

[22/50] [abbrv] activemq-nms-stomp git commit: Move versioning forward to 1.5.2-SNAPSHOT

[tabish]

Move versioning forward to 1.5.2-SNAPSHOT


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

Branch: refs/heads/1.5.x
Commit: d7ef00e842d9d0bf5491e7467dadcd52c08ece64
Parents: d64215a
Author: Timothy A. Bish 
Authored: Wed Jan 26 23:14:41 2011 +
Committer: Timothy A. Bish 
Committed: Wed Jan 26 23:14:41 2011 +

--
 nant.build  | 4 ++--
 package.ps1 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/d7ef00e8/nant.build
--
diff --git a/nant.build b/nant.build
index 3068a57..087e10f 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/d7ef00e8/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index 832b4eb..bfa1448 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 $pkgname = "Apache.NMS.Stomp"
-$pkgver = "1.5.1-SNAPSHOT"
+$pkgver = "1.5.2-SNAPSHOT"
 $configurations = "release", "debug"
 $frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0"
 

[42/50] [abbrv] activemq-nms-stomp git commit: bump versions to 1.5.5-SNAPSHOT

[tabish]

bump versions to 1.5.5-SNAPSHOT


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

Branch: refs/heads/1.5.x
Commit: 77473f8ec391a9f61e93969276958c251c3d4404
Parents: 5a67518
Author: Timothy A. Bish 
Authored: Mon Oct 21 15:07:35 2013 +
Committer: Timothy A. Bish 
Committed: Mon Oct 21 15:07:35 2013 +

--
 nant.build  | 2 +-
 package.ps1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/77473f8e/nant.build
--
diff --git a/nant.build b/nant.build
index 176493b..ab0da78 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/77473f8e/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index 9904fd5..8fc7ba1 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 $pkgname = "Apache.NMS.Stomp"
-$pkgver = "1.5.4-SNAPSHOT"
+$pkgver = "1.5.5-SNAPSHOT"
 $configurations = "release", "debug"
 $frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0"
 

[16/50] [abbrv] activemq-nms-stomp git commit: fix for: https://issues.apache.org/jira/browse/AMQNET-310

[tabish]

fix for: https://issues.apache.org/jira/browse/AMQNET-310


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

Branch: refs/heads/1.5.x
Commit: 836e216d7ef8e1cc21bf4679b80ff9e2ec0a3083
Parents: ce876d0
Author: Timothy A. Bish 
Authored: Sun Jan 23 16:45:41 2011 +
Committer: Timothy A. Bish 
Committed: Sun Jan 23 16:45:41 2011 +

--
 src/main/csharp/Session.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/836e216d/src/main/csharp/Session.cs
--
diff --git a/src/main/csharp/Session.cs b/src/main/csharp/Session.cs
index f37d738..6770283 100755
--- a/src/main/csharp/Session.cs
+++ b/src/main/csharp/Session.cs
@@ -784,7 +784,7 @@ namespace Apache.NMS.Stomp
 
 lock(this.consumers.SyncRoot)
 {
-foreach(MessageConsumer consumer in this.consumers)
+foreach(MessageConsumer consumer in this.consumers.Values)
 {
 consumer.InProgressClearRequired();
 ThreadPool.QueueUserWorkItem(ClearMessages, consumer);

[18/50] [abbrv] activemq-nms-stomp git commit: fix for: https://issues.apache.org/jira/browse/AMQNET-311

[tabish]

fix for: https://issues.apache.org/jira/browse/AMQNET-311


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

Branch: refs/heads/1.5.x
Commit: b615721fa71b2926aa25b047b5336f5fd0657e76
Parents: 419f24f
Author: Timothy A. Bish 
Authored: Mon Jan 24 16:01:01 2011 +
Committer: Timothy A. Bish 
Committed: Mon Jan 24 16:01:01 2011 +

--
 src/main/csharp/Transport/Tcp/SslTransport.cs | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/b615721f/src/main/csharp/Transport/Tcp/SslTransport.cs
--
diff --git a/src/main/csharp/Transport/Tcp/SslTransport.cs 
b/src/main/csharp/Transport/Tcp/SslTransport.cs
index d1fcf51..bba9c6f 100644
--- a/src/main/csharp/Transport/Tcp/SslTransport.cs
+++ b/src/main/csharp/Transport/Tcp/SslTransport.cs
@@ -244,6 +244,7 @@ namespace Apache.NMS.Stomp.Transport.Tcp
 }
 
 X509Store store = new X509Store(name, location);
+store.Open(OpenFlags.ReadOnly);
 collection = store.Certificates;
 store.Close();
 }

[43/50] [abbrv] activemq-nms-stomp git commit: Branch 1.6.x version.

[tabish]

Branch 1.6.x version.


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

Branch: refs/heads/1.6.x
Commit: f895efff9d97b6a77567779bcf527cf6cc49e3ae
Parents: 20b8cc2
Author: Jim Gomes 
Authored: Wed Mar 12 23:30:27 2014 +
Committer: Jim Gomes 
Committed: Wed Mar 12 23:30:27 2014 +

--

--

[11/50] [abbrv] activemq-nms-stomp git commit: https://issues.apache.org/activemq/browse/AMQNET-281

[tabish]

https://issues.apache.org/activemq/browse/AMQNET-281

Fix error in CreateSession URI parsing


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

Branch: refs/heads/1.4.x
Commit: 4a6b1b481a2e68a9d3d8a06a9a77111d122455c9
Parents: e7bba28
Author: Timothy A. Bish 
Authored: Thu Sep 23 20:06:46 2010 +
Committer: Timothy A. Bish 
Committed: Thu Sep 23 20:06:46 2010 +

--
 src/main/csharp/Connection.cs | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/4a6b1b48/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index 75aa5ed..00840bc 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -359,9 +359,15 @@ namespace Apache.NMS.Stomp
 Session session = new Session(this, info, 
sessionAcknowledgementMode, this.dispatchAsync);
 
 // Set properties on session using parameters prefixed with 
"session."
-StringDictionary options = 
URISupport.ParseQuery(this.brokerUri.Query);
-options = URISupport.GetProperties(options, "session.");
-URISupport.SetProperties(session, options);
+if(!String.IsNullOrEmpty(brokerUri.Query) && 
!brokerUri.OriginalString.EndsWith(")"))
+{
+// Since the Uri class will return the end of a Query string 
found in a Composite
+// URI we must ensure that we trim that off before we proceed.
+string query = 
brokerUri.Query.Substring(brokerUri.Query.LastIndexOf(")") + 1);
+StringDictionary options = URISupport.ParseQuery(query);
+options = URISupport.GetProperties(options, "session.");
+URISupport.SetProperties(session, options);
+}
 
 session.ConsumerTransformer = this.ConsumerTransformer;
 session.ProducerTransformer = this.ProducerTransformer;

[06/50] [abbrv] activemq-nms-stomp git commit: Update build and package files with 1.3.x version no.

[tabish]

Update build and package files with 1.3.x version no.


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

Branch: refs/heads/1.3.x
Commit: 7e3beeb6bbd289488667ed98829f2cb5fd1418d5
Parents: 14e5920
Author: Timothy A. Bish 
Authored: Mon May 24 21:15:02 2010 +
Committer: Timothy A. Bish 
Committed: Mon May 24 21:15:02 2010 +

--
 nant.build  |  2 +-
 package.ps1 | 60 
 2 files changed, 31 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/7e3beeb6/nant.build
--
diff --git a/nant.build b/nant.build
index 766e085..067ec50 100644
--- a/nant.build
+++ b/nant.build
@@ -22,7 +22,7 @@
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/7e3beeb6/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index 2b14cbb..79667e1 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,49 +14,49 @@
 # limitations under the License.
 
 $pkgname = "Apache.NMS.Stomp"
-$pkgver = "1.2.0"
+$pkgver = "1.3.x-SNAPSHOT"
 $configurations = "release", "debug"
 $frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0"
 
 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\nmsprovider*.config"
-   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\nmsprovider*.config"
+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..."

[04/50] [abbrv] activemq-nms-stomp git commit: https://issues.apache.org/activemq/browse/AMQNET-245

[tabish]

https://issues.apache.org/activemq/browse/AMQNET-245

Added encode of timestamp field.  Removed default init of timestamp in Message 
class.


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

Branch: refs/heads/1.2.x
Commit: ddd11a496cf71197bd1e481d2b459d426cdb8da3
Parents: 47dc8fb
Author: Timothy A. Bish 
Authored: Tue Mar 30 13:38:57 2010 +
Committer: Timothy A. Bish 
Committed: Tue Mar 30 13:38:57 2010 +

--
 src/main/csharp/Commands/Message.cs | 1 -
 src/main/csharp/Protocol/StompWireFormat.cs | 4 
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/ddd11a49/src/main/csharp/Commands/Message.cs
--
diff --git a/src/main/csharp/Commands/Message.cs 
b/src/main/csharp/Commands/Message.cs
index dd2aebf..d7e8679 100644
--- a/src/main/csharp/Commands/Message.cs
+++ b/src/main/csharp/Commands/Message.cs
@@ -39,7 +39,6 @@ namespace Apache.NMS.Stomp.Commands
 
 public Message() : base()
 {
-Timestamp = DateUtils.ToJavaTimeUtc(DateTime.UtcNow);
 }
 
 public override byte GetDataStructureType()

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/ddd11a49/src/main/csharp/Protocol/StompWireFormat.cs
--
diff --git a/src/main/csharp/Protocol/StompWireFormat.cs 
b/src/main/csharp/Protocol/StompWireFormat.cs
index eaf0caa..44f3d9b 100644
--- a/src/main/csharp/Protocol/StompWireFormat.cs
+++ b/src/main/csharp/Protocol/StompWireFormat.cs
@@ -306,6 +306,10 @@ namespace Apache.NMS.Stomp.Protocol
 {
 frame.SetProperty("expires", command.Expiration);
 }
+if(command.Timestamp != 0)
+{
+frame.SetProperty("timestamp", command.Timestamp);
+}
 if(command.Priority != 4)
 {
 frame.SetProperty("priority", command.Priority);

[38/50] [abbrv] activemq-nms-stomp git commit: update the NMS lib dependency to the latest release.

[tabish]

update the NMS lib dependency to the latest release. 


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

Branch: refs/heads/1.5.x
Commit: f9535dfbe4d601a68370bb33fdc0abe67974ade8
Parents: e106d93
Author: Timothy A. Bish 
Authored: Wed Aug 22 21:23:16 2012 +
Committer: Timothy A. Bish 
Committed: Wed Aug 22 21:23:16 2012 +

--
 nant.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/f9535dfb/nant.build
--
diff --git a/nant.build b/nant.build
index 2806560..45a29ac 100644
--- a/nant.build
+++ b/nant.build
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 

[41/50] [abbrv] activemq-nms-stomp git commit: apply suggested fix for: https://issues.apache.org/jira/browse/AMQNET-411

[tabish]

apply suggested fix for: https://issues.apache.org/jira/browse/AMQNET-411


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

Branch: refs/heads/1.5.x
Commit: 5a6751844a63f507ab7dd6a208f98bf243958abd
Parents: 5ba89b3
Author: Timothy A. Bish 
Authored: Wed May 15 20:23:13 2013 +
Committer: Timothy A. Bish 
Committed: Wed May 15 20:23:13 2013 +

--
 src/main/csharp/Protocol/StompWireFormat.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/5a675184/src/main/csharp/Protocol/StompWireFormat.cs
--
diff --git a/src/main/csharp/Protocol/StompWireFormat.cs 
b/src/main/csharp/Protocol/StompWireFormat.cs
index bf6e278..8412d6e 100644
--- a/src/main/csharp/Protocol/StompWireFormat.cs
+++ b/src/main/csharp/Protocol/StompWireFormat.cs
@@ -20,6 +20,7 @@ using Apache.NMS.Util;
 using System;
 using System.IO;
 using System.Text;
+using System.Globalization;
 
 namespace Apache.NMS.Stomp.Protocol
 {
@@ -196,7 +197,8 @@ namespace Apache.NMS.Stomp.Protocol
 
 if(frame.HasProperty("version"))
 {
-remoteWireFormatInfo.Version = 
Single.Parse(frame.RemoveProperty("version"));
+remoteWireFormatInfo.Version = Single.Parse(
+frame.RemoveProperty("version"), 
CultureInfo.InvariantCulture);
 
 if(remoteWireFormatInfo.Version > 1.0f)
 {

[21/50] [abbrv] activemq-nms-stomp git commit: Merged

[tabish]

Merged

fix for: https://issues.apache.org/jira/browse/AMQNET-314
fix for: https://issues.apache.org/jira/browse/AMQNET-313


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

Branch: refs/heads/1.5.x
Commit: d64215a29420cf611127a25768c51bb03eb7029a
Parents: c036806
Author: Timothy A. Bish 
Authored: Wed Jan 26 22:52:30 2011 +
Committer: Timothy A. Bish 
Committed: Wed Jan 26 22:52:30 2011 +

--
 src/main/csharp/MessageConsumer.cs | 19 ---
 src/main/csharp/Session.cs |  1 +
 2 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/d64215a2/src/main/csharp/MessageConsumer.cs
--
diff --git a/src/main/csharp/MessageConsumer.cs 
b/src/main/csharp/MessageConsumer.cs
index 27c8b2f..0d0885e 100755
--- a/src/main/csharp/MessageConsumer.cs
+++ b/src/main/csharp/MessageConsumer.cs
@@ -55,8 +55,8 @@ namespace Apache.NMS.Stomp
 private bool inProgressClearRequiredFlag;
 
 private event MessageListener listener;
-
 private IRedeliveryPolicy redeliveryPolicy;
+private Exception failureError;
 
 // Constructor internal to prevent clients from creating an instance.
 internal MessageConsumer(Session session, ConsumerInfo info)
@@ -534,7 +534,14 @@ namespace Apache.NMS.Stomp
 }
 else
 {
-return null;
+if(this.failureError != null)
+{
+throw NMSExceptionSupport.Create(FailureError);
+}
+else
+{
+return null;
+}
 }
 }
 else if(dispatch.Message == null)
@@ -878,10 +885,16 @@ namespace Apache.NMS.Stomp
 {
 if(this.listener != null)
 {
-throw new NMSException("Cannot set Async listeners on 
Consumers with a prefetch limit of zero");
+throw new NMSException("Cannot perform a Synchronous Receive 
when there is a registered asynchronous listener.");
 }
 }
 
+public Exception FailureError
+{
+get { return this.failureError; }
+set { this.failureError = value; }
+}
+
 #region Nested ISyncronization Types
 
 class MessageConsumerSynchronization : ISynchronization

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/d64215a2/src/main/csharp/Session.cs
--
diff --git a/src/main/csharp/Session.cs b/src/main/csharp/Session.cs
index 6770283..63ed02d 100755
--- a/src/main/csharp/Session.cs
+++ b/src/main/csharp/Session.cs
@@ -303,6 +303,7 @@ namespace Apache.NMS.Stomp
 {
 foreach(MessageConsumer consumer in consumers.Values)
 {
+consumer.FailureError = 
this.connection.FirstFailureError;
 consumer.DoClose();
 }
 }

[31/50] [abbrv] activemq-nms-stomp git commit: Trigger the fault tolerant recovery logic when a connection exception occurs. Fixes [AMQNET-371]. (See https://issues.apache.org/jira/browse/AMQNET-371)

[tabish]

Trigger the fault tolerant recovery logic when a connection exception occurs.
Fixes [AMQNET-371]. (See https://issues.apache.org/jira/browse/AMQNET-371)



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

Branch: refs/heads/1.5.x
Commit: 07cda020cd8a26bdb1e97c402344a86991140289
Parents: 8e02b74
Author: Jim Gomes 
Authored: Tue Feb 28 23:42:51 2012 +
Committer: Jim Gomes 
Committed: Tue Feb 28 23:42:51 2012 +

--
 src/main/csharp/Connection.cs | 25 +++--
 1 file changed, 19 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/07cda020/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index 4ca6aa5..16f664a 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -721,14 +721,27 @@ namespace Apache.NMS.Stomp
 
 internal void OnException(Exception error)
 {
-// Will fire an exception listener callback if there's any set.
-OnAsyncException(error);
+if(this.transport.IsFaultTolerant)
+{
+Tracer.ErrorFormat("Attempting recovery from Exception: {0}", 
error.Message);
+while(null != (error = error.InnerException))
+{
+Tracer.ErrorFormat("   {0}", error.Message);
+}
 
-if(!this.closing.Value && !this.closed.Value)
+OnTransportInterrupted(this.transport);
+}
+else
 {
-// Perform the actual work in another thread to avoid lock 
contention
-// and allow the caller to continue on in its error cleanup.
-executor.QueueUserWorkItem(AsyncOnExceptionHandler, error);
+// Will fire an exception listener callback if there's any set.
+OnAsyncException(error);
+
+if(!this.closing.Value && !this.closed.Value)
+{
+// Perform the actual work in another thread to avoid lock 
contention
+// and allow the caller to continue on in its error 
cleanup.
+executor.QueueUserWorkItem(AsyncOnExceptionHandler, error);
+}
 }
 }
 

[33/50] [abbrv] activemq-nms-stomp git commit: fix for: https://issues.apache.org/jira/browse/AMQNET-383

[tabish]

fix for: https://issues.apache.org/jira/browse/AMQNET-383


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

Branch: refs/heads/1.5.x
Commit: fa16a5705710661c9d6c2b1338097d9d4b45bc8e
Parents: bbe5c99
Author: Timothy A. Bish 
Authored: Wed Aug 1 14:04:51 2012 +
Committer: Timothy A. Bish 
Committed: Wed Aug 1 14:04:51 2012 +

--
 src/main/csharp/Protocol/StompFrame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/fa16a570/src/main/csharp/Protocol/StompFrame.cs
--
diff --git a/src/main/csharp/Protocol/StompFrame.cs 
b/src/main/csharp/Protocol/StompFrame.cs
index 527f298..f98b4c9 100644
--- a/src/main/csharp/Protocol/StompFrame.cs
+++ b/src/main/csharp/Protocol/StompFrame.cs
@@ -163,7 +163,7 @@ namespace Apache.NMS.Stomp.Protocol
 {
 if(this.Command == KEEPALIVE)
 {
-dataOut.Write(NEWLINE);
+dataOut.Write(BREAK);
 dataOut.Flush();
 return;
 }

[23/50] [abbrv] activemq-nms-stomp git commit: fix for: https://issues.apache.org/jira/browse/AMQNET-315

[tabish]

fix for: https://issues.apache.org/jira/browse/AMQNET-315


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

Branch: refs/heads/1.5.x
Commit: 1f4604244f7f00a68ab7d3454d71f4a958eafe08
Parents: d7ef00e
Author: Timothy A. Bish 
Authored: Sun Feb 6 23:50:25 2011 +
Committer: Timothy A. Bish 
Committed: Sun Feb 6 23:50:25 2011 +

--
 src/main/csharp/Protocol/StompFrame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/1f460424/src/main/csharp/Protocol/StompFrame.cs
--
diff --git a/src/main/csharp/Protocol/StompFrame.cs 
b/src/main/csharp/Protocol/StompFrame.cs
index 1b0f542..52ef99b 100644
--- a/src/main/csharp/Protocol/StompFrame.cs
+++ b/src/main/csharp/Protocol/StompFrame.cs
@@ -232,7 +232,7 @@ namespace Apache.NMS.Stomp.Protocol
 {
 MemoryStream ms = new MemoryStream();
 int nextChar;
-while((nextChar = dataIn.Read()) != 0)
+while((nextChar = dataIn.ReadByte()) != 0)
 {
 // The first Null in this case marks the end of data.
 if(nextChar < 0)

[37/50] [abbrv] activemq-nms-stomp git commit: Reimplement fix for zombie consumers to update the failover state tracker. Fixes https://issues.apache.org/jira/browse/AMQNET-394

[tabish]

Reimplement fix for zombie consumers to update the failover state tracker.
Fixes https://issues.apache.org/jira/browse/AMQNET-394


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

Branch: refs/heads/1.5.x
Commit: e106d93ed962458a53146b40c55cf9a70e224ef2
Parents: a15a3fd
Author: Jim Gomes 
Authored: Mon Aug 20 22:53:27 2012 +
Committer: Jim Gomes 
Committed: Mon Aug 20 22:53:27 2012 +

--
 src/main/csharp/Connection.cs   | 5 +
 src/main/csharp/Transport/Failover/FailoverTransport.cs | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/e106d93e/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index 1ccb6de..283158d 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -682,10 +682,7 @@ namespace Apache.NMS.Stomp
 }
 }
 
-Tracer.ErrorFormat("No such consumer active: {0}.  Removing...", 
dispatch.ConsumerId);
-RemoveInfo info  = new RemoveInfo();
-info.ObjectId = dispatch.ConsumerId;
-transport.Oneway(info);
+Tracer.ErrorFormat("No such consumer active: {0}.", 
dispatch.ConsumerId);
 }
 
 protected void OnTransportException(ITransport sender, Exception 
exception)

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/e106d93e/src/main/csharp/Transport/Failover/FailoverTransport.cs
--
diff --git a/src/main/csharp/Transport/Failover/FailoverTransport.cs 
b/src/main/csharp/Transport/Failover/FailoverTransport.cs
index 12c23af..b4ab1ff 100644
--- a/src/main/csharp/Transport/Failover/FailoverTransport.cs
+++ b/src/main/csharp/Transport/Failover/FailoverTransport.cs
@@ -450,6 +450,7 @@ namespace Apache.NMS.Stomp.Transport.Failover
 
 if(command.IsRemoveInfo)
 {
+stateTracker.track(command);
 // Simulate response to RemoveInfo command
 Response response = new Response();
 response.CorrelationId = command.CommandId;

[48/50] [abbrv] activemq-nms-stomp git commit: Merged revision(s) 1689971 from activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.7.x: Fix exception being thrown when attempting to parse an ID that

[tabish]

Merged revision(s) 1689971 from 
activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.7.x:
Fix exception being thrown when attempting to parse an ID that does not have an 
embedded ProducerSequenceId.
Fixes [AMQNET-492]. (See https://issues.apache.org/jira/browse/AMQNET-492)


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

Branch: refs/heads/master
Commit: 7c891b7e237d9ab7eb24f2016466dc20690d6663
Parents: 1081666
Author: Jim Gomes 
Authored: Wed Jul 8 22:06:54 2015 +
Committer: Jim Gomes 
Committed: Wed Jul 8 22:06:54 2015 +

--
 src/main/csharp/Commands/MessageId.cs | 73 ++
 1 file changed, 35 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/7c891b7e/src/main/csharp/Commands/MessageId.cs
--
diff --git a/src/main/csharp/Commands/MessageId.cs 
b/src/main/csharp/Commands/MessageId.cs
index b559bc3..dd7e202 100644
--- a/src/main/csharp/Commands/MessageId.cs
+++ b/src/main/csharp/Commands/MessageId.cs
@@ -21,20 +21,19 @@ namespace Apache.NMS.Stomp.Commands
 {
 public class MessageId : BaseDataStructure
 {
-ProducerId producerId;
-long producerSequenceId;
-long brokerSequenceId;
-
+private ProducerId producerId;
+private long producerSequenceId;
+private long brokerSequenceId;
 private string key = null;
 
 public MessageId() : base()
 {
 }
 
-public MessageId(ProducerId producerId, long producerSequenceId) : 
base()
+public MessageId(ProducerId prodId, long producerSeqId) : base()
 {
-this.producerId = producerId;
-this.producerSequenceId = producerSequenceId;
+this.producerId = prodId;
+this.producerSequenceId = producerSeqId;
 }
 
 public MessageId(string value) : base()
@@ -61,12 +60,12 @@ namespace Apache.NMS.Stomp.Commands
 ///
 public override string ToString()
 {
-if( key == null )
+if(null == this.key)
 {
-key = producerId.ToString() + ":" + producerSequenceId;
+this.key = string.Format("{0}:{1}", 
this.producerId.ToString(), this.producerSequenceId);
 }
 
-return key;
+return this.key;
 }
 
 /// 
@@ -74,33 +73,42 @@ namespace Apache.NMS.Stomp.Commands
 /// 
 public void SetValue(string messageKey)
 {
-this.key = messageKey;
+string mkey = messageKey;
+
+this.key = mkey;
 
 // Parse off the sequenceId
-int p = messageKey.LastIndexOf(":");
+int p = mkey.LastIndexOf(":");
 if(p >= 0)
 {
-producerSequenceId = Int64.Parse(messageKey.Substring(p + 1));
-messageKey = messageKey.Substring(0, p);
+if(Int64.TryParse(mkey.Substring(p + 1), out 
this.producerSequenceId))
+{
+mkey = mkey.Substring(0, p);
+}
+else
+{
+this.producerSequenceId = 0;
+}
 }
-producerId = new ProducerId(messageKey);
+
+producerId = new ProducerId(mkey);
 }
 
 public ProducerId ProducerId
 {
-get { return producerId; }
+get { return this.producerId; }
 set { this.producerId = value; }
 }
 
 public long ProducerSequenceId
 {
-get { return producerSequenceId; }
+get { return this.producerSequenceId; }
 set { this.producerSequenceId = value; }
 }
 
 public long BrokerSequenceId
 {
-get { return brokerSequenceId; }
+get { return this.brokerSequenceId; }
 set { this.brokerSequenceId = value; }
 }
 
@@ -108,9 +116,9 @@ namespace Apache.NMS.Stomp.Commands
 {
 int answer = 0;
 
-answer = (answer * 37) + HashCode(ProducerId);
-answer = (answer * 37) + HashCode(ProducerSequenceId);
-answer = (answer * 37) + HashCode(BrokerSequenceId);
+answer = (answer * 37) + HashCode(this.ProducerId);
+answer = (answer * 37) + HashCode(this.ProducerSequenceId);
+answer = (answer * 37) + HashCode(this.BrokerSequenceId);
 
 return answer;
 }
@@ -121,26 

[17/50] [abbrv] activemq-nms-stomp git commit: fix for: https://issues.apache.org/jira/browse/AMQNET-311

[tabish]

fix for: https://issues.apache.org/jira/browse/AMQNET-311


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

Branch: refs/heads/1.5.x
Commit: 419f24f8a19b608b8ec011546cc829f9a6414575
Parents: 836e216
Author: Timothy A. Bish 
Authored: Mon Jan 24 15:03:00 2011 +
Committer: Timothy A. Bish 
Committed: Mon Jan 24 15:03:00 2011 +

--
 src/main/csharp/Transport/Tcp/SslTransport.cs | 24 +++---
 1 file changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/419f24f8/src/main/csharp/Transport/Tcp/SslTransport.cs
--
diff --git a/src/main/csharp/Transport/Tcp/SslTransport.cs 
b/src/main/csharp/Transport/Tcp/SslTransport.cs
index f5a39b6..d1fcf51 100644
--- a/src/main/csharp/Transport/Tcp/SslTransport.cs
+++ b/src/main/csharp/Transport/Tcp/SslTransport.cs
@@ -35,7 +35,7 @@ namespace Apache.NMS.Stomp.Transport.Tcp
 private string keyStoreName;
 private string keyStoreLocation;
 private bool acceptInvalidBrokerCert = false;
-
+
 private SslStream sslStream;
 
 public SslTransport(Uri location, Socket socket, IWireFormat 
wireFormat) :
@@ -84,7 +84,7 @@ namespace Apache.NMS.Stomp.Transport.Tcp
 get { return this.clientCertPassword; }
 set { this.clientCertPassword = value; }
 }
-   
+
 /// 
 /// Indicates if the SslTransport should ignore any errors in the 
supplied Broker
 /// certificate and connect anyway, this is useful in testing with a 
default AMQ
@@ -116,7 +116,7 @@ namespace Apache.NMS.Stomp.Transport.Tcp
 }
 
 this.sslStream = new SslStream(
-new NetworkStream(this.socket), 
+new NetworkStream(this.socket),
 false,
 new 
RemoteCertificateValidationCallback(ValidateServerCertificate),
 new LocalCertificateSelectionCallback(SelectLocalCertificate) 
);
@@ -128,7 +128,7 @@ namespace Apache.NMS.Stomp.Transport.Tcp
 Tracer.Debug("Authorizing as Client for Server: " + 
remoteCertName);
 sslStream.AuthenticateAsClient(remoteCertName, 
LoadCertificates(), SslProtocols.Default, false);
 Tracer.Debug("Server is Authenticated = " + 
sslStream.IsAuthenticated);
-Tracer.Debug("Server is Encrypted = " + 
sslStream.IsEncrypted);
+Tracer.Debug("Server is Encrypted = " + sslStream.IsEncrypted);
 }
 catch(Exception e)
 {
@@ -178,13 +178,13 @@ namespace Apache.NMS.Stomp.Transport.Tcp
 // Configuration may or may not allow us to connect with an 
invliad broker cert.
 return AcceptInvalidBrokerCert;
 }
-
+
 private X509Certificate SelectLocalCertificate(object sender,
-   string targetHost, 
-   
X509CertificateCollection localCertificates, 
-   X509Certificate 
remoteCertificate, 
+   string targetHost,
+   
X509CertificateCollection localCertificates,
+   X509Certificate 
remoteCertificate,
string[] 
acceptableIssuers)
-{
+{
 Tracer.DebugFormat("Client is selecting a local certificate from 
{0} possibilities.", localCertificates.Count);
 
 if(localCertificates.Count == 1)
@@ -244,14 +244,14 @@ namespace Apache.NMS.Stomp.Transport.Tcp
 }
 
 X509Store store = new X509Store(name, location);
-
 collection = store.Certificates;
+store.Close();
 }
 
 return collection;
 }
-
+
 }
 }
 
-#endif
\ No newline at end of file
+#endif

[26/50] [abbrv] activemq-nms-stomp git commit: Added command-line option to skip downloading dependent libraries. This gives greater flexibility for debugging with special libraries.

[tabish]

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-stomp/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/commit/179185b8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/tree/179185b8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/diff/179185b8

Branch: refs/heads/1.5.x
Commit: 179185b8d3f0dd76fc4ab89992c315ef9b5cbc18
Parents: 3d2d37a
Author: Jim Gomes 
Authored: Thu Sep 1 22:21:25 2011 +
Committer: Jim Gomes 
Committed: Thu Sep 1 22:21:25 2011 +

--
 nant-common.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/179185b8/nant-common.xml
--
diff --git a/nant-common.xml b/nant-common.xml
index 06b5251..5fcad45 100644
--- a/nant-common.xml
+++ b/nant-common.xml
@@ -40,6 +40,7 @@
 
 
 
+
 
 
 
@@ -416,7 +417,7 @@
 
 
-
 
 

[32/50] [abbrv] activemq-nms-stomp git commit: Rolling back changes from previous check-in.

[tabish]

Rolling back changes from previous check-in.


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

Branch: refs/heads/1.5.x
Commit: bbe5c99c58e8c411607919ca447c6781980bea6a
Parents: 07cda02
Author: Jim Gomes 
Authored: Wed Feb 29 20:40:13 2012 +
Committer: Jim Gomes 
Committed: Wed Feb 29 20:40:13 2012 +

--
 src/main/csharp/Connection.cs | 25 ++---
 1 file changed, 6 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/bbe5c99c/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index 16f664a..4ca6aa5 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -721,27 +721,14 @@ namespace Apache.NMS.Stomp
 
 internal void OnException(Exception error)
 {
-if(this.transport.IsFaultTolerant)
-{
-Tracer.ErrorFormat("Attempting recovery from Exception: {0}", 
error.Message);
-while(null != (error = error.InnerException))
-{
-Tracer.ErrorFormat("   {0}", error.Message);
-}
+// Will fire an exception listener callback if there's any set.
+OnAsyncException(error);
 
-OnTransportInterrupted(this.transport);
-}
-else
+if(!this.closing.Value && !this.closed.Value)
 {
-// Will fire an exception listener callback if there's any set.
-OnAsyncException(error);
-
-if(!this.closing.Value && !this.closed.Value)
-{
-// Perform the actual work in another thread to avoid lock 
contention
-// and allow the caller to continue on in its error 
cleanup.
-executor.QueueUserWorkItem(AsyncOnExceptionHandler, error);
-}
+// Perform the actual work in another thread to avoid lock 
contention
+// and allow the caller to continue on in its error cleanup.
+executor.QueueUserWorkItem(AsyncOnExceptionHandler, error);
 }
 }
 

[10/50] [abbrv] activemq-nms-stomp 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. Standardiz

[tabish]

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-stomp/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/commit/e7bba280
Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/tree/e7bba280
Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/diff/e7bba280

Branch: refs/heads/1.4.x
Commit: e7bba2807c4c2e5ac248761be431242ee4fdacb7
Parents: 434a588
Author: Jim Gomes 
Authored: Tue Sep 21 21:02:11 2010 +
Committer: Jim Gomes 
Committed: Tue Sep 21 21:02:11 2010 +

--
 nant.build  | 4 ++--
 package.ps1 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/e7bba280/nant.build
--
diff --git a/nant.build b/nant.build
index 5a731ad..68e9038 100644
--- a/nant.build
+++ b/nant.build
@@ -22,8 +22,8 @@
 
 
 
-
-
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/e7bba280/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index b0d38d6..4c2209c 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 $pkgname = "Apache.NMS.Stomp"
-$pkgver = "1.4.0"
+$pkgver = "1.4-SNAPSHOT"
 $configurations = "release", "debug"
 $frameworks = "mono-2.0", "net-2.0", "net-3.5", "netcf-2.0"
 

[34/50] [abbrv] activemq-nms-stomp git commit: Remove zombie consumers that were created after failover. Fixes https://issues.apache.org/jira/browse/AMQNET-394

[tabish]

Remove zombie consumers that were created after failover.  Fixes 
https://issues.apache.org/jira/browse/AMQNET-394


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

Branch: refs/heads/1.5.x
Commit: fd6ddc41bab706e30f822a9b4d603156dfe7c624
Parents: fa16a57
Author: Jim Gomes 
Authored: Fri Aug 17 23:19:09 2012 +
Committer: Jim Gomes 
Committed: Fri Aug 17 23:19:09 2012 +

--
 src/main/csharp/Connection.cs | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/fd6ddc41/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
index 4ca6aa5..ba3ccd3 100755
--- a/src/main/csharp/Connection.cs
+++ b/src/main/csharp/Connection.cs
@@ -683,6 +683,7 @@ namespace Apache.NMS.Stomp
 }
 
 Tracer.Error("No such consumer active: " + dispatch.ConsumerId);
+transport.Oneway(new RemoveInfo() { ObjectId = dispatch.ConsumerId 
});
 }
 
 protected void OnTransportException(ITransport sender, Exception 
exception)

[50/50] [abbrv] activemq-nms-stomp git commit: Update to package script to 1.8-SNAPSHOT.

[tabish]

Update to package script to 1.8-SNAPSHOT.


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

Branch: refs/heads/master
Commit: 4ba60e96c8282ef6779b559d2f720d2f8ba79f73
Parents: 7c891b7
Author: Jim Gomes 
Authored: Fri Dec 11 19:49:19 2015 +
Committer: Jim Gomes 
Committed: Fri Dec 11 19:49:19 2015 +

--
 package.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/4ba60e96/package.ps1
--
diff --git a/package.ps1 b/package.ps1
index dec6a78..b7ba7f2 100644
--- a/package.ps1
+++ b/package.ps1
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 $pkgname = "Apache.NMS.Stomp"
-$pkgver = "1.6-SNAPSHOT"
+$pkgver = "1.8-SNAPSHOT"
 $configurations = "release", "debug"
 $frameworks = "mono-2.0", "net-2.0", "net-3.5", "net-4.0", "netcf-2.0"
 

[14/50] [abbrv] activemq-nms-stomp git commit: Merge from trunk

[tabish]

Merge from trunk

fix for: https://issues.apache.org/jira/browse/AMQNET-308
fix for: https://issues.apache.org/jira/browse/AMQNET-307


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

Branch: refs/heads/1.5.x
Commit: 196ee4bb0ade61f14434e91a418c58224935bc37
Parents: 9ece124
Author: Timothy A. Bish 
Authored: Fri Jan 21 15:03:17 2011 +
Committer: Timothy A. Bish 
Committed: Fri Jan 21 15:03:17 2011 +

--
 src/main/csharp/Protocol/StompWireFormat.cs | 26 +---
 1 file changed, 19 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/196ee4bb/src/main/csharp/Protocol/StompWireFormat.cs
--
diff --git a/src/main/csharp/Protocol/StompWireFormat.cs 
b/src/main/csharp/Protocol/StompWireFormat.cs
index 5554e19..6b864f7 100644
--- a/src/main/csharp/Protocol/StompWireFormat.cs
+++ b/src/main/csharp/Protocol/StompWireFormat.cs
@@ -32,6 +32,7 @@ namespace Apache.NMS.Stomp.Protocol
 private IPrimitiveMapMarshaler mapMarshaler = new 
XmlPrimitiveMapMarshaler();
 private ITransport transport;
 private WireFormatInfo remoteWireFormatInfo;
+private int connectedResponseId = -1;
 
 public StompWireFormat()
 {
@@ -190,8 +191,6 @@ namespace Apache.NMS.Stomp.Protocol
 
 protected virtual Command ReadConnected(StompFrame frame)
 {
-string responseId = frame.RemoveProperty("response-id");
-
 this.remoteWireFormatInfo = new WireFormatInfo();
 
 if(frame.HasProperty("version"))
@@ -222,11 +221,16 @@ namespace Apache.NMS.Stomp.Protocol
 remoteWireFormatInfo.Version = 1.0f;
 }
 
-if(responseId != null)
+if(this.connectedResponseId != -1)
 {
 Response answer = new Response();
-answer.CorrelationId = Int32.Parse(responseId);
+answer.CorrelationId = this.connectedResponseId;
 SendCommand(answer);
+this.connectedResponseId = -1;
+}
+else
+{
+throw new IOException("Received Connected Frame without a set 
Response Id for it.");
 }
 
 return remoteWireFormatInfo;
@@ -421,6 +425,7 @@ namespace Apache.NMS.Stomp.Protocol
 }   
 
 frame.SetProperty("message-id", command.LastMessageId.ToString());
+frame.SetProperty("subscription", command.ConsumerId.ToString());
 
 if(command.TransactionId != null)
 {
@@ -442,9 +447,14 @@ namespace Apache.NMS.Stomp.Protocol
 StompFrame frame = new StompFrame("CONNECT");
 
 frame.SetProperty("client-id", command.ClientId);
-frame.SetProperty("login", command.UserName);
-frame.SetProperty("passcode", command.Password);
-frame.SetProperty("request-id", command.CommandId);
+if(!String.IsNullOrEmpty(command.UserName))
+{
+frame.SetProperty("login", command.UserName);
+}
+if(!String.IsNullOrEmpty(command.Password))
+{
+frame.SetProperty("passcode", command.Password);
+}
 frame.SetProperty("host", command.Host);
 frame.SetProperty("accept-version", "1.0,1.1");
 
@@ -458,6 +468,8 @@ namespace Apache.NMS.Stomp.Protocol
 Tracer.Debug("StompWireFormat - Writing " + frame.ToString());
 }
 
+this.connectedResponseId = command.CommandId;
+
 frame.ToStream(dataOut);
 }
 

[15/50] [abbrv] activemq-nms-stomp git commit: fix for: https://issues.apache.org/jira/browse/AMQNET-309

[tabish]

fix for: https://issues.apache.org/jira/browse/AMQNET-309


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

Branch: refs/heads/1.5.x
Commit: ce876d0555c636b93914f39af8c6a40f57c40b6a
Parents: 196ee4b
Author: Timothy A. Bish 
Authored: Fri Jan 21 22:43:48 2011 +
Committer: Timothy A. Bish 
Committed: Fri Jan 21 22:43:48 2011 +

--
 src/main/csharp/Util/MessageDispatchChannel.cs | 22 -
 1 file changed, 13 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-nms-stomp/blob/ce876d05/src/main/csharp/Util/MessageDispatchChannel.cs
--
diff --git a/src/main/csharp/Util/MessageDispatchChannel.cs 
b/src/main/csharp/Util/MessageDispatchChannel.cs
index 102b752..d2d33dc 100644
--- a/src/main/csharp/Util/MessageDispatchChannel.cs
+++ b/src/main/csharp/Util/MessageDispatchChannel.cs
@@ -25,11 +25,18 @@ namespace Apache.NMS.Stomp.Util
 public class MessageDispatchChannel
 {
 private readonly Mutex mutex = new Mutex();
-private readonly ManualResetEvent waiter = new ManualResetEvent(false);
+private readonly ManualResetEvent wakeAll = new 
ManualResetEvent(false);
+private readonly AutoResetEvent waiter = new AutoResetEvent(false);
+private WaitHandle[] waiters;
 private bool closed;
 private bool running;
 private readonly LinkedList channel = new 
LinkedList();
 
+public MessageDispatchChannel()
+{
+this.waiters = new WaitHandle[] { this.waiter, this.wakeAll };
+}
+
 #region Properties
 
 public object SyncRoot
@@ -106,8 +113,7 @@ namespace Apache.NMS.Stomp.Util
 if(!Closed)
 {
 this.running = true;
-this.waiter.Set();
-this.waiter.Reset();
+this.wakeAll.Reset();
 }
 }
 }
@@ -117,8 +123,7 @@ namespace Apache.NMS.Stomp.Util
 lock(mutex)
 {
 this.running = false;
-this.waiter.Set();
-this.waiter.Reset();
+this.wakeAll.Set();
 }
 }
 
@@ -132,7 +137,7 @@ namespace Apache.NMS.Stomp.Util
 this.closed = true;
 }
 
-this.waiter.Set();
+this.wakeAll.Set();
 }
 }
 
@@ -142,7 +147,6 @@ namespace Apache.NMS.Stomp.Util
 {
 this.channel.AddLast(dispatch);
 this.waiter.Set();
-this.waiter.Reset();
 }
 }
 
@@ -152,7 +156,6 @@ namespace Apache.NMS.Stomp.Util
 {
 this.channel.AddFirst(dispatch);
 this.waiter.Set();
-this.waiter.Reset();
 }
 }
 
@@ -166,7 +169,8 @@ namespace Apache.NMS.Stomp.Util
 if( timeout != TimeSpan.Zero && !Closed && ( Empty || !Running ) )
 {
 this.mutex.ReleaseMutex();
-this.waiter.WaitOne((int)timeout.TotalMilliseconds, false);
+this.waiter.Reset();
+WaitHandle.WaitAny(this.waiters, 
(int)timeout.TotalMilliseconds, false);
 this.mutex.WaitOne();
 }
 

[activemq-artemis] Git Push Summary

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/artemis-1009 [deleted] 669e7cf2a

[1/2] activemq-artemis git commit: This closes #1065

[jbertram]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 3566077b6 -> 973c51921


This closes #1065


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/973c5192
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/973c5192
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/973c5192

Branch: refs/heads/master
Commit: 973c5192171a1ddc5e59649357754a88681dbc2f
Parents: 3566077 3882b00
Author: Justin Bertram 
Authored: Mon Mar 6 14:20:54 2017 -0600
Committer: Justin Bertram 
Committed: Mon Mar 6 14:20:54 2017 -0600

--
 .../artemis/spi/core/protocol/MessagePersister.java  | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--

[2/2] activemq-artemis git commit: ARTEMIS-1009 Fixing exporter/importer

[jbertram]

ARTEMIS-1009 Fixing exporter/importer


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3882b007
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3882b007
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3882b007

Branch: refs/heads/master
Commit: 3882b00735fcfb1da9f5f34ed7e1e36e0b2a6968
Parents: 3566077
Author: Clebert Suconic 
Authored: Mon Mar 6 13:22:05 2017 -0500
Committer: Justin Bertram 
Committed: Mon Mar 6 14:20:54 2017 -0600

--
 .../artemis/spi/core/protocol/MessagePersister.java  | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3882b007/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java
index 14891f5..adba2d7 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/protocol/MessagePersister.java
@@ -18,11 +18,14 @@
 package org.apache.activemq.artemis.spi.core.protocol;
 
 import java.util.Map;
+import java.util.ServiceLoader;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.core.message.impl.CoreMessagePersister;
 import org.apache.activemq.artemis.core.persistence.Persister;
+import 
org.apache.activemq.artemis.core.protocol.core.impl.CoreProtocolManagerFactory;
 import org.jboss.logging.Logger;
 
 public class MessagePersister implements Persister {
@@ -34,6 +37,14 @@ public class MessagePersister implements Persister {
/** This will be used for reading messages */
private static Map protocols = new 
ConcurrentHashMap<>();
 
+   static {
+  MessagePersister.registerPersister(CoreProtocolManagerFactory.ID, 
CoreMessagePersister.getInstance());
+
+  Iterable protocols  = 
ServiceLoader.load(ProtocolManagerFactory.class, 
MessagePersister.class.getClassLoader());
+  for (ProtocolManagerFactory next : protocols) {
+ MessagePersister.registerPersister(next.getStoreID(), 
next.getPersister());
+  }
+   }
 
public static void registerProtocol(ProtocolManagerFactory manager) {
   Persister messagePersister = manager.getPersister();
@@ -49,7 +60,9 @@ public class MessagePersister implements Persister {
}
 
public static void registerPersister(byte recordType, Persister 
persister) {
-  protocols.put(recordType, persister);
+  if (persister != null) {
+ protocols.put(recordType, persister);
+  }
}
 
public static MessagePersister getInstance() {

activemq-artemis git commit: ARTEMIS-1017 reword error message

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x a203e47c1 -> f6ea3f97b


ARTEMIS-1017 reword error message

reword error message when default destination for producer is not specified

(cherry picked from commit 84dfa24e38557093ee81b6f6551e029ec4d52a35)


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

Branch: refs/heads/1.x
Commit: f6ea3f97b231a92dc992d3665043ca8d1c3868f5
Parents: a203e47
Author: Jiri Danek 
Authored: Sat Mar 4 18:08:15 2017 +0100
Committer: Clebert Suconic 
Committed: Mon Mar 6 15:19:26 2017 -0500

--
 .../activemq/artemis/jms/client/ActiveMQMessageProducer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f6ea3f97/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
index 270cc9f..8e3f56b 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
@@ -334,7 +334,7 @@ public class ActiveMQMessageProducer implements 
MessageProducer, QueueSender, To
 */
private void checkDefaultDestination() {
   if (defaultDestination == null) {
- throw new UnsupportedOperationException("Cannot specify destination 
if producer has a default destination");
+ throw new UnsupportedOperationException("Producer does not have a 
default destination");
   }
}
 

[1/2] activemq-artemis git commit: ARTEMIS-1017 reword error message

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master ffb7c5654 -> 3566077b6


ARTEMIS-1017 reword error message

reword error message when default destination for producer is not specified


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/84dfa24e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/84dfa24e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/84dfa24e

Branch: refs/heads/master
Commit: 84dfa24e38557093ee81b6f6551e029ec4d52a35
Parents: ffb7c56
Author: Jiri Danek 
Authored: Sat Mar 4 18:08:15 2017 +0100
Committer: Clebert Suconic 
Committed: Mon Mar 6 15:18:00 2017 -0500

--
 .../activemq/artemis/jms/client/ActiveMQMessageProducer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/84dfa24e/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
index e44cd8a..74dd39a 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
@@ -336,7 +336,7 @@ public class ActiveMQMessageProducer implements 
MessageProducer, QueueSender, To
 */
private void checkDefaultDestination() {
   if (defaultDestination == null) {
- throw new UnsupportedOperationException("Cannot specify destination 
if producer has a default destination");
+ throw new UnsupportedOperationException("Producer does not have a 
default destination");
   }
}
 

[2/2] activemq-artemis git commit: This closes #1063

[clebertsuconic]

This closes #1063


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3566077b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3566077b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3566077b

Branch: refs/heads/master
Commit: 3566077b6ee4a701853e6e3ce92ca61a222e2d51
Parents: ffb7c56 84dfa24
Author: Clebert Suconic 
Authored: Mon Mar 6 15:18:58 2017 -0500
Committer: Clebert Suconic 
Committed: Mon Mar 6 15:18:58 2017 -0500

--
 .../activemq/artemis/jms/client/ActiveMQMessageProducer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

activemq-artemis git commit: ARTEMIS-1020 Fixing CDI client

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x 9e137add6 -> a203e47c1


ARTEMIS-1020 Fixing CDI client

Observe process bean when finding eligible bean classes to allow producer 
methods.

This closes #1066

(cherry picked from commit ffb7c5654a7614813e94d7f6e7934e37dce82139)


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

Branch: refs/heads/1.x
Commit: a203e47c199ad026a368c2144a64407d8b9e0624
Parents: 9e137ad
Author: John D. Ament 
Authored: Mon Mar 6 13:34:50 2017 -0500
Committer: Clebert Suconic 
Committed: Mon Mar 6 14:58:37 2017 -0500

--
 .../client/cdi/extension/ArtemisExtension.java  | 18 +++---
 .../client/cdi/logger/ActiveMQCDILogger.java|  6 +-
 .../cdi/bootstrap/CDIBootstrapProducerTest.java | 61 
 .../artemis/cdi/bootstrap/CDIProducers.java | 35 +++
 4 files changed, 110 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a203e47c/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
--
diff --git 
a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
 
b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
index d9a0d54..6f28bc2 100644
--- 
a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
+++ 
b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
@@ -22,7 +22,7 @@ package org.apache.artemis.client.cdi.extension;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.inject.spi.ProcessBean;
 
 import org.apache.activemq.artemis.core.config.Configuration;
 import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
@@ -33,14 +33,18 @@ public class ArtemisExtension implements Extension {
private boolean foundEmbeddedConfig = false;
private boolean foundConfiguration = false;
 
-void foundClientConfig(@Observes 
ProcessAnnotatedType pat) {
-  ActiveMQCDILogger.LOGGER.discoveredConfiguration(pat);
-  foundConfiguration = true;
+   void foundClientConfig(@Observes ProcessBean processBean) {
+  if 
(processBean.getBean().getTypes().contains(ArtemisClientConfiguration.class)) {
+ ActiveMQCDILogger.LOGGER.discoveredConfiguration(processBean);
+ foundConfiguration = true;
+  }
}
 
-void foundEmbeddedConfig(@Observes 
ProcessAnnotatedType pat) {
-  ActiveMQCDILogger.LOGGER.discoveredClientConfiguration(pat);
-  foundEmbeddedConfig = true;
+   void foundEmbeddedConfig(@Observes ProcessBean processBean) {
+  if (processBean.getBean().getTypes().contains(Configuration.class)) {
+ ActiveMQCDILogger.LOGGER.discoveredClientConfiguration(processBean);
+ foundEmbeddedConfig = true;
+  }
}
 
void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a203e47c/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
--
diff --git 
a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
 
b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
index fd2f7e7..f02d51b 100644
--- 
a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
+++ 
b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
@@ -19,7 +19,7 @@
 
 package org.apache.artemis.client.cdi.logger;
 
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.inject.spi.ProcessBean;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
@@ -48,11 +48,11 @@ public interface ActiveMQCDILogger extends BasicLogger {
 
@LogMessage
@Message(id = 571000, value = "Discovered configuration class {0}", format 
= Message.Format.MESSAGE_FORMAT)
-   void discoveredConfiguration(ProcessAnnotatedType pat);
+   void discoveredConfiguration(ProcessBean pb);
 
@LogMessage
@Message(id = 571001, value = "Discovered client configuration class {0}", 
format = Message.Format.MESSAGE_FORMAT)
-   void 

activemq-artemis git commit: ARTEMIS-1020 Fixing CDI client

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master d12330f15 -> ffb7c5654


ARTEMIS-1020 Fixing CDI client

Observe process bean when finding eligible bean classes to allow producer 
methods.

This closes #1066


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

Branch: refs/heads/master
Commit: ffb7c5654a7614813e94d7f6e7934e37dce82139
Parents: d12330f
Author: John D. Ament 
Authored: Mon Mar 6 13:34:50 2017 -0500
Committer: Clebert Suconic 
Committed: Mon Mar 6 14:54:22 2017 -0500

--
 .../client/cdi/extension/ArtemisExtension.java  | 18 +++---
 .../client/cdi/logger/ActiveMQCDILogger.java|  6 +-
 .../cdi/bootstrap/CDIBootstrapProducerTest.java | 61 
 .../artemis/cdi/bootstrap/CDIProducers.java | 35 +++
 4 files changed, 110 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ffb7c565/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
--
diff --git 
a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
 
b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
index d9a0d54..6f28bc2 100644
--- 
a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
+++ 
b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/extension/ArtemisExtension.java
@@ -22,7 +22,7 @@ package org.apache.artemis.client.cdi.extension;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.inject.spi.ProcessBean;
 
 import org.apache.activemq.artemis.core.config.Configuration;
 import org.apache.artemis.client.cdi.configuration.ArtemisClientConfiguration;
@@ -33,14 +33,18 @@ public class ArtemisExtension implements Extension {
private boolean foundEmbeddedConfig = false;
private boolean foundConfiguration = false;
 
-void foundClientConfig(@Observes 
ProcessAnnotatedType pat) {
-  ActiveMQCDILogger.LOGGER.discoveredConfiguration(pat);
-  foundConfiguration = true;
+   void foundClientConfig(@Observes ProcessBean processBean) {
+  if 
(processBean.getBean().getTypes().contains(ArtemisClientConfiguration.class)) {
+ ActiveMQCDILogger.LOGGER.discoveredConfiguration(processBean);
+ foundConfiguration = true;
+  }
}
 
-void foundEmbeddedConfig(@Observes 
ProcessAnnotatedType pat) {
-  ActiveMQCDILogger.LOGGER.discoveredClientConfiguration(pat);
-  foundEmbeddedConfig = true;
+   void foundEmbeddedConfig(@Observes ProcessBean processBean) {
+  if (processBean.getBean().getTypes().contains(Configuration.class)) {
+ ActiveMQCDILogger.LOGGER.discoveredClientConfiguration(processBean);
+ foundEmbeddedConfig = true;
+  }
}
 
void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ffb7c565/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
--
diff --git 
a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
 
b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
index fd2f7e7..f02d51b 100644
--- 
a/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
+++ 
b/artemis-cdi-client/src/main/java/org/apache/artemis/client/cdi/logger/ActiveMQCDILogger.java
@@ -19,7 +19,7 @@
 
 package org.apache.artemis.client.cdi.logger;
 
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.inject.spi.ProcessBean;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
@@ -48,11 +48,11 @@ public interface ActiveMQCDILogger extends BasicLogger {
 
@LogMessage
@Message(id = 571000, value = "Discovered configuration class {0}", format 
= Message.Format.MESSAGE_FORMAT)
-   void discoveredConfiguration(ProcessAnnotatedType pat);
+   void discoveredConfiguration(ProcessBean pb);
 
@LogMessage
@Message(id = 571001, value = "Discovered client configuration class {0}", 
format = Message.Format.MESSAGE_FORMAT)
-   void discoveredClientConfiguration(ProcessAnnotatedType pat);
+   

svn commit: r1007846 - in /websites/production/activemq/content: activemq-5141-release.html activemq-5142-release.html activemq-5143-release.html cache/main.pageCache

[buildbot]

Author: buildbot
Date: Mon Mar  6 19:23:30 2017
New Revision: 1007846

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/activemq-5141-release.html
websites/production/activemq/content/activemq-5142-release.html
websites/production/activemq/content/activemq-5143-release.html
websites/production/activemq/content/cache/main.pageCache

Modified: websites/production/activemq/content/activemq-5141-release.html
==
--- websites/production/activemq/content/activemq-5141-release.html (original)
+++ websites/production/activemq/content/activemq-5141-release.html Mon Mar  6 
19:23:30 2017
@@ -82,7 +82,7 @@
   
 
 
-http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png;
 
data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png;>ActiveMQ 5.14.1 
ReleaseApache ActiveMQ 5.14.1 includes many resolvedhttps://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210version=12338124;>issuesand
 bug fixes.Getting the Binary 
DistributionsDescriptionDownload LinkVerifyWindows 
Distributionhttp://www.apache.org/dyn/closer.cgi?filename=/activemq/5.14.1/apache-activemq-5.14.1-bin.zipaction=download;>apache-activemq-5.14.1-bin.ziphttps://www.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.asc;>ASC,
 https://www.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.md5;>MD5,
 https://www.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.sha1;>SHA1Unix/Linux/Cygwin Distributionhttp://www.apache.org/dyn/closer.cgi?filename=/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gzaction=download;>apache-activemq-5.14.1-bin.tar.gzhttps://www.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.asc;>ASC,
 https://www.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.md5;>MD5,
 https://www.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.sha1;>SHA1Verify the Integrity 
of DownloadsIt is essential that you verify the integrity of the 
downloaded files using the PGP or
  MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by 
following these steps:Download the http://www.apache.org/dist/activemq/KEYS;>KEYSDownload the 
asc signature file for the relevant distributionVerify the 
signatures using the following commands, depending on your use of PGP or 
GPG:
+http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png;
 
data-image-src="http://activemq.apache.org/activemq-500-release.data/activemq-5.x-box-reflection.png;>ActiveMQ 5.14.1 
ReleaseApache ActiveMQ 5.14.1 includes many resolvedhttps://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210version=12338124;>issuesand
 bug fixes.Getting the Binary 
DistributionsDescriptionDownload LinkVerifyWindows 
Distributionhttps://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip;>apache-activemq-5.14.1-bin.ziphttps://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.asc;>ASC,
 https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.md5;>MD5,
 https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.zip.sha1;>SHA1Unix/Linux/Cygwi
 n Distributionhttps://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz;>apache-activemq-5.14.1-bin.tar.gzhttps://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.asc;>ASC,
 https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.md5;>MD5,
 https://archive.apache.org/dist/activemq/5.14.1/apache-activemq-5.14.1-bin.tar.gz.sha1;>SHA1Verify the Integrity 
of DownloadsIt is essential that you verify the integrity of the 
downloaded files using the PGP or MD5 signatures. The PGP signatures can be ver
 ified using PGP or GPG. Begin by following these steps:Download 
the http://www.apache.org/dist/activemq/KEYS;>KEYSDownload the 
asc signature file for the relevant distributionVerify the 
signatures using the following commands, depending on your use of PGP or 
GPG:
 $ pgpk -a KEYS
 $ pgpv apache-activemq-version-bin.tar.gz.asc
 
@@ -101,7 +101,7 @@ $ gpg --verify apache-activemq-versi
   version5.14.1/version
 /dependency
 
-If you need more fine grained control of your dependencies 
(activemq-all is an uber jar) pick and choose from the various components 
activemq-client, activemq-broker, activemq-xx-store 
etc.Getting the Source CodeSource DistributionsDescriptionDownload LinkVerifySource Releasehttp://www.apache.org/dyn/closer.cgi?path=/activemq/5.14.1/activemq-parent-5.14.1-source-release.zip;>activemq-parent-5.14.1-source-release.zip<
 td colspan="1" rowspan="1" class="confluenceTd">https://www.apache.org/dist/activemq/5.14.1/activemq-parent-5.14.1-source-release.zip.asc;>ASC,
 

svn commit: r18578 - in /release/activemq: 5.14.2/ 5.14.3/

[cshannon]

Author: cshannon
Date: Mon Mar  6 18:44:26 2017
New Revision: 18578

Log:
removing old versions

Removed:
release/activemq/5.14.2/
release/activemq/5.14.3/

[CONF] Apache ActiveMQ > ActiveMQ 5.14.1 Release

[Christopher L. Shannon (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
ActiveMQ 5.14.1 Release 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 
 Description  
 Download Link  
  Verify   
 
 
 Windows Distribution  
  apache-activemq-5.14.1-bin.zip   
  ASC, MD5, SHA1   
 
 
 Unix/Linux/Cygwin Distribution  
  apache-activemq-5.14.1-bin.tar.gz   
  ASC, MD5, SHA1   
 
 
 
  
 
 
 
 Include Page 
 
 
 
 
 
 
 
 
 
Verify Downloads 
 
 
 
Verify Downloads 
 
 
  
 
 
  ... 
 
 
 
 
 Description  
 Download Link  
 Verify  
 
 
 Source Release  
  activemq-parent-5.14.1-source-release.zip   
  ASC, MD5, SHA1   
 
 
 
 Git Tag  https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.1  ...  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 5.8.4  
 
 
  
 
 
 
 
 
 
 
 
 

[CONF] Apache ActiveMQ > ActiveMQ 5.14.2 Release

[Christopher L. Shannon (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
ActiveMQ 5.14.2 Release 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 
 Description  
 Download Link  
  Verify   
 
 
 Windows Distribution  
  apache-activemq-5.14.2-bin.zip   
  ASC, MD5, SHA1   
 
 
 Unix/Linux/Cygwin Distribution  
  apache-activemq-5.14.2-bin.tar.gz   
  ASC, MD5, SHA1   
 
 
 
  
 
 
 
 Include Page 
 
 
 
 
 
 
 
 
 
Verify Downloads 
 
 
 
Verify Downloads 
 
 
  
 
 
  ... 
 
 
 
 
 Description  
 Download Link  
 Verify  
 
 
 Source Release  
  activemq-parent-5.14.2-source-release.zip   
  ASC, MD5, SHA1   
 
 
 
 Git Tag  https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.2  ...  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 5.8.4  
 
 
  
 
 
 
 
 
 
 
 
 

[CONF] Apache ActiveMQ > ActiveMQ 5.14.3 Release

[Christopher L. Shannon (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
ActiveMQ 5.14.3 Release 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 
 Description  
 Download Link  
  Verify   
 
 
 Windows Distribution  
  apache-activemq-5.14.3-bin.zip   
  ASC, MD5, SHA1   
 
 
 Unix/Linux/Cygwin Distribution  
  apache-activemq-5.14.3-bin.tar.gz   
  ASC, MD5, SHA1   
 
 
 
  
 
 
 
 Include Page 
 
 
 
 
 
 
 
 
 
Verify Downloads 
 
 
 
Verify Downloads 
 
 
  
 
 
  ... 
 
 
 
 
 Description  
 Download Link  
 Verify  
 
 
 Source Release  
  activemq-parent-5.14.3-source-release.zip   
  ASC, MD5, SHA1   
 
 
 
 Git Tag  https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.14.3  ...  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 5.8.4  
 
 
  
 
 
 
 
 
 
 
 
 

[3/3] activemq-artemis git commit: ARTEMIS-1013 Queue deliver after AMQP msg release

[clebertsuconic]

ARTEMIS-1013 Queue deliver after AMQP  msg release


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/543dd4c9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/543dd4c9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/543dd4c9

Branch: refs/heads/master
Commit: 543dd4c9e35ebaaae21092fda67210279823926f
Parents: a353da0
Author: Martyn Taylor 
Authored: Thu Mar 2 14:50:56 2017 +
Committer: Clebert Suconic 
Committed: Mon Mar 6 11:55:29 2017 -0500

--
 .../amqp/broker/AMQPSessionCallback.java|  4 +--
 .../amqp/AmqpReceiverDispositionTest.java   |  9 --
 .../tests/integration/amqp/ProtonTest.java  | 33 ++--
 3 files changed, 38 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/543dd4c9/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
index 5931afe..7e44e79 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
@@ -326,7 +326,8 @@ public class AMQPSessionCallback implements SessionCallback 
{
public void cancel(Object brokerConsumer, Message message, boolean 
updateCounts) throws Exception {
   recoverContext();
   try {
- ((ServerConsumer) 
brokerConsumer).individualCancel(message.getMessageID(), updateCounts);
+ ((ServerConsumer) 
brokerConsumer).individualCancel(message.getMessageID(), updateCounts);;
+ ((ServerConsumer) brokerConsumer).getQueue().forceDelivery();
   } finally {
  resetContext();
   }
@@ -560,7 +561,6 @@ public class AMQPSessionCallback implements SessionCallback 
{
   Transaction tx = protonSPI.getTransaction(txid);
   tx.rollback();
   protonSPI.removeTransaction(txid);
-
}
 
public SimpleString getMatchingQueue(SimpleString address, RoutingType 
routingType) throws Exception {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/543dd4c9/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverDispositionTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverDispositionTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverDispositionTest.java
index d92fa0f..f206654 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverDispositionTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverDispositionTest.java
@@ -44,6 +44,10 @@ public class AmqpReceiverDispositionTest extends 
AmqpClientTestSupport {
   receiver1.flow(1);
 
   AmqpMessage message = receiver1.receive(5, TimeUnit.SECONDS);
+
+  AmqpReceiver receiver2 = session.createReceiver(getTestName());
+
+
   assertNotNull("did not receive message first time", message);
   assertEquals("MessageID:0", message.getMessageId());
 
@@ -51,12 +55,11 @@ public class AmqpReceiverDispositionTest extends 
AmqpClientTestSupport {
   assertNotNull(protonMessage);
   assertEquals("Unexpected initial value for AMQP delivery-count", 0, 
protonMessage.getDeliveryCount());
 
+  receiver2.flow(1);
   message.release();
 
-  // Read the message again and validate its state
 
-  AmqpReceiver receiver2 = session.createReceiver(getTestName());
-  receiver2.flow(1);
+  // Read the message again and validate its state
   message = receiver2.receive(10, TimeUnit.SECONDS);
   assertNotNull("did not receive message again", message);
   assertEquals("MessageID:0", message.getMessageId());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/543dd4c9/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ProtonTest.java
--
diff --git 

[1/3] activemq-artemis git commit: This closes #1062

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a353da0ca -> d12330f15


This closes #1062


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

Branch: refs/heads/master
Commit: d12330f151673756ef3d004b8a7cea1044c7d227
Parents: a353da0 456e2a6
Author: Clebert Suconic 
Authored: Mon Mar 6 11:55:29 2017 -0500
Committer: Clebert Suconic 
Committed: Mon Mar 6 11:55:29 2017 -0500

--
 .../amqp/broker/AMQPConnectionCallback.java |   4 +-
 .../amqp/broker/AMQPSessionCallback.java|   8 +-
 .../amqp/proton/AMQPSessionContext.java |   1 +
 .../proton/ProtonServerReceiverContext.java |   6 +-
 .../amqp/proton/ProtonServerSenderContext.java  |  33 +++--
 .../amqp/proton/ProtonTransactionHandler.java   | 134 --
 .../transaction/ProtonTransactionHandler.java   | 135 +++
 .../transaction/ProtonTransactionImpl.java  |  90 +
 .../ProtonTransactionRefsOperation.java |  62 +
 .../artemis/core/server/impl/RefsOperation.java |  28 ++--
 .../integration/amqp/AmqpClientTestSupport.java |  15 +++
 .../amqp/AmqpReceiverDispositionTest.java   |   9 +-
 .../integration/amqp/AmqpTransactionTest.java   |  14 +-
 .../tests/integration/amqp/ProtonTest.java  |  33 -
 14 files changed, 389 insertions(+), 183 deletions(-)
--

[2/3] activemq-artemis git commit: ARTEMIS-1012 Fix AMQP Transaction Retirement

[clebertsuconic]

ARTEMIS-1012 Fix AMQP Transaction Retirement


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/456e2a65
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/456e2a65
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/456e2a65

Branch: refs/heads/master
Commit: 456e2a65e28a3b396b4e22ef348ba795bce83860
Parents: 543dd4c
Author: Martyn Taylor 
Authored: Thu Mar 2 21:06:41 2017 +
Committer: Clebert Suconic 
Committed: Mon Mar 6 11:55:29 2017 -0500

--
 .../amqp/broker/AMQPConnectionCallback.java |   4 +-
 .../amqp/broker/AMQPSessionCallback.java|  10 +-
 .../amqp/proton/AMQPSessionContext.java |   1 +
 .../proton/ProtonServerReceiverContext.java |   6 +-
 .../amqp/proton/ProtonServerSenderContext.java  |  33 +++--
 .../amqp/proton/ProtonTransactionHandler.java   | 134 --
 .../transaction/ProtonTransactionHandler.java   | 135 +++
 .../transaction/ProtonTransactionImpl.java  |  90 +
 .../ProtonTransactionRefsOperation.java |  62 +
 .../artemis/core/server/impl/RefsOperation.java |  28 ++--
 .../integration/amqp/AmqpClientTestSupport.java |  15 +++
 .../integration/amqp/AmqpTransactionTest.java   |  14 +-
 12 files changed, 354 insertions(+), 178 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/456e2a65/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
index 9021272..850671a 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
@@ -35,12 +35,12 @@ import 
org.apache.activemq.artemis.core.remoting.FailureListener;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
 import org.apache.activemq.artemis.core.transaction.Transaction;
-import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl;
 import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
 import 
org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPException;
 import 
org.apache.activemq.artemis.protocol.amqp.logger.ActiveMQAMQPProtocolMessageBundle;
 import org.apache.activemq.artemis.protocol.amqp.proton.AMQPConnectionContext;
 import org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport;
+import 
org.apache.activemq.artemis.protocol.amqp.proton.transaction.ProtonTransactionImpl;
 import org.apache.activemq.artemis.protocol.amqp.proton.handler.ExtCapability;
 import org.apache.activemq.artemis.protocol.amqp.sasl.AnonymousServerSASL;
 import org.apache.activemq.artemis.protocol.amqp.sasl.PlainSASL;
@@ -220,7 +220,7 @@ public class AMQPConnectionCallback implements 
FailureListener, CloseListener {
 
public Binary newTransaction() {
   XidImpl xid = newXID();
-  Transaction transaction = new TransactionImpl(xid, 
server.getStorageManager(), -1);
+  Transaction transaction = new ProtonTransactionImpl(xid, 
server.getStorageManager(), -1);
   transactions.put(xid, transaction);
   return new Binary(xid.getGlobalTransactionId());
}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/456e2a65/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
index 7e44e79..a079190 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
@@ -40,7 +40,6 @@ import 
org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl;
 import 

[activemq-nms-api] Git Push Summary

[tabish]

Repository: activemq-nms-api
Updated Tags:  refs/tags/1.0.0 [created] ca160622b
  refs/tags/1.1.0 [created] 6247fb7af
  refs/tags/1.2.0 [created] 0c02e0972
  refs/tags/1.2.0-RC1 [created] 2fccf3229
  refs/tags/1.2.0-RC2 [created] a53471ea7
  refs/tags/1.3.0 [created] 50c05b69b
  refs/tags/1.3.0-RC1 [created] 0a5185050
  refs/tags/1.4.0 [created] 23df36519
  refs/tags/1.5.0 [created] 446964361
  refs/tags/1.5.1 [created] 42e819103
  refs/tags/1.6.0 [created] 1e539afb0
  refs/tags/1.7.0 [created] 6d1cea428
  refs/tags/1.7.1 [created] bbac1a67e

[42/46] activemq-nms-api git commit: Move the 1.7.x branch to 1.7.1 SNAPSHOT

[tabish]

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 
Authored: Mon Dec 15 21:20:12 2014 +
Committer: Timothy A. Bish 
Committed: Mon Dec 15 21:20:12 2014 +

--
 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 @@
 
 
 
-
+
 
 
 

[04/46] activemq-nms-api git commit: https://issues.apache.org/activemq/browse/AMQNET-224

[tabish]

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 
Authored: Tue Dec 15 14:42:37 2009 +
Committer: Timothy A. Bish 
Committed: Tue Dec 15 14:42:37 2009 +

--
 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.

[19/46] activemq-nms-api git commit: Tag next release maintenance branch. 1.3.x

[tabish]

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 
Authored: Mon May 10 13:13:55 2010 +
Committer: Timothy A. Bish 
Committed: Mon May 10 13:13:55 2010 +

--

--

[08/46] activemq-nms-api git commit: Update version number

[tabish]

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 
Authored: Tue Dec 29 15:17:50 2009 +
Committer: Timothy A. Bish 
Committed: Tue Dec 29 15:17:50 2009 +

--
 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 @@
 
 
 
-
+
 
 
 

[11/46] activemq-nms-api git commit: Bump version no. and flag as SNAPSHOT.

[tabish]

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 
Authored: Thu Jan 7 20:23:17 2010 +
Committer: Timothy A. Bish 
Committed: Thu Jan 7 20:23:17 2010 +

--
 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 @@
 
 
 
-
-
+
+
 
 
 

[02/46] activemq-nms-api git commit: Change the release type to RC to reflect the Release Candidate status.

[tabish]

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 
Authored: Tue Nov 24 13:08:04 2009 +
Committer: Timothy A. Bish 
Committed: Tue Nov 24 13:08:04 2009 +

--
 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 @@
 -->
 
 http://nant.sourceforge.net/release/0.85/nant.xsd;>
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-   
-   
-   
+
+
+
 
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
 
-   
-   
-   
-   
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
+
+
+
 
-   
+
 
-   
-   
+
+
 

[15/46] activemq-nms-api git commit: Updated package scripts.

[tabish]

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 
Authored: Sat Jan 16 00:32:33 2010 +
Committer: Jim Gomes 
Committed: Sat Jan 16 00:32:33 2010 +

--
 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"
 

[12/46] activemq-nms-api git commit: Set version as offical release

[tabish]

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 
Authored: Mon Jan 11 13:47:55 2010 +
Committer: Timothy A. Bish 
Committed: Mon Jan 11 13:47:55 2010 +

--
 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 @@
 
 
 
-
-
+
+
 
 
 

[23/46] activemq-nms-api git commit: Set the release status to GA so a release build can be made.

[tabish]

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 
Authored: Tue Sep 7 12:49:02 2010 +
Committer: Timothy A. Bish 
Committed: Tue Sep 7 12:49:02 2010 +

--
 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 @@
 
 
 
-
+
 
 
 

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"
 

[25/46] activemq-nms-api git commit: bump to v1.4.1-SNAPSHOT

[tabish]

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 
Authored: Fri Sep 10 13:18:40 2010 +
Committer: Timothy A. Bish 
Committed: Fri Sep 10 13:18:40 2010 +

--
 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 @@
 
 
 
-
-
+
+
 
 
 

[21/46] activemq-nms-api git commit: Update maintenance branch version to 1.3.1-SNAPSHOT

[tabish]

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 
Authored: Mon May 10 14:38:10 2010 +
Committer: Timothy A. Bish 
Committed: Mon May 10 14:38:10 2010 +

--
 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 @@
 
 
 
-
-
+
+
 
 
 

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"
 

[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)

[tabish]

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 
Authored: Mon Oct 17 18:34:25 2011 +
Committer: Jim Gomes 
Committed: Mon Oct 17 18:34:25 2011 +

--
 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
 

[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.ap

[tabish]

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 
Authored: Tue Jul 7 00:01:40 2015 +
Committer: Jim Gomes 
Committed: Tue Jul 7 00:01:40 2015 +

--
 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.
 /// 
 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.
 /// 
 void Enlist(Transaction tx);
+
+bool EnlistsMsDtcNativeResource { get; set; }
 #endif
 }
 }

[45/46] activemq-nms-api git commit: Update version to 1.7.2-SNAPSHOT

[tabish]

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 
Authored: Mon Aug 31 18:07:01 2015 +
Committer: Timothy A. Bish 
Committed: Mon Aug 31 18:07:01 2015 +

--
 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 @@
 
 
 
-
+
 
 
 

[34/46] activemq-nms-api git commit: Add missing framework exists check.

[tabish]

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 
Authored: Mon Oct 31 18:27:16 2011 +
Committer: Timothy A. Bish 
Committed: Mon Oct 31 18:27:16 2011 +

--
 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 @@
 
 
 
-
+
+
+
 
 
 

[13/46] activemq-nms-api git commit: Bump version no. and flag as SNAPSHOT.

[tabish]

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 
Authored: Mon Jan 11 14:00:39 2010 +
Committer: Timothy A. Bish 
Committed: Mon Jan 11 14:00:39 2010 +

--
 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 @@
 
 
 
-
-
+
+
 
 
 

[37/46] activemq-nms-api git commit: fix for: https://issues.apache.org/jira/browse/AMQNET-393

[tabish]

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 
Authored: Fri Jul 13 20:10:33 2012 +
Committer: Timothy A. Bish 
Committed: Fri Jul 13 20:10:33 2012 +

--
 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 @@
 
 
 
+
 
 
 

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
-{
-   /// 
-   /// Class to provide support for Uri query parameters which uses .Net 
reflection
-   /// to identify and set properties.
-   /// 
-   public class URISupport
-   {
-   /// 
-   /// 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.
-   /// 
-   /// 
-   /// A string that could be a Composite Uri that uses syntax not 
compatible
-   /// with the .NET Uri class
-   /// 
-   public static Uri CreateCompatibleUri(string uriString)
-   {
-   string sanitized = uriString.Replace("://(", ":(");
-   return new Uri(sanitized);
-   }
-
-   /// 
-   /// Parse a Uri query string of the form ?x=yz=0
-   /// into a map of name/value pairs.
-   /// 
-   /// The query string to parse. This string 
should not contain
-   /// Uri escape characters.
-   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)
-   {
-   

[28/46] activemq-nms-api git commit: create new working tag for NMS 1.5.x patch releases.

[tabish]

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 
Authored: Tue Jan 4 21:54:34 2011 +
Committer: Timothy A. Bish 
Committed: Tue Jan 4 21:54:34 2011 +

--
 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 @@
 
 
 
-
+
 
 
 

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..."

[06/46] activemq-nms-api git commit: Update version number

[tabish]

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 
Authored: Tue Dec 29 15:11:15 2009 +
Committer: Timothy A. Bish 
Committed: Tue Dec 29 15:11:15 2009 +

--
 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 @@
 
 
 
-
+
 
 
 

[20/46] activemq-nms-api git commit: Mark branch as 1.3.0 RC

[tabish]

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 
Authored: Mon May 10 13:26:30 2010 +
Committer: Timothy A. Bish 
Committed: Mon May 10 13:26:30 2010 +

--
 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 @@
 -->
 
 http://nant.sourceforge.net/release/0.85/nant.xsd;>
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-   
-   
-   
+
+
+
 
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
 
-   
-   
-   
-   
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
+
+
+
 
-   
+
 
-   
-   
+
+
 

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" 

[40/46] activemq-nms-api git commit: Branch trunk to a 1.7.x line for next release iteration.

[tabish]

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 
Authored: Mon Dec 15 21:16:57 2014 +
Committer: Timothy A. Bish 
Committed: Mon Dec 15 21:16:57 2014 +

--

--

[05/46] activemq-nms-api git commit: Update Version to for new RC-2 tagging.

[tabish]

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 
Authored: Tue Dec 29 15:02:21 2009 +
Committer: Timothy A. Bish 
Committed: Tue Dec 29 15:02:21 2009 +

--
 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 @@
 
 
 
 http://nant.sourceforge.net/release/0.85/nant.xsd;>
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-   
-   
-   
+
+
+
 
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
 
-   
-   
-   
-   
+
+
+
+
 
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
+
+
+
+
+
+
+
+
+
+
+
 
-   
+
 
-   
-   
+
+
 

[24/46] activemq-nms-api git commit: Update the svn:ignore properties.

[tabish]

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 
Authored: Tue Sep 7 12:50:11 2010 +
Committer: Timothy A. Bish 
Committed: Tue Sep 7 12:50:11 2010 +

--

--

[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.

[tabish]

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 
Authored: Tue Feb 16 19:07:32 2010 +
Committer: Jim Gomes 
Committed: Tue Feb 16 19:07:32 2010 +

--
 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
/// 
public class XmlUtil
{
+   private static XmlWriterSettings xmlWriterSettings;
+
+   /// 
+   /// Static class constructor.
+   /// 
+   static XmlUtil()
+   {
+   xmlWriterSettings = new XmlWriterSettings();
+   xmlWriterSettings.Encoding = new UTF8Encoding(false, 
false);
+   }
+
+   /// 
+   /// 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.
+   /// 
+   /// 
+   /// 
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)
{

[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.

[tabish]

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 
Authored: Thu Sep 1 22:21:25 2011 +
Committer: Jim Gomes 
Committed: Thu Sep 1 22:21:25 2011 +

--
 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 @@
 
 
 
+
 
 
 
@@ -416,7 +417,7 @@
 
 
-