(activemq-artemis) branch main updated: NO-JIRA Fix test failed due to missing expectation

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
 new 0650713b3e NO-JIRA Fix test failed due to missing expectation
0650713b3e is described below

commit 0650713b3e055f24f0652f5f8e5ca2328df396e6
Author: Timothy Bish 
AuthorDate: Fri May 31 16:06:57 2024 -0400

NO-JIRA Fix test failed due to missing expectation

Test should add an optional expect close as it is very occasionally able
to hit the wire and the test peer will fail if not expecting it might be.
---
 .../tests/integration/amqp/connect/AMQPMirrorConnectionTest.java | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPMirrorConnectionTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPMirrorConnectionTest.java
index fb0081d50f..97b8ec21c5 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPMirrorConnectionTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPMirrorConnectionTest.java
@@ -18,6 +18,7 @@
 package org.apache.activemq.artemis.tests.integration.amqp.connect;
 
 import static 
org.apache.activemq.artemis.protocol.amqp.proton.AMQPTunneledMessageConstants.AMQP_TUNNELED_CORE_MESSAGE_FORMAT;
+import static 
org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport.CONNECTION_FORCED;
 import static 
org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport.TUNNEL_CORE_MESSAGES;
 
 import java.lang.invoke.MethodHandles;
@@ -152,7 +153,9 @@ public class AMQPMirrorConnectionTest extends 
AmqpClientTestSupport {
  peer.expectAttach().ofSender()
 
.withName(Matchers.startsWith("$ACTIVEMQ_ARTEMIS_MIRROR"))
 .withDesiredCapabilities("amq.mirror", 
AmqpSupport.CORE_MESSAGE_TUNNELING_SUPPORT.toString())
-.respond();
+.respond(); // Response omits "amq.mirror" in 
offered capabilities.
+ 
peer.expectClose().withError(CONNECTION_FORCED.toString()).optional(); // Can 
hit the wire in rare instances.
+ peer.expectConnectionToDrop();
  peer.start();
 
  final URI remoteURI = peer.getServerURI();


-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact

(activemq-artemis) branch main updated: NO-JIRA Fix a few cases of federation test fails on unexpected frames

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
 new aab1c484b2 NO-JIRA Fix a few cases of federation test fails on 
unexpected frames
aab1c484b2 is described below

commit aab1c484b211c7efb76aae3d2a1d9ddbe3f16067
Author: Timothy Bish 
AuthorDate: Tue May 28 14:26:17 2024 -0400

NO-JIRA Fix a few cases of federation test fails on unexpected frames

Add a couple optional flags for performatives that might arrive based on the
timing of connection close or remote detach etc.
---
 .../tests/integration/amqp/connect/AMQPFederationAddressPolicyTest.java | 2 +-
 .../tests/integration/amqp/connect/AMQPFederationConnectTest.java   | 1 +
 .../tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationAddressPolicyTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationAddressPolicyTest.java
index 6e82e370b9..d71e3d95f2 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationAddressPolicyTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationAddressPolicyTest.java
@@ -3234,7 +3234,7 @@ public class AMQPFederationAddressPolicyTest extends 
AmqpClientTestSupport {
  peer.remoteDetach().withClosed(true)
 
.withErrorCondition(AmqpError.NOT_FOUND.toString(), "Address not found")
 .queue();
- peer.expectFlow();
+ peer.expectFlow().optional();
  peer.expectDetach();
 
  // Triggers the initial attach based on demand.
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationConnectTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationConnectTest.java
index 13ddb976be..329093995a 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationConnectTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationConnectTest.java
@@ -209,6 +209,7 @@ public class AMQPFederationConnectTest extends 
AmqpClientTestSupport {
  peer.expectOpen().respond();
  peer.expectBegin().respond();
  
peer.expectAttach().ofSender().withDesiredCapability(FEDERATION_CONTROL_LINK.toString()).respond();
+ peer.expectClose().optional(); // Can sometimes be sent
  peer.expectConnectionToDrop();
  peer.start();
 
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java
index f32e032c4a..baa9b0dab5 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java
@@ -3476,7 +3476,7 @@ public class AMQPFederationQueuePolicyTest extends 
AmqpClientTestSupport {
  peer.remoteDetach().withClosed(true)
 
.withErrorCondition(AmqpError.NOT_FOUND.toString(), "Queue not found")
 .queue();
- peer.expectFlow();
+ peer.expectFlow().optional();
  peer.expectDetach();
 
  final ConnectionFactory factory = 
CFUtil.createConnectionFactory("AMQP", "tcp://localhost:" + AMQP_PORT);


-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact

(activemq-artemis) branch main updated: ARTEMIS-4666 Correctly set queue match when parsing XML confing

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
 new 2c3f772645 ARTEMIS-4666 Correctly set queue match when parsing XML 
confing
2c3f772645 is described below

commit 2c3f77264594f11f2bf0047bc16f2b1cb26d577e
Author: Timothy Bish 
AuthorDate: Fri Apr 5 11:40:43 2024 -0400

ARTEMIS-4666 Correctly set queue match when parsing XML confing

Correct the XML parser for core federation queue match policy loading
to call the setQueueMatch instead of setAddressMatch when reading the
queue match element.
---
 .../deployers/impl/FileConfigurationParser.java|   2 +-
 .../config/impl/FileConfigurationParserTest.java   |  46 +
 .../FederationQueueMatchXMLConfigParsingTest.java  | 209 +
 .../core-federated-queue-match-server1.xml |  95 ++
 .../core-federated-queue-match-server2.xml |  58 ++
 5 files changed, 409 insertions(+), 1 deletion(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index 09653e5d6d..6b885e75d1 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -2632,7 +2632,7 @@ public final class FileConfigurationParser extends 
XMLConfigurationUtil {
 
private FederationQueuePolicyConfiguration.Matcher getQueueMatcher(Element 
child) {
   FederationQueuePolicyConfiguration.Matcher matcher = new 
FederationQueuePolicyConfiguration.Matcher();
-  matcher.setAddressMatch(child.getAttribute("queue-match"));
+  matcher.setQueueMatch(child.getAttribute("queue-match"));
   matcher.setAddressMatch(child.getAttribute("address-match"));
   return matcher;
}
diff --git 
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
index a0f74aa992..aefb6a53eb 100644
--- 
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
+++ 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
@@ -22,16 +22,19 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.config.BridgeConfiguration;
 import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.FederationConfiguration;
 import org.apache.activemq.artemis.core.config.FileDeploymentManager;
 import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
 import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
 import org.apache.activemq.artemis.core.config.WildcardConfiguration;
+import 
org.apache.activemq.artemis.core.config.federation.FederationQueuePolicyConfiguration;
 import 
org.apache.activemq.artemis.core.config.ha.PrimaryOnlyPolicyConfiguration;
 import 
org.apache.activemq.artemis.core.config.ha.SharedStorePrimaryPolicyConfiguration;
 import org.apache.activemq.artemis.core.deployers.impl.FileConfigurationParser;
@@ -802,4 +805,47 @@ public class FileConfigurationParserTest extends 
ServerTestBase {
   "" + "\n";
 
private static String lastPart = "";
+
+   @Test
+   public void testParseQueueMatchInFederationConfiguration() throws Exception 
{
+  String configStr = firstPart +
+ "" +
+  "" +
+   "" +
+"" +
+ "server-connector" 
+
+"" +
+"" +
+   "" +
+   "" +
+   "" +
+"" +
+   "" +
+  "" +
+ "" +
+ lastPart;
+
+  final FileConfigurationParser parser = new FileConfigurationParser();
+  final ByteArrayInputStream input = new 
ByteArrayInputStream(configStr.getBytes(StandardCharsets.UTF_

(activemq-artemis) branch main updated: ARTEMIS-4665 Fix AMQP federation pull consumer test failures

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
 new f9f5ed373f ARTEMIS-4665 Fix AMQP federation pull consumer test failures
f9f5ed373f is described below

commit f9f5ed373f93e1e942c858cc8cbfd5cfe230a45c
Author: Timothy Bish 
AuthorDate: Fri Mar 1 11:08:44 2024 -0500

ARTEMIS-4665 Fix AMQP federation pull consumer test failures

Fix intermittent test failures in pull consumer test by asserting that there
are the expected number of message on the queue before running the JMS 
consume
cycle to consume credit and trigger federation credit to flow.
---
 .../integration/amqp/connect/AMQPFederationQueuePolicyTest.java  | 5 +
 1 file changed, 5 insertions(+)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java
index fc341bc0ba..3a987e8b5e 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationQueuePolicyTest.java
@@ -103,6 +103,7 @@ import 
org.apache.activemq.artemis.protocol.amqp.federation.FederationReceiveFro
 import org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport;
 import 
org.apache.activemq.artemis.tests.integration.amqp.AmqpClientTestSupport;
 import org.apache.activemq.artemis.tests.util.CFUtil;
+import org.apache.activemq.artemis.utils.Wait;
 import org.apache.qpid.proton.amqp.transport.AmqpError;
 import org.apache.qpid.proton.amqp.transport.LinkError;
 import org.apache.qpid.protonj2.test.driver.ProtonTestClient;
@@ -2718,6 +2719,8 @@ public class AMQPFederationQueuePolicyTest extends 
AmqpClientTestSupport {
  peer.expectFlow().withLinkCredit(10);
  peer.start();
 
+ final SimpleString queueName = SimpleString.toSimpleString("test");
+
  final URI remoteURI = peer.getServerURI();
  logger.info("Test started, peer listening on: {}", remoteURI);
 
@@ -2782,6 +2785,8 @@ public class AMQPFederationQueuePolicyTest extends 
AmqpClientTestSupport {
 .now();
 }
 
+Wait.assertTrue(() -> 
server.queueQuery(queueName).getMessageCount() == 
DEFAULT_PULL_CREDIT_BATCH_SIZE, 10_000);
+
 // Consume all the newly received message from the remote except 
one
 // which should leave the queue with a pending message so no credit
 // should be offered.

(activemq-artemis) branch main updated: ARTEMIS-4665 Add additional state checks to fix test failures in CI

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
 new cffc72fd51 ARTEMIS-4665 Add additional state checks to fix test 
failures in CI
cffc72fd51 is described below

commit cffc72fd513815b9c99a30b53b99ac0aa28b463a
Author: Timothy Bish 
AuthorDate: Thu Feb 29 15:22:10 2024 -0500

ARTEMIS-4665 Add additional state checks to fix test failures in CI

Tests need to ensure federation links are up before sending to and address
or the sent message can get discarded before the federation consumer is 
there
to receive it.
---
 .../connect/AMQPFederationServerToServerTest.java| 20 
 1 file changed, 20 insertions(+)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationServerToServerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationServerToServerTest.java
index 39075bcd5a..1e415a5bb4 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationServerToServerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/connect/AMQPFederationServerToServerTest.java
@@ -161,6 +161,10 @@ public class AMQPFederationServerToServerTest extends 
AmqpClientTestSupport {
  Wait.assertTrue(() -> 
server.addressQuery(SimpleString.toSimpleString("test")).isExists());
  Wait.assertTrue(() -> 
remoteServer.addressQuery(SimpleString.toSimpleString("test")).isExists());
 
+ // Captures state of JMS consumers and federation consumers attached 
on each node
+ Wait.assertTrue(() -> 
server.bindingQuery(SimpleString.toSimpleString("test"), 
false).getQueueNames().size() >= 1);
+ Wait.assertTrue(() -> 
remoteServer.bindingQuery(SimpleString.toSimpleString("test"), 
false).getQueueNames().size() >= 1);
+
  final MessageProducer producerR = sessionR.createProducer(topic);
  final TextMessage message = sessionR.createTextMessage("Hello World");
 
@@ -240,6 +244,10 @@ public class AMQPFederationServerToServerTest extends 
AmqpClientTestSupport {
  // Demand on local address should trigger receiver on remote.
  Wait.assertTrue(() -> 
remoteServer.addressQuery(SimpleString.toSimpleString("source")).isExists());
 
+ // Captures state of JMS consumers and federation consumers attached 
on each node
+ Wait.assertTrue(() -> 
server.bindingQuery(SimpleString.toSimpleString("target"), 
false).getQueueNames().size() >= 1);
+ Wait.assertTrue(() -> 
remoteServer.bindingQuery(SimpleString.toSimpleString("source"), 
false).getQueueNames().size() >= 1);
+
  final MessageProducer producerR = sessionR.createProducer(source);
  final TextMessage message = sessionR.createTextMessage("Hello World");
 
@@ -377,6 +385,10 @@ public class AMQPFederationServerToServerTest extends 
AmqpClientTestSupport {
  Wait.assertTrue(() -> 
server.addressQuery(SimpleString.toSimpleString("test")).isExists());
  Wait.assertTrue(() -> 
remoteServer.addressQuery(SimpleString.toSimpleString("test")).isExists());
 
+ // Captures state of JMS consumers and federation consumers attached 
on each node
+ Wait.assertTrue(() -> 
server.bindingQuery(SimpleString.toSimpleString("test"), 
false).getQueueNames().size() >= 1);
+ Wait.assertTrue(() -> 
remoteServer.bindingQuery(SimpleString.toSimpleString("test"), 
false).getQueueNames().size() >= 1);
+
  final MessageProducer producerL = sessionL.createProducer(topic);
  final TextMessage message = sessionL.createTextMessage("Hello World");
 
@@ -526,6 +538,10 @@ public class AMQPFederationServerToServerTest extends 
AmqpClientTestSupport {
  // Demand on local address should trigger receiver on remote.
  Wait.assertTrue(() -> 
server.addressQuery(SimpleString.toSimpleString("source")).isExists());
 
+ // Captures state of JMS consumers and federation consumers attached 
on each node
+ Wait.assertTrue(() -> 
server.bindingQuery(SimpleString.toSimpleString("source"), 
false).getQueueNames().size() >= 1);
+ Wait.assertTrue(() -> 
remoteServer.bindingQuery(SimpleString.toSimpleString("target"), 
false).getQueueNames().size() >= 1);
+
  final MessageProducer producerL = sessionL.createProducer(source);
  final TextMessage message = sessionL.createTextMessage("Hello World");
 
@@ -610,6 +626,

(activemq-artemis) branch ARTEMIS-4544 deleted (was f0900a4a06)

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a change to branch ARTEMIS-4544
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


 was f0900a4a06 Fix issue in large message reader unit test

This change permanently discards the following revisions:

 discard f0900a4a06 Fix issue in large message reader unit test
 discard 2dea4273ea ARTEMIS-4544 Option to sync large messages

(activemq-artemis) 02/02: Fix issue in large message reader unit test

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch ARTEMIS-4544
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit f0900a4a06431d249db2eb642ae0f92c2296818f
Author: Timothy Bish 
AuthorDate: Tue Dec 19 16:09:42 2023 -0500

Fix issue in large message reader unit test
---
 .../protocol/amqp/proton/AMQPTunneledCoreLargeMessageReaderTest.java  | 4 
 1 file changed, 4 insertions(+)

diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPTunneledCoreLargeMessageReaderTest.java
 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPTunneledCoreLargeMessageReaderTest.java
index 068aaf5399..6d2a1ded25 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPTunneledCoreLargeMessageReaderTest.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPTunneledCoreLargeMessageReaderTest.java
@@ -68,6 +68,9 @@ public class AMQPTunneledCoreLargeMessageReaderTest {
@Mock
ProtonAbstractReceiver serverReceiver;
 
+   @Mock
+   AMQPConnectionContext connectionContext;
+
@Mock
AMQPSessionContext sessionContext;
 
@@ -81,6 +84,7 @@ public class AMQPTunneledCoreLargeMessageReaderTest {
public void setUp() {
   MockitoAnnotations.openMocks(this);
 
+  when(serverReceiver.getConnection()).thenReturn(connectionContext);
   when(serverReceiver.getSessionContext()).thenReturn(sessionContext);
   when(sessionContext.getSessionSPI()).thenReturn(sessionSPI);
   when(sessionSPI.getStorageManager()).thenReturn(nullStoreManager);

(activemq-artemis) 01/02: ARTEMIS-4544 Option to sync large messages

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch ARTEMIS-4544
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git

commit 2dea4273ea32c26f846fca6c4ae9cca52a65d938
Author: Clebert Suconic 
AuthorDate: Tue Dec 19 13:37:56 2023 -0500

ARTEMIS-4544 Option to sync large messages
---
 .../artemis/api/config/ActiveMQDefaultConfiguration.java  |  6 ++
 .../protocol/amqp/broker/AMQPConnectionCallback.java  |  3 +++
 .../protocol/amqp/proton/AMQPConnectionContext.java   |  4 
 .../protocol/amqp/proton/AMQPLargeMessageReader.java  |  2 +-
 .../amqp/proton/AMQPTunneledCoreLargeMessageReader.java   |  2 +-
 .../activemq/artemis/core/config/Configuration.java   |  4 
 .../artemis/core/config/impl/ConfigurationImpl.java   | 14 ++
 .../core/deployers/impl/FileConfigurationParser.java  |  2 ++
 .../core/protocol/core/ServerSessionPacketHandler.java|  6 +-
 .../src/main/resources/schema/artemis-configuration.xsd   |  8 
 .../core/config/impl/FileConfigurationParserTest.java | 15 ---
 11 files changed, 60 insertions(+), 6 deletions(-)

diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index 7661df477e..2ab5d6c66d 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -278,6 +278,8 @@ public final class ActiveMQDefaultConfiguration {
// if true wait for transaction data to be synchronized to the journal 
before returning response to client
private static boolean DEFAULT_JOURNAL_SYNC_TRANSACTIONAL = true;
 
+   private static boolean DEFAULT_LARGE_MESSAGE_SYNC = true;
+
// if true wait for non transaction data to be synced to the journal before 
returning response to client.
private static boolean DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL = true;
 
@@ -1019,6 +1021,10 @@ public final class ActiveMQDefaultConfiguration {
   return DEFAULT_JOURNAL_SYNC_TRANSACTIONAL;
}
 
+   public static boolean isDefaultLargeMessageSync() {
+  return DEFAULT_LARGE_MESSAGE_SYNC;
+   }
+
/**
 * if true wait for non transaction data to be synced to the journal before 
returning response to client.
 */
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 25421e0ef4..21d9373f55 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
@@ -182,6 +182,9 @@ public class AMQPConnectionCallback implements 
FailureListener, CloseListener {
   return connection.isWritable(readyListener);
}
 
+   public boolean isLargeMessageSync() {
+  return server.getConfiguration().isLargeMessageSync();
+   }
 
public AMQPSessionCallback createSessionCallback(AMQPConnectionContext 
connection) {
   return new AMQPSessionCallback(this, manager, connection, 
this.connection, sessionExecutor, server.newOperationContext());
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
index c5b07f3d02..e771e3b1d0 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
@@ -183,6 +183,10 @@ public class AMQPConnectionContext extends 
ProtonInitializable implements EventH
   }
}
 
+   public boolean isLargeMessageSync() {
+  return connectionCallback.isLargeMessageSync();
+   }
+
@Override
public void initialize() throws Exception {
   initialized = true;
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPLargeMessageReader.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPLargeMessageReader.java
index 5404c1d39b..944427f2a8 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPLargeMessageReader.java

(activemq-artemis) branch ARTEMIS-4544 created (now f0900a4a06)

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a change to branch ARTEMIS-4544
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


  at f0900a4a06 Fix issue in large message reader unit test

This branch includes the following new commits:

 new 2dea4273ea ARTEMIS-4544 Option to sync large messages
 new f0900a4a06 Fix issue in large message reader unit test

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

svn commit: r49679 - /release/activemq/apache-nms-amqp/1.8.2/

[tabish]

Author: tabish
Date: Mon Aug 30 20:05:26 2021
New Revision: 49679

Log:
Add files for NMS.AMQP 1.8.2

Added:
release/activemq/apache-nms-amqp/1.8.2/
  - copied from r49678, dev/activemq/activemq-nms-amqp/1.8.2-rc3/

[activemq] branch activemq-5.16.x updated: AMQ-8016 Fix introspection support not checking Boolean class types

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
 new fdf9809  AMQ-8016 Fix introspection support not checking Boolean class 
types
fdf9809 is described below

commit fdf9809d49bfcda32c346eeb34601e60c12b67b3
Author: Timothy Bish 
AuthorDate: Fri Jul 31 11:42:47 2020 -0400

AMQ-8016 Fix introspection support not checking Boolean class types

Support class should check both primitive and Object based types for
conversion from String to boolean or Boolean targets

(cherry picked from commit 742a7f42f0168302c0d1d1ea779fdefa09ade4a0)
---
 .../main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
 
b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
index 3e19a7f..c0b223d 100644
--- 
a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
+++ 
b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
@@ -20,7 +20,9 @@ import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import javax.net.ssl.SSLServerSocket;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -97,7 +99,7 @@ public final class IntrospectionSupport {
 return to.cast(value);
 }
 
-if (boolean.class.isAssignableFrom(to) && value instanceof String) {
+if ((boolean.class.isAssignableFrom(to) || 
Boolean.class.isAssignableFrom(to)) && value instanceof String) {
 return Boolean.valueOf((String)value);
 }
 

[activemq] branch master updated: AMQ-8016 Fix introspection support not checking Boolean class types

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new 742a7f4  AMQ-8016 Fix introspection support not checking Boolean class 
types
742a7f4 is described below

commit 742a7f42f0168302c0d1d1ea779fdefa09ade4a0
Author: Timothy Bish 
AuthorDate: Fri Jul 31 11:42:47 2020 -0400

AMQ-8016 Fix introspection support not checking Boolean class types

Support class should check both primitive and Object based types for
conversion from String to boolean or Boolean targets
---
 .../main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
 
b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
index 3e19a7f..c0b223d 100644
--- 
a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
+++ 
b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/IntrospectionSupport.java
@@ -20,7 +20,9 @@ import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import javax.net.ssl.SSLServerSocket;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -97,7 +99,7 @@ public final class IntrospectionSupport {
 return to.cast(value);
 }
 
-if (boolean.class.isAssignableFrom(to) && value instanceof String) {
+if ((boolean.class.isAssignableFrom(to) || 
Boolean.class.isAssignableFrom(to)) && value instanceof String) {
 return Boolean.valueOf((String)value);
 }
 

[activemq] branch master updated: AMQ-8015 Update AMQP related libraries

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new aed91a7  AMQ-8015 Update AMQP related libraries
aed91a7 is described below

commit aed91a7474de1cafd5ddc6a0305e9951252ecec7
Author: Timothy Bish 
AuthorDate: Wed Jul 29 11:59:37 2020 -0400

AMQ-8015 Update AMQP related libraries

Update Qpid JMS, proton-j and netty libraries used for AMQP support
and tests to latest releases (0.53.0, 0.33.6, 4.1.51.Final).
---
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ffe85c5..4532c6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,11 +105,11 @@
 1.1.2
 1.4.0
 3.4.14
-0.33.5
-0.52.0
-4.1.46.Final
-0.33.5
-4.1.46.Final
+0.33.6
+0.53.0
+4.1.51.Final
+0.33.6
+4.1.51.Final
 1.3
 1.12.2
 9.5.1-5

[activemq-cli-tools] branch master updated: Update NOTICE copyright years to current year

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-cli-tools.git


The following commit(s) were added to refs/heads/master by this push:
 new 98a4a98  Update NOTICE copyright years to current year
98a4a98 is described below

commit 98a4a9892bef37d97c7c64c65bffcd295ae67cef
Author: Timothy Bish 
AuthorDate: Wed Jul 22 11:51:29 2020 -0400

Update NOTICE copyright years to current year
---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index 7c05520..f6ae5df 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache ActiveMQ CLI Tools
-Copyright 2012-2017 The Apache Software Foundation
+Copyright 2012-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

[activemq] branch activemq-5.15.x updated: AMQ-7495 Update Qpid JMS and Proton-j along with Netty to latest

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new ccfed53  AMQ-7495 Update Qpid JMS and Proton-j along with Netty to 
latest
ccfed53 is described below

commit ccfed53c8dc2d5c552a698d82a46aca59e39ad8a
Author: Timothy Bish 
AuthorDate: Mon Jun 8 11:19:47 2020 -0400

AMQ-7495 Update Qpid JMS and Proton-j along with Netty to latest

Update Qpid JMS to v0.52.0
Update Proton-J 0.33.5
Update Netty 4.1.50.Final to match Qpid JMS deps

(cherry picked from commit c8d4ebfe7a7641c63e6d202a1d35331155bfa994)
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 417c750..0ba8d0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.1.2
 1.4.0
 3.4.14
-0.33.3
-0.49.0
+0.33.5
+0.52.0
 4.1.46.Final
-0.33.3
+0.33.5
 4.1.46.Final
 1.3
 1.12.2

[activemq] branch master updated: AMQ-7495 Update Qpid JMS and Proton-j along with Netty to latest

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new c8d4ebf  AMQ-7495 Update Qpid JMS and Proton-j along with Netty to 
latest
c8d4ebf is described below

commit c8d4ebfe7a7641c63e6d202a1d35331155bfa994
Author: Timothy Bish 
AuthorDate: Mon Jun 8 11:19:47 2020 -0400

AMQ-7495 Update Qpid JMS and Proton-j along with Netty to latest

Update Qpid JMS to v0.52.0
Update Proton-J 0.33.5
Update Netty 4.1.50.Final to match Qpid JMS deps
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 78acfbd..aeb08bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.1.2
 1.4.0
 3.4.14
-0.33.3
-0.49.0
+0.33.5
+0.52.0
 4.1.46.Final
-0.33.3
+0.33.5
 4.1.46.Final
 1.3
 1.12.2

[activemq-artemis] branch master updated: ARTEMIS-2764: update to Qpid JMS 0.51.0

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new ba31813  ARTEMIS-2764: update to Qpid JMS 0.51.0
ba31813 is described below

commit ba31813cefb2950949dca726935b2c63d938ea56
Author: Robbie Gemmell 
AuthorDate: Thu May 14 15:23:02 2020 +0100

ARTEMIS-2764: update to Qpid JMS 0.51.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5ef9553..ceff9f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
   0.33.4
   3.0.19.Final
   1.7.21
-  0.50.0
+  0.51.0
   0.9.5
   1.0-alpha-1
   1

[activemq-artemis] branch master updated: ARTEMIS-2706 Discounting Transfer payload size

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new e7a437d  ARTEMIS-2706 Discounting Transfer payload size
 new 8ac9649  This closes #3082
e7a437d is described below

commit e7a437d9996464d29e63b82336d2d0eaf69e338c
Author: Clebert Suconic 
AuthorDate: Tue Apr 14 16:56:52 2020 -0400

ARTEMIS-2706 Discounting Transfer payload size
---
 .../artemis/protocol/amqp/proton/ProtonServerSenderContext.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
index 4810519..ca3d418 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
@@ -838,7 +838,8 @@ public class ProtonServerSenderContext extends 
ProtonInitializable implements Pr
   }
   void deliver() {
 
- int frameSize = 
protonSession.session.getConnection().getTransport().getOutboundFrameSizeLimit();
+ // This is discounting some bytes due to Transfer payload
+ int frameSize = 
protonSession.session.getConnection().getTransport().getOutboundFrameSizeLimit()
 - 50 - (delivery.getTag() != null ? delivery.getTag().length : 0);
 
  // Let the Message decide how to present the message bytes
  LargeBodyReader context = message.getLargeBodyReader();

[activemq-artemis] branch master updated: ARTEMIS-2659: address some more sporadic test failures due to races in tests

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new 17b5b09  ARTEMIS-2659: address some more sporadic test failures due to 
races in tests
 new 0a4ec3c  This closes #3077
17b5b09 is described below

commit 17b5b09b466e6b46544e7b6cdbef59ef4c5323f4
Author: Robbie Gemmell 
AuthorDate: Mon Apr 13 16:11:36 2020 +0100

ARTEMIS-2659: address some more sporadic test failures due to races in tests
---
 .../artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java   | 3 ++-
 .../artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java
index 61787dd..833b958 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDeliveryAnnotationsTest.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.tests.integration.amqp;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.utils.Wait;
 import org.apache.activemq.transport.amqp.client.AmqpClient;
 import org.apache.activemq.transport.amqp.client.AmqpConnection;
 import org.apache.activemq.transport.amqp.client.AmqpMessage;
@@ -52,7 +53,7 @@ public class AmqpDeliveryAnnotationsTest extends 
AmqpClientTestSupport {
   receiver.flow(1);
 
   Queue queue = getProxyToQueue(getQueueName());
-  assertEquals(1, queue.getMessageCount());
+  Wait.assertEquals(1L, queue::getMessageCount, 5000L, 25L);
 
   AmqpMessage received = receiver.receive(5, TimeUnit.SECONDS);
   assertNotNull(received);
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java
index 95011d3..736c7ca 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpReceiverPriorityTest.java
@@ -124,8 +124,8 @@ public class AmqpReceiverPriorityTest extends 
AmqpClientTestSupport {
 
 
   for (int i = 0; i < 2; i++) {
- AmqpMessage message1 = receiver1.receiveNoWait();
- assertNotNull("did not receive message first time", message1);
+ AmqpMessage message1 = receiver1.receive(3000, TimeUnit.MILLISECONDS);
+ assertNotNull("did not receive message" + i, message1);
  assertEquals("MessageID:" + i, message1.getMessageId());
  message1.accept();
   }

[activemq] branch activemq-5.15.x updated: AMQ-7365 Update Qpid-JMS and its netty dependency

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new df1f03a  AMQ-7365 Update Qpid-JMS and its netty dependency
df1f03a is described below

commit df1f03a6e9d859274bef811b92b55b0f42b98dd3
Author: Timothy Bish 
AuthorDate: Mon Mar 9 18:44:52 2020 -0400

AMQ-7365 Update Qpid-JMS and its netty dependency

Update Qpid JMS to 0.49.0 and brin Netty test dependency up to
match the version used in Qpid JMS

(cherry picked from commit 265fd65328d2ec692ef137a46d84228f915d2b11)
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 11e0ff3..85e9240 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,10 +106,10 @@
 1.4.0
 3.4.14
 0.33.3
-0.48.0
-4.1.45.Final
+0.49.0
+4.1.46.Final
 0.33.3
-4.1.43.Final
+4.1.46.Final
 1.3
 1.12.2
 9.5.1-5

[activemq] branch master updated: AMQ-7365 Update Qpid-JMS and its netty dependency

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new 265fd65  AMQ-7365 Update Qpid-JMS and its netty dependency
265fd65 is described below

commit 265fd65328d2ec692ef137a46d84228f915d2b11
Author: Timothy Bish 
AuthorDate: Mon Mar 9 18:44:52 2020 -0400

AMQ-7365 Update Qpid-JMS and its netty dependency

Update Qpid JMS to 0.49.0 and brin Netty test dependency up to
match the version used in Qpid JMS
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1b523fe..96d10a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,10 +106,10 @@
 1.4.0
 3.4.14
 0.33.3
-0.48.0
-4.1.45.Final
+0.49.0
+4.1.46.Final
 0.33.3
-4.1.43.Final
+4.1.46.Final
 1.3
 1.12.2
 9.5.1-5

[activemq] branch master updated: AMQ-7365 Update Qpid JMS and proton-j to latest releases

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new d416587  AMQ-7365 Update Qpid JMS and proton-j to latest releases
d416587 is described below

commit d41658715bba77aaa56f46b4b2a0c0adc1107961
Author: Timothy Bish 
AuthorDate: Wed Dec 11 12:54:53 2019 -0500

AMQ-7365 Update Qpid JMS and proton-j to latest releases

Update to Qpid JMS 0.48.0 and proton-j 0.33.3
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a968945..7f6dedd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.1.2
 1.4.0
 3.4.14
-0.33.2
-0.47.0
+0.33.3
+0.48.0
 4.1.43.Final
-0.33.2
+0.33.3
 4.1.43.Final
 1.3
 1.12.2

[activemq] branch activemq-5.15.x updated: AMQ-7365 Update Qpid JMS and proton-j to latest releases

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new 0f5e113  AMQ-7365 Update Qpid JMS and proton-j to latest releases
0f5e113 is described below

commit 0f5e113af84689b4651d9443724a5b38ea433d47
Author: Timothy Bish 
AuthorDate: Wed Dec 11 12:54:53 2019 -0500

AMQ-7365 Update Qpid JMS and proton-j to latest releases

Update to Qpid JMS 0.48.0 and proton-j 0.33.3

(cherry picked from commit d41658715bba77aaa56f46b4b2a0c0adc1107961)
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 56fe459..7915132 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.1.2
 1.4.0
 3.4.14
-0.33.2
-0.47.0
+0.33.3
+0.48.0
 4.1.43.Final
-0.33.2
+0.33.3
 4.1.43.Final
 1.3
 1.12.2

[activemq] branch activemq-5.15.x updated: AMQ-7335 Update Qpid JMS to 0.47.0 netty to 4.1.43.Final

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new 1b9c21a  AMQ-7335 Update Qpid JMS to 0.47.0 netty to 4.1.43.Final
1b9c21a is described below

commit 1b9c21a8ce9107ee5248a5d223a9b09495918da0
Author: Timothy Bish 
AuthorDate: Tue Nov 5 11:39:33 2019 -0500

AMQ-7335 Update Qpid JMS to 0.47.0 netty to 4.1.43.Final

(cherry picked from commit 0c0e8061fb19b8341c684124a4ebf02e30e70cf3)
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1de0946..18c3386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.4.0
 3.4.14
 0.33.2
-0.45.0
-4.1.39.Final
+0.47.0
+4.1.43.Final
 0.33.2
-4.1.39.Final
+4.1.43.Final
 1.3
 1.12.2
 9.5.1-5

[activemq] branch master updated: AMQ-7335 Update Qpid JMS to 0.47.0 netty to 4.1.43.Final

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new 0c0e806  AMQ-7335 Update Qpid JMS to 0.47.0 netty to 4.1.43.Final
0c0e806 is described below

commit 0c0e8061fb19b8341c684124a4ebf02e30e70cf3
Author: Timothy Bish 
AuthorDate: Tue Nov 5 11:39:33 2019 -0500

AMQ-7335 Update Qpid JMS to 0.47.0 netty to 4.1.43.Final
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 505e320..37d632d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.4.0
 3.4.14
 0.33.2
-0.45.0
-4.1.39.Final
+0.47.0
+4.1.43.Final
 0.33.2
-4.1.39.Final
+4.1.43.Final
 1.3
 1.12.2
 9.5.1-5

[activemq] branch activemq-5.15.x updated: AMQ-7290 Update Qpid JMS and Netty to lastest releases

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new 9baeaef  AMQ-7290 Update Qpid JMS and Netty to lastest releases
9baeaef is described below

commit 9baeaef179b9c753fda6027165373c117179084b
Author: Timothy Bish 
AuthorDate: Mon Aug 26 14:51:45 2019 -0400

AMQ-7290 Update Qpid JMS and Netty to lastest releases

(cherry picked from commit c29066cfb762f3577a10ea19cd9dc7f3d6284149)
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 593a0a6..99a91ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.4.0
 3.4.14
 0.33.2
-0.44.0
-4.1.37.Final
+0.45.0
+4.1.39.Final
 0.33.2
-4.1.37.Final
+4.1.39.Final
 1.3
 1.12.1
 9.5.1-5

[activemq] branch master updated: AMQ-7290 Update Qpid JMS and Netty to lastest releases

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new c29066c  AMQ-7290 Update Qpid JMS and Netty to lastest releases
c29066c is described below

commit c29066cfb762f3577a10ea19cd9dc7f3d6284149
Author: Timothy Bish 
AuthorDate: Mon Aug 26 14:51:45 2019 -0400

AMQ-7290 Update Qpid JMS and Netty to lastest releases
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 467cb6e..b735b31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.4.0
 3.4.14
 0.33.2
-0.44.0
-4.1.37.Final
+0.45.0
+4.1.39.Final
 0.33.2
-4.1.37.Final
+4.1.39.Final
 1.3
 1.12.1
 9.5.1-5

[activemq] branch activemq-5.15.x updated: AMQ-7274 Update proton-j and fix footer key type on outbound transform

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new 2c33f0d  AMQ-7274 Update proton-j and fix footer key type on outbound 
transform
2c33f0d is described below

commit 2c33f0d7e428545fc0d67dcf2ce8f24d7704f807
Author: Timothy Bish 
AuthorDate: Tue Aug 13 15:05:00 2019 -0400

AMQ-7274 Update proton-j and fix footer key type on outbound transform

Footer annotations maps should be using Symbol keys not strings.

(cherry picked from commit 122745b5b8b55b41d329e5457796229a15146d19)
---
 .../message/JMSMappingOutboundTransformer.java |  2 +-
 .../transport/amqp/AmqpTransformerTest.java| 65 
 .../amqp/interop/AmqpSendReceiveTest.java  | 69 ++
 pom.xml|  4 +-
 4 files changed, 137 insertions(+), 3 deletions(-)

diff --git 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
index 346a54c..ffe9ccc 100644
--- 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
+++ 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
@@ -319,7 +319,7 @@ public class JMSMappingOutboundTransformer implements 
OutboundTransformer {
 footerMap = new HashMap<>();
 }
 String name = 
key.substring(JMS_AMQP_FOOTER_PREFIX.length());
-footerMap.put(name, value);
+footerMap.put(Symbol.valueOf(name), value);
 continue;
 }
 } else if (key.startsWith(AMQ_SCHEDULED_MESSAGE_PREFIX )) {
diff --git 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
index 201cee2..deb0c0d 100644
--- 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
+++ 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
@@ -22,6 +22,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.net.URI;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -36,6 +38,11 @@ import javax.jms.TextMessage;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.transport.amqp.client.AmqpClient;
+import org.apache.activemq.transport.amqp.client.AmqpConnection;
+import org.apache.activemq.transport.amqp.client.AmqpMessage;
+import org.apache.activemq.transport.amqp.client.AmqpSender;
+import org.apache.activemq.transport.amqp.client.AmqpSession;
 import org.junit.After;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -188,6 +195,54 @@ public class AmqpTransformerTest {
 openwireConn.close();
 }
 
+@Test(timeout = 6)
+public void testSendAMQPMessageWithComplexAnnotationsReceiveCore() throws 
Exception {
+startBrokerWithAmqpTransport(String.format(AMQP_URL, 
"?transport.transformer=jms"));
+
+URI remoteURI = new URI("tcp://" + amqpConnectionURI.getHost() + ":" + 
amqpConnectionURI.getPort());
+AmqpClient client = new AmqpClient(remoteURI, null, null);
+AmqpConnection connection = client.connect();
+try {
+connection.connect();
+
+String annotation = "x-opt-embedded-map";
+Map embeddedMap = new LinkedHashMap<>();
+embeddedMap.put("test-key-1", "value-1");
+embeddedMap.put("test-key-2", "value-2");
+embeddedMap.put("test-key-3", "value-3");
+
+AmqpSession session = connection.createSession();
+AmqpSender sender = session.createSender(TEST_QUEUE);
+AmqpMessage message = createAmqpMessage((byte) 'A', 65535);
+
+message.setApplicationProperty("IntProperty", 42);
+message.setDurable(true);
+message.setMessageAnnotation(annotation, embeddedMap);
+sender.send(message);
+
+session.close();
+
+ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory(openwireConnectionURI);
+Connection connection2 = factory.createConnection();
+try {
+
+Session session2 = connection2.create

[activemq] branch master updated: AMQ-7274 Update proton-j and fix footer key type on outbound transform

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new 122745b  AMQ-7274 Update proton-j and fix footer key type on outbound 
transform
122745b is described below

commit 122745b5b8b55b41d329e5457796229a15146d19
Author: Timothy Bish 
AuthorDate: Tue Aug 13 15:05:00 2019 -0400

AMQ-7274 Update proton-j and fix footer key type on outbound transform

Footer annotations maps should be using Symbol keys not strings.
---
 .../message/JMSMappingOutboundTransformer.java |  2 +-
 .../transport/amqp/AmqpTransformerTest.java| 65 
 .../amqp/interop/AmqpSendReceiveTest.java  | 69 ++
 pom.xml|  4 +-
 4 files changed, 137 insertions(+), 3 deletions(-)

diff --git 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
index 346a54c..ffe9ccc 100644
--- 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
+++ 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/message/JMSMappingOutboundTransformer.java
@@ -319,7 +319,7 @@ public class JMSMappingOutboundTransformer implements 
OutboundTransformer {
 footerMap = new HashMap<>();
 }
 String name = 
key.substring(JMS_AMQP_FOOTER_PREFIX.length());
-footerMap.put(name, value);
+footerMap.put(Symbol.valueOf(name), value);
 continue;
 }
 } else if (key.startsWith(AMQ_SCHEDULED_MESSAGE_PREFIX )) {
diff --git 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
index 201cee2..deb0c0d 100644
--- 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
+++ 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/AmqpTransformerTest.java
@@ -22,6 +22,8 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.net.URI;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -36,6 +38,11 @@ import javax.jms.TextMessage;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.transport.amqp.client.AmqpClient;
+import org.apache.activemq.transport.amqp.client.AmqpConnection;
+import org.apache.activemq.transport.amqp.client.AmqpMessage;
+import org.apache.activemq.transport.amqp.client.AmqpSender;
+import org.apache.activemq.transport.amqp.client.AmqpSession;
 import org.junit.After;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -188,6 +195,54 @@ public class AmqpTransformerTest {
 openwireConn.close();
 }
 
+@Test(timeout = 6)
+public void testSendAMQPMessageWithComplexAnnotationsReceiveCore() throws 
Exception {
+startBrokerWithAmqpTransport(String.format(AMQP_URL, 
"?transport.transformer=jms"));
+
+URI remoteURI = new URI("tcp://" + amqpConnectionURI.getHost() + ":" + 
amqpConnectionURI.getPort());
+AmqpClient client = new AmqpClient(remoteURI, null, null);
+AmqpConnection connection = client.connect();
+try {
+connection.connect();
+
+String annotation = "x-opt-embedded-map";
+Map embeddedMap = new LinkedHashMap<>();
+embeddedMap.put("test-key-1", "value-1");
+embeddedMap.put("test-key-2", "value-2");
+embeddedMap.put("test-key-3", "value-3");
+
+AmqpSession session = connection.createSession();
+AmqpSender sender = session.createSender(TEST_QUEUE);
+AmqpMessage message = createAmqpMessage((byte) 'A', 65535);
+
+message.setApplicationProperty("IntProperty", 42);
+message.setDurable(true);
+message.setMessageAnnotation(annotation, embeddedMap);
+sender.send(message);
+
+session.close();
+
+ActiveMQConnectionFactory factory = new 
ActiveMQConnectionFactory(openwireConnectionURI);
+Connection connection2 = factory.createConnection();
+try {
+
+Session session2 = connection2.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
+connection2.start();
+

[activemq] branch activemq-5.15.x updated: AMQ-7179 Update Qpid JMS test dependency to v0.44.0

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new 5b5e9c1  AMQ-7179 Update Qpid JMS test dependency to v0.44.0
5b5e9c1 is described below

commit 5b5e9c106cb5509797e07f32aec0758b6aa197c7
Author: Timothy Bish 
AuthorDate: Wed Jul 24 10:29:50 2019 -0400

AMQ-7179 Update Qpid JMS test dependency to v0.44.0

Updates to latest client release used for testing activemq-amqp

(cherry picked from commit 50bc520fee39be32ce5da8d7994c5b40e1deb7a8)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3024fa7..cfd0b4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
 1.4.0
 3.4.6
 0.33.1
-0.43.0
+0.44.0
 4.1.37.Final
 0.33.1
 4.1.37.Final

[activemq] branch master updated: AMQ-7179 Update Qpid JMS test dependency to v0.44.0

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new 50bc520  AMQ-7179 Update Qpid JMS test dependency to v0.44.0
50bc520 is described below

commit 50bc520fee39be32ce5da8d7994c5b40e1deb7a8
Author: Timothy Bish 
AuthorDate: Wed Jul 24 10:29:50 2019 -0400

AMQ-7179 Update Qpid JMS test dependency to v0.44.0

Updates to latest client release used for testing activemq-amqp
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e87e3c5..8f4d92b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
 1.4.0
 3.4.6
 0.33.1
-0.43.0
+0.44.0
 4.1.37.Final
 0.33.1
 4.1.37.Final

svn commit: r34558 - /release/activemq/activemq-cpp/3.9.4/

[tabish]

Author: tabish
Date: Mon Jun 17 14:40:18 2019
New Revision: 34558

Log:
Remove old release subdir

Removed:
release/activemq/activemq-cpp/3.9.4/

svn commit: r34557 - /release/activemq/activemq-apollo/

[tabish]

Author: tabish
Date: Mon Jun 17 14:38:44 2019
New Revision: 34557

Log:
remove apollo release subdir

Removed:
release/activemq/activemq-apollo/

svn commit: r34556 - /release/activemq/5.14.5/

[tabish]

Author: tabish
Date: Mon Jun 17 14:37:29 2019
New Revision: 34556

Log:
clean out old release from mirrors

Removed:
release/activemq/5.14.5/

[activemq] branch activemq-5.15.x updated: AMQ-7179: update to proton-j 0.33.1 and qpid-jms 0.43.0

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new e5ba0ab  AMQ-7179: update to proton-j 0.33.1 and qpid-jms 0.43.0
e5ba0ab is described below

commit e5ba0ab96bd0a13acff1caf2a49b4f63c97fc6da
Author: Timothy Bish 
AuthorDate: Fri Jun 7 11:00:37 2019 -0400

AMQ-7179: update to proton-j 0.33.1 and qpid-jms 0.43.0

(cherry picked from commit ae13645230d8c72d2ac321d570284e699c75839d)
---
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ef012c5..c4f911f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,11 +104,11 @@
 1.1.2
 1.4.0
 3.4.6
-0.33.0
-0.42.0
-4.1.34.Final
-0.33.0
-4.1.34.Final
+0.33.1
+0.43.0
+4.1.36.Final
+0.33.1
+4.1.36.Final
 1.3
 1.0
 9.5.1-5

[activemq] branch master updated: AMQ-7179: update to proton-j 0.33.1 and qpid-jms 0.43.0

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new ae13645  AMQ-7179: update to proton-j 0.33.1 and qpid-jms 0.43.0
ae13645 is described below

commit ae13645230d8c72d2ac321d570284e699c75839d
Author: Timothy Bish 
AuthorDate: Fri Jun 7 11:00:37 2019 -0400

AMQ-7179: update to proton-j 0.33.1 and qpid-jms 0.43.0
---
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5706b8c..54c4a9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,11 +104,11 @@
 1.1.2
 1.4.0
 3.4.6
-0.33.0
-0.42.0
-4.1.34.Final
-0.33.0
-4.1.34.Final
+0.33.1
+0.43.0
+4.1.36.Final
+0.33.1
+4.1.36.Final
 1.3
 1.0
 9.5.1-5

[activemq] branch activemq-5.15.x updated: AMQ-7218 Fix loss of Ack id from tracking after TX commit / abort

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new a6c0e3f  AMQ-7218 Fix loss of Ack id from tracking after TX commit / 
abort
a6c0e3f is described below

commit a6c0e3f99f22a4be8d6d8586185820b3a8b990e6
Author: Timothy Bish 
AuthorDate: Wed May 29 17:25:30 2019 -0400

AMQ-7218 Fix loss of Ack id from tracking after TX commit / abort

Ensure that we properly track Ack IDs across TX commit and abort
operations and only clear out values enlisted in the TX on commit and
re-acquire the Ack Ids on TX abort.

(cherry picked from commit 063d24e6d653bed3dd3c56302758de29143e5e82)
---
 .../transport/stomp/ProtocolConverter.java |  96 +---
 .../activemq/transport/stomp/StompAckEntry.java| 101 
 .../stomp/StompQueueBrowserSubscription.java   |  11 +-
 .../transport/stomp/StompSubscription.java | 133 +++--
 .../activemq/transport/stomp/Stomp12Test.java  | 599 -
 5 files changed, 801 insertions(+), 139 deletions(-)

diff --git 
a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
 
b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
index 2c4d402..7753f7a 100644
--- 
a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
+++ 
b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -116,8 +116,10 @@ public class ProtocolConverter {
 private final Map transactions = new 
ConcurrentHashMap<>();
 private final StompTransport stompTransport;
 
-private final ConcurrentMap pedingAcks = new 
ConcurrentHashMap<>();
-private final IdGenerator ACK_ID_GENERATOR = new IdGenerator();
+// Global Map shared with all subscriptions to allow finding the sub 
associated with an ACK Id
+private final ConcurrentMap pendingAcksTracker = 
new ConcurrentHashMap<>();
+// Read-Only view used in this class to enforce the separation of read vs 
update of the global index.
+private final Map pendingAcks = 
Collections.unmodifiableMap(pendingAcksTracker);
 
 private final Object commnadIdMutex = new Object();
 private int lastCommandId;
@@ -131,34 +133,6 @@ public class ProtocolConverter {
 private float hbGracePeriodMultiplier = 1.0f;
 private String defaultHeartBeat = Stomp.DEFAULT_HEART_BEAT;
 
-private static class AckEntry {
-
-private final String messageId;
-private final StompSubscription subscription;
-
-public AckEntry(String messageId, StompSubscription subscription) {
-this.messageId = messageId;
-this.subscription = subscription;
-}
-
-public MessageAck onMessageAck(TransactionId transactionId) {
-return subscription.onStompMessageAck(messageId, transactionId);
-}
-
-public MessageAck onMessageNack(TransactionId transactionId) throws 
ProtocolException {
-return subscription.onStompMessageNack(messageId, transactionId);
-}
-
-public String getMessageId() {
-return this.messageId;
-}
-
-@SuppressWarnings("unused")
-public StompSubscription getSubscription() {
-return this.subscription;
-}
-}
-
 public ProtocolConverter(StompTransport stompTransport, BrokerContext 
brokerContext) {
 this.stompTransport = stompTransport;
 this.brokerContext = brokerContext;
@@ -383,9 +357,9 @@ public class ProtocolConverter {
 boolean nacked = false;
 
 if (ackId != null) {
-AckEntry pendingAck = this.pedingAcks.remove(ackId);
+StompAckEntry pendingAck = this.pendingAcks.get(ackId);
 if (pendingAck != null) {
-messageId = pendingAck.getMessageId();
+messageId = pendingAck.getMessageId().toString();
 MessageAck ack = pendingAck.onMessageNack(activemqTx);
 if (ack != null) {
 sendToActiveMQ(ack, createResponseHandler(command));
@@ -439,9 +413,9 @@ public class ProtocolConverter {
 boolean acked = false;
 
 if (ackId != null) {
-AckEntry pendingAck = this.pedingAcks.remove(ackId);
+StompAckEntry pendingAck = this.pendingAcks.get(ackId);
 if (pendingAck != null) {
-messageId = pendingAck.getMessageId();
+messageId = pendingAck.getMessageId().toString();

[activemq] branch master updated: AMQ-7218 Fix loss of Ack id from tracking after TX commit / abort

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new 063d24e  AMQ-7218 Fix loss of Ack id from tracking after TX commit / 
abort
063d24e is described below

commit 063d24e6d653bed3dd3c56302758de29143e5e82
Author: Timothy Bish 
AuthorDate: Wed May 29 17:25:30 2019 -0400

AMQ-7218 Fix loss of Ack id from tracking after TX commit / abort

Ensure that we properly track Ack IDs across TX commit and abort
operations and only clear out values enlisted in the TX on commit and
re-acquire the Ack Ids on TX abort.
---
 .../transport/stomp/ProtocolConverter.java |  96 +---
 .../activemq/transport/stomp/StompAckEntry.java| 101 
 .../stomp/StompQueueBrowserSubscription.java   |  11 +-
 .../transport/stomp/StompSubscription.java | 133 +++--
 .../activemq/transport/stomp/Stomp12Test.java  | 599 -
 5 files changed, 801 insertions(+), 139 deletions(-)

diff --git 
a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
 
b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
index 39b6d09..b3deac4 100644
--- 
a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
+++ 
b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -116,8 +116,10 @@ public class ProtocolConverter {
 private final Map transactions = new 
ConcurrentHashMap<>();
 private final StompTransport stompTransport;
 
-private final ConcurrentMap pedingAcks = new 
ConcurrentHashMap<>();
-private final IdGenerator ACK_ID_GENERATOR = new IdGenerator();
+// Global Map shared with all subscriptions to allow finding the sub 
associated with an ACK Id
+private final ConcurrentMap pendingAcksTracker = 
new ConcurrentHashMap<>();
+// Read-Only view used in this class to enforce the separation of read vs 
update of the global index.
+private final Map pendingAcks = 
Collections.unmodifiableMap(pendingAcksTracker);
 
 private final Object commnadIdMutex = new Object();
 private int lastCommandId;
@@ -131,34 +133,6 @@ public class ProtocolConverter {
 private float hbGracePeriodMultiplier = 1.0f;
 private String defaultHeartBeat = Stomp.DEFAULT_HEART_BEAT;
 
-private static class AckEntry {
-
-private final String messageId;
-private final StompSubscription subscription;
-
-public AckEntry(String messageId, StompSubscription subscription) {
-this.messageId = messageId;
-this.subscription = subscription;
-}
-
-public MessageAck onMessageAck(TransactionId transactionId) {
-return subscription.onStompMessageAck(messageId, transactionId);
-}
-
-public MessageAck onMessageNack(TransactionId transactionId) throws 
ProtocolException {
-return subscription.onStompMessageNack(messageId, transactionId);
-}
-
-public String getMessageId() {
-return this.messageId;
-}
-
-@SuppressWarnings("unused")
-public StompSubscription getSubscription() {
-return this.subscription;
-}
-}
-
 public ProtocolConverter(StompTransport stompTransport, BrokerContext 
brokerContext) {
 this.stompTransport = stompTransport;
 this.brokerContext = brokerContext;
@@ -387,9 +361,9 @@ public class ProtocolConverter {
 boolean nacked = false;
 
 if (ackId != null) {
-AckEntry pendingAck = this.pedingAcks.remove(ackId);
+StompAckEntry pendingAck = this.pendingAcks.get(ackId);
 if (pendingAck != null) {
-messageId = pendingAck.getMessageId();
+messageId = pendingAck.getMessageId().toString();
 MessageAck ack = pendingAck.onMessageNack(activemqTx);
 if (ack != null) {
 sendToActiveMQ(ack, createResponseHandler(command));
@@ -443,9 +417,9 @@ public class ProtocolConverter {
 boolean acked = false;
 
 if (ackId != null) {
-AckEntry pendingAck = this.pedingAcks.remove(ackId);
+StompAckEntry pendingAck = this.pendingAcks.get(ackId);
 if (pendingAck != null) {
-messageId = pendingAck.getMessageId();
+messageId = pendingAck.getMessageId().toString();
 MessageAck ack = pendingAck.onMessageAck(activemqTx);

[activemq-artemis] branch master updated: ARTEMIS-2351: update to proton-j 0.33.0 and qpid-jms 0.42.0

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new 4d526bf  ARTEMIS-2351: update to proton-j 0.33.0 and qpid-jms 0.42.0
 new c61f2d5  This closes #2678
4d526bf is described below

commit 4d526bf1366128b68c602982efce8634aad5ef22
Author: Robbie Gemmell 
AuthorDate: Wed May 22 14:54:21 2019 +0100

ARTEMIS-2351: update to proton-j 0.33.0 and qpid-jms 0.42.0
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3c7b1a5..5c055a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,10 +92,10 @@
   2.8.47
   4.1.34.Final
   2.0.22.Final
-  0.32.0
+  0.33.0
   3.0.19.Final
   1.7.21
-  0.41.0
+  0.42.0
   0.9.5
   1.0-alpha-1
   1

[activemq] branch activemq-5.15.x updated: AMQ-7179 Update Qpid JMS and Proton-j to latest and sync netty

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
 new acd66c4  AMQ-7179 Update Qpid JMS and Proton-j to latest and sync netty
acd66c4 is described below

commit acd66c412691e38292641b5f078de9e8d51ef195
Author: Timothy Bish 
AuthorDate: Tue Apr 9 11:23:36 2019 -0400

AMQ-7179 Update Qpid JMS and Proton-j to latest and sync netty

(cherry picked from commit 56ffcae3c7161b9c8e8a8fa121b8505659dda0cb)
---
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8442369..6896193 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,11 +104,11 @@
 1.1.2
 1.4.0
 3.4.6
-0.31.0
-0.40.0
-4.1.32.Final
-0.31.0
-4.1.32.Final
+0.32.0
+0.41.0
+4.1.34.Final
+0.32.0
+4.1.34.Final
 1.3
 1.0
 9.5.1-5

[activemq] branch master updated: AMQ-7179 Update Qpid JMS and Proton-j to latest and sync netty

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
 new 56ffcae  AMQ-7179 Update Qpid JMS and Proton-j to latest and sync netty
56ffcae is described below

commit 56ffcae3c7161b9c8e8a8fa121b8505659dda0cb
Author: Timothy Bish 
AuthorDate: Tue Apr 9 11:23:36 2019 -0400

AMQ-7179 Update Qpid JMS and Proton-j to latest and sync netty
---
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index d5f380d..4bdff14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,11 +104,11 @@
 1.1.2
 1.4.0
 3.4.6
-0.31.0
-0.40.0
-4.1.32.Final
-0.31.0
-4.1.32.Final
+0.32.0
+0.41.0
+4.1.34.Final
+0.32.0
+4.1.34.Final
 1.3
 1.0
 9.5.1-5

svn commit: r1042685 - /websites/production/activemq/content/activemq-website/contact/index.html

[tabish]

Author: tabish
Date: Thu Mar 28 16:07:27 2019
New Revision: 1042685

Log:
Update site content after recent changes

Modified:
websites/production/activemq/content/activemq-website/contact/index.html

Modified: 
websites/production/activemq/content/activemq-website/contact/index.html
==
--- websites/production/activemq/content/activemq-website/contact/index.html 
(original)
+++ websites/production/activemq/content/activemq-website/contact/index.html 
Thu Mar 28 16:07:27 2019
@@ -165,6 +165,14 @@
   ActiveMQ 5 JIRA
   https://issues.apache.org/jira/browse/AMQ;>https://issues.apache.org/jira/browse/AMQ
 
+
+  ActiveMQ CMS JIRA
+  https://issues.apache.org/jira/browse/AMQCPP;>https://issues.apache.org/jira/browse/AMQCPP
+
+
+  ActiveMQ NMS JIRA
+  https://issues.apache.org/jira/browse/AMQNET;>https://issues.apache.org/jira/browse/AMQNET
+
   
 
 

[activemq-website] branch master updated: Add links to CMS and NMS Jira trackers

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 7eb7278  Add links to CMS and NMS Jira trackers
7eb7278 is described below

commit 7eb7278476294ac0fdb51512af6b0561ad3be20c
Author: Timothy Bish 
AuthorDate: Thu Mar 28 11:56:31 2019 -0400

Add links to CMS and NMS Jira trackers
---
 src/contact/index.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/contact/index.md b/src/contact/index.md
index 2e7dc9c..7467c05 100644
--- a/src/contact/index.md
+++ b/src/contact/index.md
@@ -25,6 +25,8 @@ Slack|https://the-asf.slack.com|activemq|
 
 ActiveMQ Artemis 
JIRA|[https://issues.apache.org/jira/browse/ARTEMIS](https://issues.apache.org/jira/browse/ARTEMIS)
 ActiveMQ 5 
JIRA|[https://issues.apache.org/jira/browse/AMQ](https://issues.apache.org/jira/browse/AMQ)
+ActiveMQ CMS 
JIRA|[https://issues.apache.org/jira/browse/AMQCPP](https://issues.apache.org/jira/browse/AMQCPP)
+ActiveMQ NMS 
JIRA|[https://issues.apache.org/jira/browse/AMQNET](https://issues.apache.org/jira/browse/AMQNET)
 
 
 
@@ -81,4 +83,4 @@ This mailing list is for comments and other events for 
pull-requests on the Acti
 
Subscribe|[gitbox-subscr...@activemq.apache.org](mailto:gitbox-subscr...@activemq.apache.org)
 
Unsubscribe|[gitbox-unsubscr...@activemq.apache.org](mailto:gitbox-unsubscr...@activemq.apache.org)
 Apache 
Archive|[http://mail-archives.apache.org/mod_mbox/activemq-gitbox/](http://mail-archives.apache.org/mod_mbox/activemq-gitbox/)
-Mark Mail 
Archive|[http://activemq.markmail.org/search/list:org.apache.activemq.gitbox](http://activemq.markmail.org/search/list:org.apache.activemq.gitbox)
\ No newline at end of file
+Mark Mail 
Archive|[http://activemq.markmail.org/search/list:org.apache.activemq.gitbox](http://activemq.markmail.org/search/list:org.apache.activemq.gitbox)

svn commit: r1042647 [1/2] - in /websites/production/activemq/content/activemq-website: ./ projects/classic/download/

[tabish]

Author: tabish
Date: Wed Mar 27 22:15:43 2019
New Revision: 1042647

Log:
refresh staged bits with recent changes

Added:

websites/production/activemq/content/activemq-website/activemq-5153-release.html

websites/production/activemq/content/activemq-website/activemq-5154-release.html

websites/production/activemq/content/activemq-website/activemq-5155-release.html

websites/production/activemq/content/activemq-website/activemq-5156-release.html

websites/production/activemq/content/activemq-website/activemq-5157-release.html

websites/production/activemq/content/activemq-website/activemq-5158-release.html

websites/production/activemq/content/activemq-website/activemq-5159-release.html
Modified:
websites/production/activemq/content/activemq-website/download-archives.html

websites/production/activemq/content/activemq-website/projects/classic/download/index.html

Added: 
websites/production/activemq/content/activemq-website/activemq-5153-release.html
==
--- 
websites/production/activemq/content/activemq-website/activemq-5153-release.html
 (added)
+++ 
websites/production/activemq/content/activemq-website/activemq-5153-release.html
 Wed Mar 27 22:15:43 2019
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+ActiveMQ
+
+
+
+https://use.fontawesome.com/releases/v5.0.8/js/all.js&quot</a>; 
integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ"
 crossorigin="anonymous">
+https://code.jquery.com/jquery-3.2.1.slim.min.js&quot</a>; 
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
 crossorigin="anonymous">
+https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js&quot</a>; 
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
 crossorigin="anonymous">
+https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js&quot</a>; 
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
 crossorigin="anonymous">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Home
+
+
+Projects
+
+
+
+
+Projects
+
+ActiveMQ 
5
+ActiveMQ 
Artemis
+NMS Clients
+CMS Client
+
+
+
+
+
+
+Contact
+
+
+
+
+Contact
+
+Mailing 
Lists
+Chat
+Report 
Issues
+Contributing
+
+
+  
+
+
+
+
+Apache
+
+
+
+
+Apache
+
+https://www.apache.org;>The Apache Software 
Foundation
+https://www.apache.org/licenses/;>License
+https://www.apache.org/foundation/sponsorship.html;>Sponsorship
+https://www.apache.org/foundation/thanks.html;>Thanks
+https://www.apache.org/security/;>Security
+https://www.apache.org/events/current-event;>Events
+https://people.apache.org/phonebook.html?pmc=activemq;>PMC & 
Committers
+Board 
Reports
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  ActiveMQ 5.15.3 Release
+
+  
+  
+
+  
+Overview  Download  ActiveMQ 
5.15.3 Release
+
+ActiveMQ 5.15.3 Release
+
+Apache ActiveMQ 5.15.3 includes several resolvedhttps://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210version=12338822;>Â
 i

svn commit: r1042647 [2/2] - in /websites/production/activemq/content/activemq-website: ./ projects/classic/download/

[tabish]

Added: 
websites/production/activemq/content/activemq-website/activemq-5158-release.html
==
--- 
websites/production/activemq/content/activemq-website/activemq-5158-release.html
 (added)
+++ 
websites/production/activemq/content/activemq-website/activemq-5158-release.html
 Wed Mar 27 22:15:43 2019
@@ -0,0 +1,264 @@
+
+
+
+
+
+
+ActiveMQ
+
+
+
+https://use.fontawesome.com/releases/v5.0.8/js/all.js"; 
integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ"
 crossorigin="anonymous">
+https://code.jquery.com/jquery-3.2.1.slim.min.js"; 
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
 crossorigin="anonymous">
+https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"; 
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
 crossorigin="anonymous">
+https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"; 
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
 crossorigin="anonymous">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Home
+
+
+Projects
+
+
+
+
+Projects
+
+ActiveMQ 
5
+ActiveMQ 
Artemis
+NMS Clients
+CMS Client
+
+
+
+
+
+
+Contact
+
+
+
+
+Contact
+
+Mailing 
Lists
+Chat
+Report 
Issues
+Contributing
+
+
+  
+
+
+
+
+Apache
+
+
+
+
+Apache
+
+https://www.apache.org;>The Apache Software 
Foundation
+https://www.apache.org/licenses/;>License
+https://www.apache.org/foundation/sponsorship.html;>Sponsorship
+https://www.apache.org/foundation/thanks.html;>Thanks
+https://www.apache.org/security/;>Security
+https://www.apache.org/events/current-event;>Events
+https://people.apache.org/phonebook.html?pmc=activemq;>PMC & 
Committers
+Board 
Reports
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  ActiveMQ 5.15.8 Release
+
+  
+  
+
+  
+Overview  Download  ActiveMQ 
5.15.8 Release
+
+
+  This release enables ActiveMQ client TLS hostname validation by default 
which can cause a client connection failure for server certificates that do not 
match the server hostname. Please refer to SSL Transport Reference for 
configuration and https://issues.apache.org/jira/browse/AMQ-7047?src=confmacro;>AMQ-7047
 for more information.
+
+
+ActiveMQ 5.15.8 Release
+
+Apache ActiveMQ 5.15.8 includes several resolvedhttps://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210version=12344359;>Â
 issues and bug fixes.
+
+Getting the Binary Distributions
+
+
+  
+
+  Description
+  Download Link
+  Verify
+
+  
+  
+
+  Windows Distribution
+  http://archive.apache.org/dist/activemq/5.15.8/apache-activemq-5.15.8-bin.zip;>apache-activemq-5.15.8-bin.zip
+  https://archive.apache.org/dist/activemq/5.15.8/apache-activemq-5.15.8-bin.zip.asc;>ASC,
 https://archive.apache.org/dist/activemq/5.15.8/apache-activemq-5.15.8-bin.zip.sha512;>SHA512
+
+
+  Unix/Linux/Cygwin Distribution
+  http://archive.apache.org/dist/activemq/5.15.8/apache-activemq-5.15.8-bin.tar.gz;>apache-activemq-5.15.8-bin.tar.gz
+  

[activemq-website] branch master updated: Add missing past downloads pages and fix current zip link

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 01064dd  Add missing past downloads pages and fix current zip link
01064dd is described below

commit 01064dd52c0d006ebf6707af3d90d3d13dc8d281
Author: Timothy Bish 
AuthorDate: Wed Mar 27 17:58:47 2019 -0400

Add missing past downloads pages and fix current zip link
---
 src/activemq-5152-release.md   |  6 +++---
 ...mq-5152-release.md => activemq-5153-release.md} | 20 +-
 ...mq-5152-release.md => activemq-5154-release.md} | 20 +-
 ...mq-5152-release.md => activemq-5155-release.md} | 20 +-
 ...mq-5152-release.md => activemq-5156-release.md} | 22 +++-
 ...mq-5152-release.md => activemq-5157-release.md} | 22 +++-
 ...mq-5152-release.md => activemq-5158-release.md} | 22 +++-
 ...mq-5152-release.md => activemq-5159-release.md} | 24 --
 src/download-archives.md   |  7 +++
 src/projects/classic/download/index.md |  2 +-
 10 files changed, 90 insertions(+), 75 deletions(-)

diff --git a/src/activemq-5152-release.md b/src/activemq-5152-release.md
index 5a05389..8225f7c 100644
--- a/src/activemq-5152-release.md
+++ b/src/activemq-5152-release.md
@@ -16,8 +16,8 @@ Apache ActiveMQ 5.15.2 includes several resolved[ 
issues](https://issues.apache
 
 Description|Download Link|_Verify_
 ---|---|---
-Windows 
Distribution|[apache-activemq-5.15.2-bin.zip](http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.15.2/apache-activemq-5.15.2-bin.zip=download)|[ASC](https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.asc),
 
[MD5](https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.md5),
 
[SHA512](https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.sha512)
-Unix/Linux/Cygwin 
Distribution|[apache-activemq-5.15.2-bin.tar.gz](http://www.apache.org/dyn/closer.cgi?filename=/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz=download)|[ASC](https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.asc),
 
[MD5](https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.md5),
 
[SHA512](https://www.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.sha512)
+Windows 
Distribution|[apache-activemq-5.15.2-bin.zip](https://archive.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip)|[ASC](https://archive.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.asc),
 
[MD5](https://archive.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.md5),
 
[SHA512](https://archive.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.sha512)
+Unix/Linux/Cygwin 
Distribution|[apache-activemq-5.15.2-bin.tar.gz](https://archive.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz)|[ASC](https://archive.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.asc),
 
[MD5](https://archive.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.md5),
 
[SHA512](https://archive.apache.org/dist/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.sha512)
 
 Verify the Integrity of Downloads
 -
@@ -87,4 +87,4 @@ For a more detailed view of new features and bug fixes, see 
the [release notes]
 
 > This release affects applications using ObjectMessages. Please refer to 
 > [objectmessage](objectmessage) and jira-issue 
 > [AMQ-6013](https://issues.apache.org/jira/browse/AMQ-6013) for more 
 > information.
 
-Also see the previous [ActiveMQ 5.15.0 Release](activemq-5150-release)
\ No newline at end of file
+Also see the previous [ActiveMQ 5.15.0 Release](activemq-5150-release)
diff --git a/src/activemq-5152-release.md b/src/activemq-5153-release.md
similarity index 63%
copy from src/activemq-5152-release.md
copy to src/activemq-5153-release.md
index 5a05389..7abdc04 100644
--- a/src/activemq-5152-release.md
+++ b/src/activemq-5153-release.md
@@ -1,23 +1,23 @@
 ---
 layout: default_md
-title: ActiveMQ 5.15.2 Release 
+title: ActiveMQ 5.15.3 Release 
 title-class: page-title-activemq5
 type: activemq5
 ---
 
-[Overview](overview) > [Download](download) > [ActiveMQ 5.15.2 
Release](activemq-5152-release)
+[Overview](overview) > [Download](download) > [ActiveMQ 5.15.3 
Release](activemq-5153-release)
 
-ActiveMQ 5.15.2 Release
+ActiveMQ 5.15.3 Release
 ---
 
-Apache ActiveMQ 5.15.2 includes several resolved[ 
issues](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311210=12341669)
 and bug fixes.
+Apache ActiveMQ 5.15.3 includes several resolved[ 
issues](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=1231

svn commit: r1042644 - in /websites/production/activemq/content/activemq-website: ./ projects/nms/ projects/nms/providers/activemq/downloads/ projects/nms/providers/stomp/downloads/

[tabish]

Author: tabish
Date: Wed Mar 27 20:50:53 2019
New Revision: 1042644

Log:
refresh staged bits with recent changes

Modified:

websites/production/activemq/content/activemq-website/activemq-artemis-roadmap.html
websites/production/activemq/content/activemq-website/articles.html
websites/production/activemq/content/activemq-website/community.html
websites/production/activemq/content/activemq-website/jmx.html

websites/production/activemq/content/activemq-website/projects/nms/nms-api-downloads.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v110.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v120.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v130.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v140.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v141.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v150.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v151.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v152.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v153.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v154.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v155.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v156.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v160.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v161.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v162.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v163.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v164.html

websites/production/activemq/content/activemq-website/projects/nms/providers/activemq/downloads/apachenmsactivemq-v165.html

websites/production/activemq/content/activemq-website/projects/nms/providers/stomp/downloads/apachenmsstomp-v120.html

websites/production/activemq/content/activemq-website/projects/nms/providers/stomp/downloads/apachenmsstomp-v130.html

websites/production/activemq/content/activemq-website/projects/nms/providers/stomp/downloads/apachenmsstomp-v140.html

websites/production/activemq/content/activemq-website/projects/nms/providers/stomp/downloads/apachenmsstomp-v150.html

websites/production/activemq/content/activemq-website/projects/nms/providers/stomp/downloads/apachenmsstomp-v151.html

websites/production/activemq/content/activemq-website/projects/nms/providers/stomp/downloads/apachenmsstomp-v152.html

websites/production/activemq/content/activemq-website/projects/nms/providers/stomp/downloads/apachenmsstomp-v153.html
websites/production/activemq/content/activemq-website/spring-support.html
websites/production/activemq/content/activemq-website/support.html

websites/production/activemq/content/activemq-website/virtual-destinations.html

Modified: 
websites/production/activemq/content/activemq-website/activemq-artemis-roadmap.html
==
--- 
websites/production/activemq/content/activemq-website/activemq-artemis-roadmap.html
 (original)
+++ 
websites/production/activemq/content/activemq-website/activemq-artemis-roadmap.html
 Wed Mar 27 20:50:53 2019
@@ -146,6 +146,13 @@
   Support full-duplex broker-to-broker cluster connections https://issues.apache.org/jira/browse/ARTEMIS-838;>ARTEMIS-838
 
 
+ActiveMQ 5.x Client 
Compatibility
+
+
+  Full support of Openwire (TODO: specifically, which versions)
+  PooledConnectionFactory
+
+
 Destination Interceptors
 
 

Modified: websites/production/activemq/content/activemq-website/articles.html
==
--- websites/production/activemq/content/activemq-website/articles.html 
(original)
+++ websites/production/activemq/content/activemq-website/articles.html Wed Mar 
27 20:50:53 2019
@@ -181

[activemq-website] branch master updated: Fix broken download links on NMS sites

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new a20c977  Fix broken download links on NMS sites
a20c977 is described below

commit a20c97788ff994080cb4700054f1e95368a9f1cb
Author: Timothy Bish 
AuthorDate: Wed Mar 27 16:48:01 2019 -0400

Fix broken download links on NMS sites
---
 src/projects/nms/nms-api-downloads.md| 20 ++--
 .../activemq/downloads/apachenmsactivemq-v110.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v120.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v130.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v140.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v141.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v150.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v151.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v152.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v153.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v154.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v155.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v156.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v160.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v161.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v162.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v163.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v164.md |  4 ++--
 .../activemq/downloads/apachenmsactivemq-v165.md |  4 ++--
 .../providers/stomp/downloads/apachenmsstomp-v120.md |  4 ++--
 .../providers/stomp/downloads/apachenmsstomp-v130.md |  4 ++--
 .../providers/stomp/downloads/apachenmsstomp-v140.md |  4 ++--
 .../providers/stomp/downloads/apachenmsstomp-v150.md |  4 ++--
 .../providers/stomp/downloads/apachenmsstomp-v151.md |  4 ++--
 .../providers/stomp/downloads/apachenmsstomp-v152.md |  4 ++--
 .../providers/stomp/downloads/apachenmsstomp-v153.md |  4 ++--
 26 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/projects/nms/nms-api-downloads.md 
b/src/projects/nms/nms-api-downloads.md
index 23750b4..b83a8e2 100644
--- a/src/projects/nms/nms-api-downloads.md
+++ b/src/projects/nms/nms-api-downloads.md
@@ -116,8 +116,8 @@ Refer to the API for this release 
[here](nms-Index/Site/NavigationIndex/Site/Nav
 
 |Description|Download Link|PGP Signature File|Version|
 |---|---|---|---|
-|Apache.NMS Source 
code|[Apache.NMS-1.5.1-src.zip](http://www.apache.org/dyn/closer.cgi/activemq/apache-nms/1.5.0/Apache.NMS-1.5.1-src.zip)|[Apache.NMS-1.5.1-src.zip.asc](http://www.apache.org/dyn/closer.cgi/activemq/apache-nms/1.5.0/Apache.NMS-1.5.1-src.zip.asc)|1.5.1.2739|
-|Apache.NMS Binary 
Assemblies|[Apache.NMS-1.5.1-bin.zip](http://www.apache.org/dyn/closer.cgi/activemq/apache-nms/1.5.0/Apache.NMS-1.5.1-bin.zip)|[Apache.NMS-1.5.1-bin.zip.asc](http://www.apache.org/dyn/closer.cgi/activemq/apache-nms/1.5.0/Apache.NMS-1.5.1-bin.zip.asc)|1.5.1.2739|
+|Apache.NMS Source 
code|[Apache.NMS-1.5.1-src.zip](https://archive.apache.org/dist/activemq/apache-nms/1.5.0/Apache.NMS-1.5.1-src.zip)|[Apache.NMS-1.5.1-src.zip.asc](https://archive.apache.org/dist/activemq/apache-nms/1.5.0/Apache.NMS-1.5.1-src.zip.asc)|1.5.1.2739|
+|Apache.NMS Binary 
Assemblies|[Apache.NMS-1.5.1-bin.zip](https://archive.apache.org/dist/activemq/apache-nms/1.5.0/Apache.NMS-1.5.1-bin.zip)|[Apache.NMS-1.5.1-bin.zip.asc](https://archive.apache.org/dist/activemq/apache-nms/1.5.0/Apache.NMS-1.5.1-bin.zip.asc)|1.5.1.2739|
 
 # SVN Tag Checkout
 ```
@@ -148,8 +148,8 @@ Refer to the API for this release 
[here](nms-Index/Site/NavigationIndex/Site/Nav
 
 |Description|Download Link|PGP Signature File|Version|
 |---|---|---|---|
-|Apache.NMS Source 
code|[Apache.NMS-1.5.0-src.zip](http://www.apache.org/dyn/closer.cgi/activemq/apache-nms/1.5.0/Apache.NMS-1.5.0-src.zip)|[Apache.NMS-1.5.0-src.zip.asc](http://www.apache.org/dyn/closer.cgi/activemq/apache-nms/1.5.0/Apache.NMS-1.5.0-src.zip.asc)|1.5.0.2194|
-|Apache.NMS Binary 
Assemblies|[Apache.NMS-1.5.0-bin.zip](http://www.apache.org/dyn/closer.cgi/activemq/apache-nms/1.5.0/Apache.NMS-1.5.0-bin.zip)|[Apache.NMS-1.5.0-bin.zip.asc](http://www.apache.org/dyn/closer.cgi/activemq/apache-nms/1.5.0/Apache.NMS-1.5.0-bin.zip.asc)|1.5.0.2194|
+|Apache.NMS Source 
code|[Apache.NMS-1.5.0-src.zip](https://archive.apache.org/dist/activemq/apache-nms/1.5.0/Apache.NMS-1.5.0-src.zip)|[Apache.NMS-1.5.0-src.zip.asc](https://archive.apache.org/dist/activemq/apache-nms/1.5.0/Apache.NMS-1.5.0-src.zip.asc)|1.5.0.2194|
+|Apache.NMS Binary 
Assemblies|[Apache.NMS-1.5.0-bin.zip](https://archive.apache.org/dist/activemq/apache-nms/1.5.0/Apache.NMS-1.5.0-bin.zip)|[Apache.NMS-1.5.0-bin.zip.asc](https://archive.apache.org/dist/activemq/apache-nms/1.5.0

[activemq-website] branch master updated: fix broken team link on community page

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 3fc2a2d  fix broken team link on community page
3fc2a2d is described below

commit 3fc2a2d81c04de6b8fc0789c25b780843ff312d5
Author: Timothy Bish 
AuthorDate: Wed Mar 27 16:32:53 2019 -0400

fix broken team link on community page
---
 src/community.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/community.md b/src/community.md
index 1dbe327..48a41d1 100644
--- a/src/community.md
+++ b/src/community.md
@@ -31,7 +31,7 @@ type: activemq5
 *   [Security Advisories](security-advisories)
 *   [Sponsorship](sponsorship)
 *   [Support](support)
-*   [Team](team)
+*   [Team](https://people.apache.org/phonebook.html?pmc=activemq)
 *   [Tips for getting help](tips-for-getting-help)
 *   [Users](users)
 

[activemq-website] branch master updated: Add missing information to the support page

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 5964cf1  Add missing information to the support page
5964cf1 is described below

commit 5964cf1a0b79888f9a35374e1ec0b11e9cc522a8
Author: Timothy Bish 
AuthorDate: Wed Mar 27 16:17:43 2019 -0400

Add missing information to the support page
---
 src/support.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/support.md b/src/support.md
index b9df808..218d272 100644
--- a/src/support.md
+++ b/src/support.md
@@ -44,10 +44,12 @@ Commercial Support
 This is an open source project, so the amount of time we have available to 
help resolve your issue is often limited as all help is provided on a volunteer 
basis. If you want to get priority help, need to get up to speed quickly, 
require some training or mentoring, or need full 24 x 7 production support you 
should contact a commercial company specializing in ActiveMQ support such as...
 
 *   [apifocal](https://apifocal.com) is a Professional Services company. 
Headquartered near Washington, DC, USA, APIfocal provides consulting and 
training for leveraging the Apache Integration stack and commercial ESBs at 
large scale, adding automation and devops capabilities.
+*   [Amazon Web Services](https://aws.amazon.com/) provides [Amazon 
MQ](https://aws.amazon.com/amazon-mq/), a managed message broker service for 
Apache ActiveMQ in the cloud. Amazon MQ manages the work involved in setting up 
an ActiveMQ message broker, from provisioning the infrastructure capacity you 
request–including server instances and storage–to installing the broker 
software itself. Once your broker is up and running, Amazon MQ automates common 
administrative tasks such as patching [...]
 *   [Media Driver](http://mediadriver.com) provides consulting services and 
management tools for Apache ActiveMQ and the Apache Integration stack for both 
the commercial and public sector.  We bring a full suite of project delivery 
services including business and technical analysis, proof of concepts, 
architectural guidance, best practice integration, and project management.  
Media Driver offers training classes for developers and administrators, as well 
as middleware management software.
+*   [HYTE](https://hyte.io/activemq-support/) Under the Apache License, HYTE 
offers HYTE MQ, an Open Source package of Apache ActiveMQ, which provides 
enterprises a single distribution to support all DevOps pipelines and allows 
deployment in any environment: containers, cloud and on-premise. HYTE MQ is 
pre-configured with deployment and consulting best practices to ensure 
stability and ease of maintenance.  HYTE’s commercial offerings include: HYTE 
Console which provides a self-service,  [...]
 *   [Rogue Wave / OpenLogic](http://www.openlogic.com/) has a dedicated team 
of OSS experts offering round-the-clock Production Support with competitive 
SLAs for troubleshooting ActiveMQ issues and outages. Rogue Wave offers a 
comprehensive week-long instructor-led training program for developers and 
admins. Rogue Wave OpenLogic also provides Architecture and Design Consulting, 
and a Developer Support contract to assist in the development of messaging 
applications.
 *   [Red Hat](http://www.redhat.com/products/jbossenterprisemiddleware/amq/) 
offers JBoss A-MQ, a supported distribution of Apache ActiveMQ, that include 
Enterprise Developer and Production Support, and offer training and consultancy 
for enterprise deployments.
-*   [Savoir Technologies, Inc](http://www.savoirtech.com) provides enterprise 
consulting, training and support for ActiveMQ and a host of other Apache 
service containers. Savoir can provide best practice mentoring for developing 
with ActiveMQ, as well as architectural/design reviews, troubleshooting and SOA 
infrastructure implementations. Savoir's staff includes some of the 
contributors of ActiveMQ who are on the ground consulting and are familiar with 
real world implementations and issues.
+*   [Savoir Technologies, Inc](http://www.savoirtech.com) provides enterprise 
consulting, training and support for ActiveMQ, Apache ActiveMQ Artemis, and a 
host of other Apache service containers. Savoir can provide best practice 
mentoring for developing with ActiveMQ and ActiveMQ Artemis, as well as 
architectural/design reviews, troubleshooting and SOA infrastructure 
implementations. Savoir's staff includes some of the contributors of ActiveMQ 
and ActiveMQ Artemis who are on the ground  [...]
 *   [Total Transaction Management (TTM)](http://www.ttmsolutions.com/) 
provides ActiveMQ consulting and support, as well as security and 
[monitoring](http://www.ttmsolutions.com/Transactional_Software_Solutions/Active_Monitor_AMon.php/)
 add-on products and [reference 
guide](http://www.ttmsolutions.com

[activemq-website] branch master updated: Add missing documentation from JMX page

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 94bfa75  Add missing documentation from JMX page
94bfa75 is described below

commit 94bfa75c3adfc487dabc8030d940ebbdedbb63db
Author: Timothy Bish 
AuthorDate: Wed Mar 27 16:06:12 2019 -0400

Add missing documentation from JMX page
---
 src/jmx.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jmx.md b/src/jmx.md
index 73aca1c..6729064 100644
--- a/src/jmx.md
+++ b/src/jmx.md
@@ -156,7 +156,7 @@ Property Name|Default Value|Description
 useMBeanServer|true|If true then it avoids creating a new MBean server if a 
MBeanServer has already been created in the JVM
 jmxDomainName|org.apache.activemq|The jmx domain that all objects names will 
use
 createMBeanServer|true|If we should create the MBeanServer is none is found.
-createConnector|false|Please refer to [Java Management 
guide](http://docs.oracle.com/javase/6/docs/technotes/guides/management/agent.html)
 to configure the server for remote management and lock down the endpoint 
serialisation with an appropriate 
[jdk.serialFilter](http://openjdk.java.net/jeps/290)
+createConnector|false|Please refer to [Java Management 
guide](http://docs.oracle.com/javase/6/docs/technotes/guides/management/agent.html)
 to configure the server for remote management and lock down the endpoint 
serialisation with an appropriate 
[jdk.serialFilter](http://openjdk.java.net/jeps/290)Note: if set to 
true:*lock down the endpoint serialisation with an appropriate 
jdk.serialFilter*configure rmiServerPort and connectorHost to lock down 
the RMI server inte [...]
 connectorPort|1099|The port that the JMX connector will use
 connectorHost|localhost|The host that the JMX connector and RMI server (if 
rmiServerPort>0) will use
 rmiServerPort|0|The RMI server port, handy if port usage needs to be 
restricted behind a firewall

[activemq-website] branch master updated: Add missing content from the Artemis Roadmap page

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new d3324cd  Add missing content from the Artemis Roadmap page
d3324cd is described below

commit d3324cd1abbf7d5c88f58665f5bfb8a70161b81f
Author: Timothy Bish 
AuthorDate: Wed Mar 27 15:55:38 2019 -0400

Add missing content from the Artemis Roadmap page
---
 src/activemq-artemis-roadmap.md | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/activemq-artemis-roadmap.md b/src/activemq-artemis-roadmap.md
index 14ca631..4b386f5 100644
--- a/src/activemq-artemis-roadmap.md
+++ b/src/activemq-artemis-roadmap.md
@@ -36,6 +36,11 @@ This section should be used to identify all the ActiveMQ 5.x 
features that Artem
 
 *   Support full-duplex broker-to-broker cluster connections 
[ARTEMIS-838](https://issues.apache.org/jira/browse/ARTEMIS-838)
 
+### ActiveMQ 5.x Client Compatibility
+
+*Full support of Openwire (TODO: specifically, which versions)
+*PooledConnectionFactory
+
 ### Destination Interceptors
 
 *   Virtual Topic support 
[ARTEMIS-550](https://issues.apache.org/jira/browse/ARTEMIS-550)

[activemq-website] branch master updated: Sync virtual destination docs with latest wiki edits

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 65c7c47  Sync virtual destination docs with latest wiki edits
65c7c47 is described below

commit 65c7c47f07effed84fbfd1668bf433d866d41388
Author: Timothy Bish 
AuthorDate: Wed Mar 27 15:43:10 2019 -0400

Sync virtual destination docs with latest wiki edits
---
 src/virtual-destinations.md | 23 +--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/virtual-destinations.md b/src/virtual-destinations.md
index 907fa86..21d79da 100644
--- a/src/virtual-destinations.md
+++ b/src/virtual-destinations.md
@@ -58,6 +58,21 @@ local|false|when true, don't fan out messages that were 
received over a network
 concurrentSend|false|when true, use an executor to fanout such that sends 
occur in parallel. This allows the journal to batch writes which will reduce 
disk io (5.12)
 transactedSend|false|when true, use a transaction for fanout sends such that 
there is a single disk sync. A local broker transaction will be created if 
there is no client transaction (5.13)
 dropOnResourceLimit|false|when true, ignore any ResourceAllocationException 
thrown during fanout (see: sendFailIfNoSpace policy entry) (5.16)
+setOriginalDestination|true|when true, the destination on the forwarded 
message is set to the consumer queue and the originalDestination message 
property tracks the virtual topic (5.16)
+
+VirtualSelectorCacheBrokerPlugin
+
+
+When selectorAware=true, only active consumers are condidered for selector 
matching. If consumers disconnect and reconnect they will miss messages. The 
intent of selectorAware=true is to not have messages build up. The 
virtualSelectorCacheBrokerPlugin provides a cache that tracks the selectors 
associated with a destination by a consumers such that they can apply in the 
absense of that consumer. In this way the just the selected messages build up. 
The existing set of selectors can be pers [...]
+Code Block
+
+```
+
+ 
+
+```
+
+Note: the persistFile option uses java serialisation that should be locked 
down with an appropriate jdk.serialFilter that allows ConcurrentHashMap
 
 Composite Destinations
 --
@@ -114,9 +129,13 @@ The following example shows how a message sent to the 
virtual destination **MY.Q
 Avoiding Duplicate Message in a Network of Brokers
 --
 
-You have to make sure that the messages sent to the 
**Consumer.*.VirtualTopic.>** destination are not forwarded when you're using 
both queue-based and non-queue based subscribers to the virtual topic (that is, 
if you have normal topic subscribers to the virtual topic). If you use Virtual 
Topics in a network of brokers, it is likely you will get duplicate messages if 
you use the default network configuration. This is because a network node will 
not only forward message sent to the virtual [...]
+**TLDR:** bridge consumer queues or virtual topics, not both.
+
+Typically you would network consumer queues. In this case it is important to 
not bridge any normal topic consumer on the virtual topic because any forwarded 
message would again get fanned out to consumer queues on the networked broker, 
leading to duplicates.
+
+It is also possible to bridge the virtual topic in which case it is necessary 
exclude the consumer queues from any network connector configuration. 
 
-Here is an example of how to do that:
+Here is an example of how to exclude virtual topic consumer queues:
 ```
  
   

[activemq-website] branch master updated: Fix broken link to spring articles

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 184c5b2  Fix broken link to spring articles
184c5b2 is described below

commit 184c5b26ebc721d29491398d551b68a6c9e0b758
Author: Timothy Bish 
AuthorDate: Wed Mar 27 15:33:01 2019 -0400

Fix broken link to spring articles
---
 src/articles.md   | 4 ++--
 src/spring-support.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/articles.md b/src/articles.md
index a6b7c65..78ad515 100644
--- a/src/articles.md
+++ b/src/articles.md
@@ -64,10 +64,10 @@ This page captures resources and articles outside the 
ActiveMQ project which may
 
 *   [Spring JMS Examples with 
ActiveMQ](https://github.com/bsnyder/spring-jms-examples) by [Bruce 
Snyder](https://bsnyderblog.blogspot.com/) (June 2011)
 *   [Tuning JMS Message Consumption In 
Spring](https://bsnyderblog.blogspot.com/2010/05/tuning-jms-message-consumption-in.html)
 by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (May 2010)
-*   [Synchronous Request Response with ActiveMQ and 
Spring](http://codedependents.com/2010/03/04/synchronous-request-response-with-activemq-and-spring/)
 _by [CodeDependents](http://codedependents.com/)_ (March 2010)
+*   [Synchronous Request Response with ActiveMQ and 
Spring](https://medium.com/@bdarfler/synchronous-request-response-with-activemq-and-spring-21359a438a86)
 _by [CodeDependents](http://codedependents.com/)_ (March 2010)
 *   [Using Spring to Receive JMS 
Messages](https://bsnyderblog.blogspot.com/2010/02/using-spring-to-receive-jms-messages.html)
 by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (February 2010)
 *   [Using Spring to Send JMS 
Messages](https://bsnyderblog.blogspot.com/2010/02/using-spring-jmstemplate-to-send-jms.md)
 by [Bruce Snyder](https://bsnyderblog.blogspot.com/) (February 2010)
-*   [Efficient Lightweight JMS with Spring and 
ActiveMQ](http://codedependents.com/2009/10/16/efficient-lightweight-jms-with-spring-and-activemq/)
 _by [CodeDependents](http://codedependents.com/)_ (Octover 2009)
+*   [Efficient Lightweight JMS with Spring and 
ActiveMQ](https://medium.com/@bdarfler/efficient-lightweight-jms-with-spring-and-activemq-51ff6a135946)
 _by [CodeDependents](http://codedependents.com/)_ (Octover 2009)
 *   [ActiveMQ Message Consumer in 
Spring](http://javaandjava.blogspot.com/2008/10/activemq-message-consumer-in-spring.html)
 _by [Saveen Kumar](http://javaandjava.blogspot.com/)_ (October 2008)
 *   [Message-Driven Architectures at The Spring 
Experience](http://www.springframework.org/node/527) _by Keith Donald_ 
(September 2007)
 
diff --git a/src/spring-support.md b/src/spring-support.md
index 19ed2e8..4cb9e2c 100644
--- a/src/spring-support.md
+++ b/src/spring-support.md
@@ -9,7 +9,7 @@ type: activemq5
 
 
 We fully support Spring for configuration of the JMS client side as well as 
for configuring the JMS Message Broker.  
-There is a great 
[article](http://codedependents.com/2009/10/16/efficient-lightweight-jms-with-spring-and-activemq/)
 on using Spring with ActiveMQ - I'd recommend reading it first.
+There is a great 
[article](https://medium.com/@bdarfler/efficient-lightweight-jms-with-spring-and-activemq-51ff6a135946)
 on using Spring with ActiveMQ - I'd recommend reading it first.
 
 Configuring the JMS client
 --

[activemq-website] branch master updated: ignore jekyll runtime metadata files

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 0789dc8  ignore jekyll runtime metadata files
0789dc8 is described below

commit 0789dc83fc2e606ba8f2e95d872d568fd09661fd
Author: Timothy Bish 
AuthorDate: Wed Mar 27 14:33:22 2019 -0400

ignore jekyll runtime metadata files
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c8b9a5e..f759991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 _site
 target/*
 Gemfile.lock
+.jekyll-metadata 

[activemq-website] branch master updated: Fix broken links on CMS client downloads pages

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new c599af4  Fix broken links on CMS client downloads pages
c599af4 is described below

commit c599af4c46055335995f687134450d46ce1daf2e
Author: Timothy Bish 
AuthorDate: Wed Mar 27 14:25:59 2019 -0400

Fix broken links on CMS client downloads pages
---
 src/projects/cms/download/390-release.md | 6 +++---
 src/projects/cms/download/391-release.md | 6 +++---
 src/projects/cms/download/392-release.md | 6 +++---
 src/projects/cms/download/393-release.md | 6 +++---
 src/projects/cms/download/394-release.md | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/projects/cms/download/390-release.md 
b/src/projects/cms/download/390-release.md
index 45b5497..2f66f0e 100644
--- a/src/projects/cms/download/390-release.md
+++ b/src/projects/cms/download/390-release.md
@@ -24,9 +24,9 @@ Download Here
 
 |Description|Download Link|PGP Signature file of download|
 |---|---|---|---|
-|Source code for 
Windows|[activemq-cpp-library-3.9.0.src.zip](http://www.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.zip)|[activemq-cpp-library-3.9.0-src.zip.asc](http://www.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.zip.asc)|
-|Source code for Unix 
(gzipped)|[activemq-cpp-library-3.9.0-src.tar.gz](http://www.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.gz)|[activemq-cpp-library-3.9.0-src.tar.gz.asc](http://www.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.gz.asc)|
-|Source code for Unix 
(bz2)|[activemq-cpp-library-3.9.0-src.tar.bz2](http://www.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.bz2)|[activemq-cpp-library-3.9.0.src.tar.bz2.asc](http://www.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.bz2.asc)|
+|Source code for 
Windows|[activemq-cpp-library-3.9.0.src.zip](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.zip)|[activemq-cpp-library-3.9.0-src.zip.asc](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.zip.asc)|
+|Source code for Unix 
(gzipped)|[activemq-cpp-library-3.9.0-src.tar.gz](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.gz)|[activemq-cpp-library-3.9.0-src.tar.gz.asc](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.gz.asc)|
+|Source code for Unix 
(bz2)|[activemq-cpp-library-3.9.0-src.tar.bz2](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.bz2)|[activemq-cpp-library-3.9.0.src.tar.bz2.asc](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.0/activemq-cpp-library-3.9.0-src.tar.bz2.asc)|
 
 Git Tag Checkout
 
diff --git a/src/projects/cms/download/391-release.md 
b/src/projects/cms/download/391-release.md
index 9f3d90c..aa98035 100644
--- a/src/projects/cms/download/391-release.md
+++ b/src/projects/cms/download/391-release.md
@@ -24,9 +24,9 @@ Download Here
 
 |Description|Download Link|PGP Signature file of download|
 |---|---|---|---|
-|Source code for 
Windows|[activemq-cpp-library-3.9.1.src.zip](http://www.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.zip)|[activemq-cpp-library-3.9.1-src.zip.asc](http://www.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.zip.asc)|
-|Source code for Unix 
(gzipped)|[activemq-cpp-library-3.9.1-src.tar.gz](http://www.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.gz)|[activemq-cpp-library-3.9.1-src.tar.gz.asc](http://www.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.gz.asc)|
-|Source code for Unix 
(bz2)|[activemq-cpp-library-3.9.1-src.tar.bz2](http://www.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.bz2)|[activemq-cpp-library-3.9.1.src.tar.bz2.asc](http://www.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.bz2.asc)|
+|Source code for 
Windows|[activemq-cpp-library-3.9.1.src.zip](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.zip)|[activemq-cpp-library-3.9.1-src.zip.asc](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.zip.asc)|
+|Source code for Unix 
(gzipped)|[activemq-cpp-library-3.9.1-src.tar.gz](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.gz)|[activemq-cpp-library-3.9.1-src.tar.gz.asc](http://archive.apache.org/dist/activemq/activemq-cpp/3.9.1/activemq-cpp-library-3.9.1-src.tar.gz.asc)|
+|Source code for Unix 
(bz2)|[activemq-cpp-library-3.9.1-src.tar.bz2

svn commit: r32296 - /release/activemq/activemq-cpp/3.9.5/

[tabish]

Author: tabish
Date: Fri Feb  1 16:57:12 2019
New Revision: 32296

Log:
Add ActiveMQ-CPP v3.9.5 release to repository


Added:
release/activemq/activemq-cpp/3.9.5/
  - copied from r32295, dev/activemq/activemq-cpp/3.9.5/

svn commit: r32139 - /dev/activemq/activemq-cpp/3.9.5/

[tabish]

Author: tabish
Date: Fri Jan 25 21:34:44 2019
New Revision: 32139

Log:
Prepare for CMNS v3.9.5

Added:
dev/activemq/activemq-cpp/3.9.5/
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2   
(with props)
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2.asc

dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2.sha512
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz   
(with props)
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz.asc
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz.sha512
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.zip   (with 
props)
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.zip.asc
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.zip.sha512

Added: dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2
==
Binary file - no diff available.

Propchange: 
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2
--
svn:mime-type = application/octet-stream

Added: 
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2.asc
==
--- dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2.asc 
(added)
+++ dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2.asc 
Fri Jan 25 21:34:44 2019
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEhTnkiPXJeATrWVb7GxYSAwEmcusFAlxLf9QACgkQGxYSAwEm
+cuuIBw//bcR5vUcybrK1Ladzl/Pk15xtAPF/aGmYs0eQ877lOXmQlVHZWvt+THYx
+h9ZXYpkwbTnuvWB8DF1JHXuAF7BL/pVekzOAhtoQXpEaOZ/JqvLU2yoi8O8NnYkO
+C7gfCqeUf16TLGoFssyWmcQD28aEEeGg7FiP6tqFwfvl8BLCPM+UVJrIR/J8b0at
+oC9z4Yrz4NJdCs8Vq1N0loi7FuCSoDOaB31wq6/LuKTfxZgWWU2HgUxlyQanmF47
+LivcXTGqH6RkcAC9qvzX90YjEE2734Wn7IqZIxu1NbMW8CyYvogmUwiSiPSJgeTn
+MnxUlIVQZ+DpU5dlVN2k9I+vLCXG11xrNwUbnfIcJd7bTc96YsMFiGrTh/tv6XqD
+JhZnkOxgRcq3RXtBdX9B/fGdUKDceFkTPVKA7LG8RWtcsL5r8oavzYZAHLp4/cv1
+jZqv4eiMyQjJ8mR5Fa2EdHhiJ5RNtMMia/72E4hLRTw11fcJP9gNhF4ri/RWtJgy
+CrR4CssWeKr+3iKhYU5PFirjuvoslXNuayGDeP6v0J328RmzSozVyaoKqpAwEEKe
+NVG1bUnvAwXxMgy8ZsKrNIAmuXSXW9WvRtM0qqbG2hSYQBqQADUenWVgl82hjgxf
+G0XImQrjUzrsv1lvhC1g/LX2YEfxkGkwbN+dxrVlewaRSmZfR6U=
+=Rrpz
+-END PGP SIGNATURE-

Added: 
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2.sha512
==
--- 
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2.sha512 
(added)
+++ 
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.bz2.sha512 
Fri Jan 25 21:34:44 2019
@@ -0,0 +1 @@
+83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2
  activemq-cpp-library-3.9.5-src.tar.bz2

Added: dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz.asc
==
--- dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz.asc 
(added)
+++ dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz.asc 
Fri Jan 25 21:34:44 2019
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCgAdFiEEhTnkiPXJeATrWVb7GxYSAwEmcusFAlxLf+wACgkQGxYSAwEm
+cuu6qQ/+PpvXgIzt0IWwFbPLU+8W1atut21EG+ylDboVh53ngWJweZlSb935tPF/
+OSz6fwv2Uga/EPt0qfAqNwvmn7jYkppU1BYuB2pit+olIb9vDZXRo0El/rc6CUeR
+E265SlNtwCyqUupNXgimzywsj7DyxraDZ2PtlM0esaER85GgTaR9sKmhwj0Jnvqp
+bGN5b5/4JwUTFymtp1M7mlWRPJir6WZDchCraUN1Y+W0KO3I0dHcpagFLMwAxP5p
+605AiXQdbTFLEX0bYFr+GLpMI/VOvo/FlqEgepuFpfYRnm9My9RjuugYt9Wzl1wc
+8a8G08pRh7exi/4A0znl5PkAjCVSXE1PUCv9qYfdBQSadES3wfe+fY7qIvbSgTQr
+sR/eJlV2IZDC6M/r5zAtC9U7WJqstWH61gGKyLgEJ4wi3z2dhrOw/ZhYgZQREMjw
+nzeIbyKPfZ36NUlo+is3cMInb7KyA8eT/ocJBTDwBGaiA6GGFXmZKvJn/5nYSKmd
+2gFzmbl+dmQTZ5MW5aHTP/nq4ON3mI53bkiFwMGHjTSv286iPIhW8eOeC5WHXK4S
+cBQCnRhSLwm/hAeD2E27pEUWX4HU1iA6ALoesJL+leNaYCIy5gQ/h2/rxgpI53Q4
+0sCQaRRrX7GYXb8Qceg0bM7FHEeA1undNSF/cXk/xuwOo2VN6NE=
+=FPdD
+-END PGP SIGNATURE-

Added: 
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz.sha512
==
--- 
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz.sha512 
(added)
+++ 
dev/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5

[activemq-cpp] annotated tag activemq-cpp-3.9.5 created (now e272f0b)

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a change to annotated tag activemq-cpp-3.9.5
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git.


  at e272f0b  (tag)
 tagging fcbe30b1923f1a9565e6ae39d034d410fafe32c6 (commit)
 replaces activemq-cpp-3.9.4
  by Timothy Bish
  on Fri Jan 25 16:08:47 2019 -0500

- Log -
Release tag for ActiveMQ-CPP v3.9.5
---

No new revisions were added by this update.

[activemq-cpp] branch 3.9.x updated: NO-JIRA Update Project poms to reflect 3.9.5 release

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch 3.9.x
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git


The following commit(s) were added to refs/heads/3.9.x by this push:
 new fcbe30b  NO-JIRA Update Project poms to reflect 3.9.5 release
fcbe30b is described below

commit fcbe30b1923f1a9565e6ae39d034d410fafe32c6
Author: Timothy Bish 
AuthorDate: Fri Jan 25 15:47:04 2019 -0500

NO-JIRA Update Project poms to reflect 3.9.5 release
---
 activemq-cpp-openwire-generator/pom.xml | 2 +-
 activemq-cpp/pom.xml| 2 +-
 maven-cpptools-plugin/pom.xml   | 2 +-
 pom.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/activemq-cpp-openwire-generator/pom.xml 
b/activemq-cpp-openwire-generator/pom.xml
index 906dbc9..6503176 100644
--- a/activemq-cpp-openwire-generator/pom.xml
+++ b/activemq-cpp-openwire-generator/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.activemq-cpp
 activemq-cpp-pom
-3.9.5-SNAPSHOT
+3.9.5
   
 
   activemq-cpp-openwire-generator
diff --git a/activemq-cpp/pom.xml b/activemq-cpp/pom.xml
index 19cc83b..4f852b0 100644
--- a/activemq-cpp/pom.xml
+++ b/activemq-cpp/pom.xml
@@ -24,7 +24,7 @@
   
 org.apache.activemq-cpp
 activemq-cpp-pom
-3.9.5-SNAPSHOT
+3.9.5
   
 
   activemq-cpp-library
diff --git a/maven-cpptools-plugin/pom.xml b/maven-cpptools-plugin/pom.xml
index 6bdc279..1dc758d 100644
--- a/maven-cpptools-plugin/pom.xml
+++ b/maven-cpptools-plugin/pom.xml
@@ -24,7 +24,7 @@
   
 org.apache.activemq-cpp
 activemq-cpp-pom
-3.9.5-SNAPSHOT
+3.9.5
   
 
   maven-cpptools-plugin
diff --git a/pom.xml b/pom.xml
index 96d0690..86b2d13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   org.apache.activemq-cpp
   activemq-cpp-pom
-  3.9.5-SNAPSHOT
+  3.9.5
   pom
   ActiveMQ-CPP Project
   2007

[activemq-cpp] branch 3.9.x updated: NO-JIRA Update project pom with latest gitbox repo information

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch 3.9.x
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git


The following commit(s) were added to refs/heads/3.9.x by this push:
 new 8c817e7  NO-JIRA Update project pom with latest gitbox repo information
8c817e7 is described below

commit 8c817e77bf4de42a32936898cb9a2b115d278dc5
Author: Timothy Bish 
AuthorDate: Fri Jan 25 15:21:39 2019 -0500

NO-JIRA Update project pom with latest gitbox repo information

Update to point at gitbox and use apache parent 19 pom

(cherry picked from commit d6f76ede90d21b7ee2f0b5d4648e440e66d63003)
---
 pom.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 28bff9d..96d0690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache
 apache
-15
+19
   
   4.0.0
 
@@ -102,8 +102,8 @@
   
 
   
-
scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cpp.git
-
scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cpp.git
+
scm:git:http://gitbox.apache.org/repos/asf/activemq-cpp.git
+
scm:git:https://gitbox.apache.org/repos/asf/activemq-cpp.git
 
https://fisheye6.atlassian.com/browse/~br=master/activemq-cpp-git
 HEAD
   
@@ -179,6 +179,7 @@
 -Prelease
 deploy
 activemq-cpp-@{project.version}
+true
   
 
   

[activemq-cpp] branch master updated: NO-JIRA Update project pom with latest gitbox repo information

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git


The following commit(s) were added to refs/heads/master by this push:
 new d6f76ed  NO-JIRA Update project pom with latest gitbox repo information
d6f76ed is described below

commit d6f76ede90d21b7ee2f0b5d4648e440e66d63003
Author: Timothy Bish 
AuthorDate: Fri Jan 25 15:21:39 2019 -0500

NO-JIRA Update project pom with latest gitbox repo information

Update to point at gitbox and use apache parent 19 pom
---
 pom.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2bbcb81..5ed8318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache
 apache
-15
+19
   
   4.0.0
 
@@ -102,8 +102,8 @@
   
 
   
-
scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cpp.git
-
scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cpp.git
+
scm:git:http://gitbox.apache.org/repos/asf/activemq-cpp.git
+
scm:git:https://gitbox.apache.org/repos/asf/activemq-cpp.git
 
https://fisheye6.atlassian.com/browse/~br=master/activemq-cpp-git
 HEAD
   
@@ -179,6 +179,7 @@
 -Prelease
 deploy
 activemq-cpp-@{project.version}
+true
   
 
   

[activemq-cpp] annotated tag activemq-cpp-3.9.5 deleted (was c49beb7)

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a change to annotated tag activemq-cpp-3.9.5
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git.


*** WARNING: tag activemq-cpp-3.9.5 was deleted! ***

   tag was  c49beb7

The revisions that were on this annotated tag are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[activemq-cpp] annotated tag activemq-cpp-3.9.5 created (now c49beb7)

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a change to annotated tag activemq-cpp-3.9.5
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git.


  at c49beb7  (tag)
 tagging df423b8f6f186e05650b686063e30b776ba289c6 (commit)
 replaces activemq-cpp-3.9.4
  by Timothy Bish
  on Fri Jan 25 15:03:00 2019 -0500

- Log -
[maven-release-plugin]  copy for tag activemq-cpp-3.9.5
---

No new revisions were added by this update.

[activemq-cpp] branch 3.9.x updated: NO-JIRA Update branch for next release (3.9.5)

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch 3.9.x
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git


The following commit(s) were added to refs/heads/3.9.x by this push:
 new df423b8  NO-JIRA Update branch for next release (3.9.5)
df423b8 is described below

commit df423b8f6f186e05650b686063e30b776ba289c6
Author: Timothy Bish 
AuthorDate: Thu Jan 24 15:24:31 2019 -0500

NO-JIRA Update branch for next release (3.9.5)
---
 activemq-cpp/RELEASE_NOTES.txt  | 13 +
 activemq-cpp/activemq-cpp.spec  |  2 +-
 activemq-cpp/configure.ac   |  6 +++---
 .../src/main/activemq/core/ActiveMQConnectionMetaData.cpp   |  4 ++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/activemq-cpp/RELEASE_NOTES.txt b/activemq-cpp/RELEASE_NOTES.txt
index e974c45..9744096 100644
--- a/activemq-cpp/RELEASE_NOTES.txt
+++ b/activemq-cpp/RELEASE_NOTES.txt
@@ -1,4 +1,17 @@
 =
+==  Release Notes for ActiveMQ CPP 3.9.5   ==
+=
+
+Bug
+
+[AMQCPP-622] - Memory leaks in the handshake of a OpenSSL connection
+[AMQCPP-623] - Can't build on some newer OpenSSL versions
+
+New Feature
+
+[AMQCPP-643] - Add an option to time out connection attempts when blocked 
in ensureConnectionInfoSent
+
+=
 ==  Release Notes for ActiveMQ CPP 3.9.4   ==
 =
 
diff --git a/activemq-cpp/activemq-cpp.spec b/activemq-cpp/activemq-cpp.spec
index 18b25c9..3a96112 100644
--- a/activemq-cpp/activemq-cpp.spec
+++ b/activemq-cpp/activemq-cpp.spec
@@ -1,5 +1,5 @@
 Name:   activemq-cpp
-Version:3.9.4
+Version:3.9.5
 Release:1%{?dist}
 Summary:C++ Implementation of a JMS style Messaging Client
 
diff --git a/activemq-cpp/configure.ac b/activemq-cpp/configure.ac
index f4e751d..f7ec827 100644
--- a/activemq-cpp/configure.ac
+++ b/activemq-cpp/configure.ac
@@ -20,7 +20,7 @@ AC_PREREQ(2.61)
 ## 
 ## Initialization macros.
 ## 
-AC_INIT(activemq-cpp, 3.9.4, d...@activemq.apache.org)
+AC_INIT(activemq-cpp, 3.9.5, d...@activemq.apache.org)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(src/main/activemq/core/ActiveMQConnection.cpp)
 AC_CONFIG_MACRO_DIR([m4])
@@ -31,7 +31,7 @@ AC_CONFIG_MACRO_DIR([m4])
 ACTIVEMQ_LIBRARY_NAME=activemq-cpp
 ACTIVEMQ_MAJOR_VERSION=3
 ACTIVEMQ_MINOR_VERSION=9
-ACTIVEMQ_PATCH_VERSION=4
+ACTIVEMQ_PATCH_VERSION=5
 
ACTIVEMQ_VERSION=${ACTIVEMQ_MAJOR_VERSION}.${ACTIVEMQ_MINOR_VERSION}.${ACTIVEMQ_PATCH_VERSION}
 ACTIVEMQ_API_VERSION=${ACTIVEMQ_VERSION}
 
@@ -75,7 +75,7 @@ AC_SUBST(CMSAPI_VERSION)
 ##   3. Programs may need to be changed, recompiled, relinked in order to use 
the new version. Bump
 ##  current, set revision and age to 0.
 ##
-ACTIVEMQ_LIBRARY_VERSION=19:4:0
+ACTIVEMQ_LIBRARY_VERSION=19:5:0
 
 AC_SUBST(ACTIVEMQ_LIBRARY_NAME)
 AC_SUBST(ACTIVEMQ_VERSION)
diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp 
b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
index 6085ae7..d9088eb 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
+++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionMetaData.cpp
@@ -51,7 +51,7 @@ std::string ActiveMQConnectionMetaData::getCMSProviderName() 
const {
 
 

 std::string ActiveMQConnectionMetaData::getProviderVersion() const {
-return "3.9.4";
+return "3.9.5";
 }
 
 

@@ -66,7 +66,7 @@ int ActiveMQConnectionMetaData::getProviderMinorVersion() 
const {
 
 

 int ActiveMQConnectionMetaData::getProviderPatchVersion() const {
-return 4;
+return 5;
 }
 
 

[activemq-cpp] branch 3.9.x updated: NO-JIRA Update project notice file with correct year

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch 3.9.x
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git


The following commit(s) were added to refs/heads/3.9.x by this push:
 new 53b595f  NO-JIRA Update project notice file with correct year
53b595f is described below

commit 53b595f938fc26813bc476925c369afb7f74b31e
Author: Timothy Bish 
AuthorDate: Thu Jan 24 15:15:57 2019 -0500

NO-JIRA Update project notice file with correct year

(cherry picked from commit 03bf1a0354b9b38f6f843f61f92fb7191744362a)
---
 NOTICE.txt  | 3 +++
 activemq-cpp/NOTICE.txt | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/NOTICE.txt b/NOTICE.txt
index 9c0a44e..c0d5dd4 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -4,6 +4,9 @@
 ==  in this case for the Apache ActiveMQ distribution. ==
 =
 
+Apache ActiveMQ-CPP
+Copyright 2007-2019 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
diff --git a/activemq-cpp/NOTICE.txt b/activemq-cpp/NOTICE.txt
index 27628f9..0b73a81 100644
--- a/activemq-cpp/NOTICE.txt
+++ b/activemq-cpp/NOTICE.txt
@@ -4,6 +4,9 @@
 ==  in this case for the Apache ActiveMQ distribution. ==
 =
 
+Apache ActiveMQ-CPP
+Copyright 2007-2019 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

[activemq-cpp] 01/02: NO-JIRA Add release notes for 3.9.5

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git

commit 8c5ede384212b0e66d1fb43bb5474ff0644bf595
Author: Timothy Bish 
AuthorDate: Thu Jan 24 15:12:08 2019 -0500

NO-JIRA Add release notes for 3.9.5
---
 activemq-cpp/RELEASE_NOTES.txt | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/activemq-cpp/RELEASE_NOTES.txt b/activemq-cpp/RELEASE_NOTES.txt
index 25038bf..b92fb49 100644
--- a/activemq-cpp/RELEASE_NOTES.txt
+++ b/activemq-cpp/RELEASE_NOTES.txt
@@ -1,8 +1,21 @@
 =
-==  Release Notes for ActiveMQ CPP 3.10.0   ==
+==  Release Notes for ActiveMQ CPP 3.10.0  ==
 =
 
 =
+==  Release Notes for ActiveMQ CPP 3.9.5   ==
+=
+
+Bug
+
+[AMQCPP-622] - Memory leaks in the handshake of a OpenSSL connection
+[AMQCPP-623] - Can't build on some newer OpenSSL versions
+
+New Feature
+
+[AMQCPP-643] - Add an option to time out connection attempts when blocked 
in ensureConnectionInfoSent
+
+=
 ==  Release Notes for ActiveMQ CPP 3.9.4   ==
 =
 

[activemq-cpp] branch master updated (cd40e26 -> 03bf1a0)

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git.


from cd40e26  NO-JIRA Add notes for past 3.9.4 release
 new 8c5ede3  NO-JIRA Add release notes for 3.9.5
 new 03bf1a0  NO-JIRA Update project notice file with correct year

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 NOTICE.txt |  3 +++
 activemq-cpp/NOTICE.txt|  3 +++
 activemq-cpp/RELEASE_NOTES.txt | 15 ++-
 3 files changed, 20 insertions(+), 1 deletion(-)

[activemq-cpp] 02/02: NO-JIRA Update project notice file with correct year

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git

commit 03bf1a0354b9b38f6f843f61f92fb7191744362a
Author: Timothy Bish 
AuthorDate: Thu Jan 24 15:15:57 2019 -0500

NO-JIRA Update project notice file with correct year
---
 NOTICE.txt  | 3 +++
 activemq-cpp/NOTICE.txt | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/NOTICE.txt b/NOTICE.txt
index 9c0a44e..c0d5dd4 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -4,6 +4,9 @@
 ==  in this case for the Apache ActiveMQ distribution. ==
 =
 
+Apache ActiveMQ-CPP
+Copyright 2007-2019 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
diff --git a/activemq-cpp/NOTICE.txt b/activemq-cpp/NOTICE.txt
index 27628f9..0b73a81 100644
--- a/activemq-cpp/NOTICE.txt
+++ b/activemq-cpp/NOTICE.txt
@@ -4,6 +4,9 @@
 ==  in this case for the Apache ActiveMQ distribution. ==
 =
 
+Apache ActiveMQ-CPP
+Copyright 2007-2019 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

[activemq-cpp] branch master updated: NO-JIRA Add notes for past 3.9.4 release

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git


The following commit(s) were added to refs/heads/master by this push:
 new cd40e26  NO-JIRA Add notes for past 3.9.4 release
cd40e26 is described below

commit cd40e26ccb0752d9698056dace3f4ac4e035fd09
Author: Timothy Bish 
AuthorDate: Thu Jan 24 15:06:38 2019 -0500

NO-JIRA Add notes for past 3.9.4 release
---
 activemq-cpp/RELEASE_NOTES.txt | 17 +
 1 file changed, 17 insertions(+)

diff --git a/activemq-cpp/RELEASE_NOTES.txt b/activemq-cpp/RELEASE_NOTES.txt
index fc910c1..25038bf 100644
--- a/activemq-cpp/RELEASE_NOTES.txt
+++ b/activemq-cpp/RELEASE_NOTES.txt
@@ -3,6 +3,23 @@
 =
 
 =
+==  Release Notes for ActiveMQ CPP 3.9.4   ==
+=
+
+Bug
+
+[AMQCPP-596] - 
decaf/internal/security/provider/crypto/MD4MessageDigestSpi.cpp:394]:
+   (error) Mismatching allocation and deallocation: temp
+[AMQCPP-598] - CmsTemplate::createConsumer possible dereference of null 
pointer
+[AMQCPP-601] - PriorityBackup isn't working
+[AMQCPP-610] - Stall when maxReconnectAttempts is set to zero
+
+Improvement
+
+[AMQCPP-607] - Add Openwire properties for client metadata to CMS client
+[AMQCPP-609] - Prevent unnecesary reconnect attempt with failover during 
shutdown
+
+=
 ==  Release Notes for ActiveMQ CPP 3.9.3   ==
 =
 

[activemq-cpp] 01/01: This closes #17

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch 3.9.x
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git

commit 243545f83c7636e1867137049702f2321cabc50f
Merge: 0addcaa 4cbe41d
Author: Timothy Bish 
AuthorDate: Thu Jan 24 13:05:17 2019 -0500

This closes #17

 .../src/main/activemq/core/ActiveMQConnection.cpp| 15 ++-
 activemq-cpp/src/main/activemq/core/ActiveMQConnection.h | 14 ++
 .../src/main/activemq/core/ActiveMQConnectionFactory.cpp | 16 
 .../src/main/activemq/core/ActiveMQConnectionFactory.h   | 14 ++
 .../src/main/activemq/core/ActiveMQConstants.cpp |  1 +
 activemq-cpp/src/main/activemq/core/ActiveMQConstants.h  |  1 +
 .../test/activemq/core/ActiveMQConnectionFactoryTest.cpp |  5 -
 7 files changed, 64 insertions(+), 2 deletions(-)

[activemq-cpp] branch master updated: AMQCPP-643: Added connection.connectionResponseTimeout to CMS CPP client and updated testURIOptionsProcessing.

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git


The following commit(s) were added to refs/heads/master by this push:
 new c102bc0  AMQCPP-643: Added connection.connectionResponseTimeout to CMS 
CPP client and updated testURIOptionsProcessing.
c102bc0 is described below

commit c102bc0814be009764cbba90a07beb89884747eb
Author: Roddie Kieley 
AuthorDate: Tue Dec 11 13:07:01 2018 -0330

AMQCPP-643: Added connection.connectionResponseTimeout to CMS CPP client 
and updated testURIOptionsProcessing.
---
 .../src/main/activemq/core/ActiveMQConnection.cpp| 15 ++-
 activemq-cpp/src/main/activemq/core/ActiveMQConnection.h | 14 ++
 .../src/main/activemq/core/ActiveMQConnectionFactory.cpp | 16 
 .../src/main/activemq/core/ActiveMQConnectionFactory.h   | 14 ++
 .../src/main/activemq/core/ActiveMQConstants.cpp |  1 +
 activemq-cpp/src/main/activemq/core/ActiveMQConstants.h  |  1 +
 .../test/activemq/core/ActiveMQConnectionFactoryTest.cpp |  5 -
 7 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp 
b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
index 5858385..0f20349 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
+++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.cpp
@@ -185,6 +185,7 @@ namespace core {
 bool alwaysSessionAsync;
 int compressionLevel;
 unsigned int sendTimeout;
+unsigned int connectResponseTimeout;
 unsigned int closeTimeout;
 unsigned int producerWindowSize;
 int auditDepth;
@@ -255,6 +256,7 @@ namespace core {
  alwaysSessionAsync(true),
  compressionLevel(-1),
  sendTimeout(0),
+ connectResponseTimeout(0),
  closeTimeout(15000),
  producerWindowSize(0),
  
auditDepth(ActiveMQMessageAudit::DEFAULT_WINDOW_SIZE),
@@ -318,6 +320,7 @@ namespace core {
 void waitForBrokerInfo() {
 this->brokerInfoReceived->await();
 }
+
 };
 
 // Static init.
@@ -1354,7 +1357,7 @@ void ActiveMQConnection::ensureConnectionInfoSent() {
 }
 
 // Now we ping the broker and see if we get an ack / nack
-syncRequest(this->config->connectionInfo);
+syncRequest(this->config->connectionInfo, 
this->config->connectResponseTimeout);
 
 this->config->isConnectionInfoSentToBroker = true;
 
@@ -1588,6 +1591,16 @@ void ActiveMQConnection::setSendTimeout(unsigned int 
timeout) {
 }
 
 

+unsigned int ActiveMQConnection::getConnectResponseTimeout() const {
+return this->config->connectResponseTimeout;
+}
+
+
+void ActiveMQConnection::setConnectResponseTimeout(unsigned int 
connectResponseTimeout) {
+this->config->connectResponseTimeout = connectResponseTimeout;
+}
+
+
 unsigned int ActiveMQConnection::getCloseTimeout() const {
 return this->config->closeTimeout;
 }
diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h 
b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
index 2544862..3f0aa51 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
+++ b/activemq-cpp/src/main/activemq/core/ActiveMQConnection.h
@@ -507,6 +507,20 @@ namespace core {
 void setSendTimeout(unsigned int timeout);
 
 /**
+ * Gets the assigned connect response timeout for this Connector
+ * @return the connect response timeout configured in the connection 
uri
+ */
+unsigned int getConnectResponseTimeout() const;
+
+/**
+ * Sets the connect response timeout to use when sending Message 
objects, this will
+ * protect clients using a Synchronous request in the case of the 
broker not responding
+ * or missing the brokers response.
+ * @param timeout - The time to wait for a connect response.
+ */
+void setConnectResponseTimeout(unsigned int connectResponseTimeout);
+
+/**
  * Gets the assigned close timeout for this Connector
  * @return the close timeout configured in the connection uri
  */
diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp 
b/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFactory.cpp
index dda3439..b4282e5 100644
--- a/activemq-cpp/src/main/activemq/core/ActiveMQConnectionFacto

[activemq-cpp] branch 3.9.x updated (0addcaa -> 243545f)

[tabish]

This is an automated email from the ASF dual-hosted git repository.

tabish pushed a change to branch 3.9.x
in repository https://gitbox.apache.org/repos/asf/activemq-cpp.git.


from 0addcaa  Revert "[AMQCPP-619] Support for SSL wilcard certificate. 
Thank you Francois Godin for patch."
 add 4cbe41d  AMQCPP-643: Added connection.connectionResponseTimeout to CMS 
CPP client and updated testURIOptionsProcessing.
 new 243545f  This closes #17

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/activemq/core/ActiveMQConnection.cpp| 15 ++-
 activemq-cpp/src/main/activemq/core/ActiveMQConnection.h | 14 ++
 .../src/main/activemq/core/ActiveMQConnectionFactory.cpp | 16 
 .../src/main/activemq/core/ActiveMQConnectionFactory.h   | 14 ++
 .../src/main/activemq/core/ActiveMQConstants.cpp |  1 +
 activemq-cpp/src/main/activemq/core/ActiveMQConstants.h  |  1 +
 .../test/activemq/core/ActiveMQConnectionFactoryTest.cpp |  5 -
 7 files changed, 64 insertions(+), 2 deletions(-)

activemq git commit: AMQ-7097 Update Qpid JMS and Netty to latest

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 9845853b6 -> 20493fd31


AMQ-7097 Update Qpid JMS and Netty to latest

Qpid JMS to v0.40.0
Netty to 4.1.32.Final

(cherry picked from commit 49296f92596bffba68e549ea3126fd5e1629b41b)


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

Branch: refs/heads/activemq-5.15.x
Commit: 20493fd31de574e446dc4820daeb82d77bdd1764
Parents: 9845853
Author: Timothy Bish 
Authored: Wed Jan 9 11:03:34 2019 -0500
Committer: Timothy Bish 
Committed: Wed Jan 9 11:04:27 2019 -0500

--
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/20493fd3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8576794..3741241 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.4.0
 3.4.6
 0.31.0
-0.39.0
-4.1.31.Final
+0.40.0
+4.1.32.Final
 0.31.0
-4.1.31.Final
+4.1.32.Final
 1.3
 1.0
 9.5.1-5

activemq git commit: AMQ-7097 Update Qpid JMS and Netty to latest

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/master 4a21edc8d -> 49296f925


AMQ-7097 Update Qpid JMS and Netty to latest

Qpid JMS to v0.40.0
Netty to 4.1.32.Final

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

Branch: refs/heads/master
Commit: 49296f92596bffba68e549ea3126fd5e1629b41b
Parents: 4a21edc
Author: Timothy Bish 
Authored: Wed Jan 9 11:03:34 2019 -0500
Committer: Timothy Bish 
Committed: Wed Jan 9 11:03:34 2019 -0500

--
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/49296f92/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d93ada7..b73aba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,10 +105,10 @@
 1.4.0
 3.4.6
 0.31.0
-0.39.0
-4.1.31.Final
+0.40.0
+4.1.32.Final
 0.31.0
-4.1.31.Final
+4.1.32.Final
 1.3
 1.0
 9.5.1-5

activemq-cpp git commit: Revert "[AMQCPP-619] Support for SSL wilcard certificate. Thank you Francois Godin for patch."

[tabish]

Repository: activemq-cpp
Updated Branches:
  refs/heads/3.9.x 8f56789a3 -> 0addcaa3e


Revert "[AMQCPP-619] Support for SSL wilcard certificate. Thank you Francois 
Godin for patch."

Reverts change on patch branch that breaks compatibily with 0.9.x version of 
OpenSSL which this series is known to operate with

This reverts commit 8f56789a345c327dd3336102f7e646adde90238d.


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

Branch: refs/heads/3.9.x
Commit: 0addcaa3e2c7b40feb46dfe2f690e5fba9355696
Parents: 8f56789
Author: Timothy Bish 
Authored: Fri Dec 7 10:33:20 2018 -0500
Committer: Timothy Bish 
Committed: Fri Dec 7 10:33:20 2018 -0500

--
 README.txt  |   1 -
 activemq-cpp/activemq-cpp.spec  |   2 +-
 .../internal/net/ssl/openssl/OpenSSLSocket.cpp  | 125 +--
 .../internal/net/ssl/openssl/OpenSSLSocket.h|   6 +
 4 files changed, 124 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/0addcaa3/README.txt
--
diff --git a/README.txt b/README.txt
index a31e7e6..6bf8721 100644
--- a/README.txt
+++ b/README.txt
@@ -23,7 +23,6 @@ APR >= 1.3*
 APR-Util>= 1.3*
 CPPUnit >= 1.10.2*
 libuuid >= ?*
-openssl >= 1.0.2
 
 * Requires that the Development package also be installed.
 

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/0addcaa3/activemq-cpp/activemq-cpp.spec
--
diff --git a/activemq-cpp/activemq-cpp.spec b/activemq-cpp/activemq-cpp.spec
index 9b0c76d..18b25c9 100644
--- a/activemq-cpp/activemq-cpp.spec
+++ b/activemq-cpp/activemq-cpp.spec
@@ -22,7 +22,7 @@ BuildRequires:  autoconf >= 2.61
 BuildRequires:  libtool  >= 1.5.24
 BuildRequires:  apr-devel%{?_isa} >= 1.3
 BuildRequires:  cppunit-devel%{?_isa} >= 1.10.2
-BuildRequires:  openssl-devel%{?_isa} >= 1.0.2
+BuildRequires:  openssl-devel%{?_isa} >= 0.98.0
 
 %description
 activemq-cpp is a JMS-like API for C++ for interfacing with Message

http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/0addcaa3/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp
--
diff --git 
a/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp 
b/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp
index 75ef6f5..ffa39c7 100644
--- a/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp
+++ b/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp
@@ -356,12 +356,6 @@ void OpenSSLSocket::startHandshake() {
 // Since we are a client we want to enforce peer verification, 
we set a
 // callback so we can collect data on why a verify failed for 
debugging.
 if (!peerVerifyDisabled) {
-   // Check host 
https://wiki.openssl.org/index.php/Hostname_validation
-   X509_VERIFY_PARAM *param = 
SSL_get0_param(this->parameters->getSSL());
-
-   X509_VERIFY_PARAM_set_hostflags(param, 
X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
-   X509_VERIFY_PARAM_set1_host(param, 
this->data->commonName.c_str(), 0);
-
 SSL_set_verify(this->parameters->getSSL(), 
SSL_VERIFY_PEER, SocketData::verifyCallback);
 } else {
 SSL_set_verify(this->parameters->getSSL(), 
SSL_VERIFY_NONE, NULL);
@@ -375,14 +369,19 @@ void OpenSSLSocket::startHandshake() {
 
 int result = SSL_connect(this->parameters->getSSL());
 
-// Checks the error status
+// Checks the error status, when things go right we still 
perform a deeper
+// check on the provided certificate to ensure that it matches 
the host name
+// that we connected to, this prevents someone from using any 
certificate
+// signed by a signing authority that we trust.
 switch (SSL_get_error(this->parameters->getSSL(), result)) {
 case SSL_ERROR_NONE:
+if (!peerVerifyDisabled) {
+verifyServerCert(this->data->commonName);
+}
 break;
 case SSL_ERROR_SSL:
 case SSL_ERROR_ZERO_RETURN:
 case SSL_ERROR_SYSCALL:
-   default:
 

activemq git commit: AMQ-7097 Update Qpid JMS and proton-j to laetst

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x d816b738a -> c2ec82ebd


AMQ-7097 Update Qpid JMS and proton-j to laetst

Qpid JMS 0.39.0 and proton-j 0.31.0 released

(cherry picked from commit 66db4e94bbe9e138572eace45707bbba2a7184c3)


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

Branch: refs/heads/activemq-5.15.x
Commit: c2ec82ebda284069aaab38906649976bee3243f2
Parents: d816b73
Author: Timothy Bish 
Authored: Tue Dec 4 11:52:02 2018 -0500
Committer: Timothy Bish 
Committed: Tue Dec 4 11:53:26 2018 -0500

--
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/c2ec82eb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index df1cfc5..8576794 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,10 +104,10 @@
 1.1.2
 1.4.0
 3.4.6
-0.30.0
-0.38.0
+0.31.0
+0.39.0
 4.1.31.Final
-0.30.0
+0.31.0
 4.1.31.Final
 1.3
 1.0

activemq git commit: AMQ-7097 Update Qpid JMS and proton-j to laetst

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/master 612d4aeeb -> 66db4e94b


AMQ-7097 Update Qpid JMS and proton-j to laetst

Qpid JMS 0.39.0 and proton-j 0.31.0 released


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

Branch: refs/heads/master
Commit: 66db4e94bbe9e138572eace45707bbba2a7184c3
Parents: 612d4ae
Author: Timothy Bish 
Authored: Tue Dec 4 11:52:02 2018 -0500
Committer: Timothy Bish 
Committed: Tue Dec 4 11:52:36 2018 -0500

--
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/66db4e94/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f6264b5..d93ada7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,10 +104,10 @@
 1.1.2
 1.4.0
 3.4.6
-0.30.0
-0.38.0
+0.31.0
+0.39.0
 4.1.31.Final
-0.30.0
+0.31.0
 4.1.31.Final
 1.3
 1.0

activemq git commit: AMQ-7097 Update AMQP dependencies to latest

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 85b33b376 -> d9207c3a4


AMQ-7097 Update AMQP dependencies to latest

Update Qpid JMS, Proton-J and Netty to the latest release.

(cherry picked from commit d020af203410e075ac595cc88f1afcbeea4c95c1)


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

Branch: refs/heads/activemq-5.15.x
Commit: d9207c3a46e1df3bba65bb17d5154ffb1032e516
Parents: 85b33b3
Author: Timothy Bish 
Authored: Tue Nov 13 17:03:45 2018 -0500
Committer: Timothy Bish 
Committed: Fri Nov 16 13:45:48 2018 -0500

--
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/d9207c3a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6799fe3..df1cfc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,11 +104,11 @@
 1.1.2
 1.4.0
 3.4.6
-0.29.0
-0.37.0
-4.1.28.Final
-0.29.0
-4.1.28.Final
+0.30.0
+0.38.0
+4.1.31.Final
+0.30.0
+4.1.31.Final
 1.3
 1.0
 9.5.1-5

activemq git commit: AMQ-7097 Update AMQP dependencies to latest

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/master 9cb680c0b -> d020af203


AMQ-7097 Update AMQP dependencies to latest

Update Qpid JMS, Proton-J and Netty to the latest release.

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

Branch: refs/heads/master
Commit: d020af203410e075ac595cc88f1afcbeea4c95c1
Parents: 9cb680c
Author: Timothy Bish 
Authored: Tue Nov 13 17:03:45 2018 -0500
Committer: Timothy Bish 
Committed: Fri Nov 16 13:24:42 2018 -0500

--
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/d020af20/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 3df4d35..f6264b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,11 +104,11 @@
 1.1.2
 1.4.0
 3.4.6
-0.29.0
-0.37.0
-4.1.28.Final
-0.29.0
-4.1.28.Final
+0.30.0
+0.38.0
+4.1.31.Final
+0.30.0
+4.1.31.Final
 1.3
 1.0
 9.5.1-5

[1/2] activemq-artemis git commit: ARTEMIS-2146 Avoiding NPE on AMQP Flow Control

[tabish]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 23cc4f45c -> 3a8c25c4c


ARTEMIS-2146 Avoiding NPE on AMQP Flow Control

AMQP Flow control will disable consumer flow control (setting credits to null)
This will avoid a race checking flow control.


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

Branch: refs/heads/master
Commit: 5132775371300de3a0c34e119d205f546f070c63
Parents: 23cc4f4
Author: Clebert Suconic 
Authored: Tue Oct 23 12:43:36 2018 -0400
Committer: Timothy Bish 
Committed: Wed Oct 24 10:55:56 2018 -0400

--
 .../activemq/artemis/core/server/impl/ServerConsumerImpl.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/51327753/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index 470aeb6..e38c22c 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -349,7 +349,9 @@ public class ServerConsumerImpl implements ServerConsumer, 
ReadyListener {
 
@Override
public HandleStatus handle(final MessageReference ref) throws Exception {
-  if (callback != null && !callback.hasCredits(this) || availableCredits 
!= null && availableCredits.get() <= 0) {
+  // available credits can be set back to null with a flow control option.
+  AtomicInteger checkInteger = availableCredits;
+  if (callback != null && !callback.hasCredits(this) || checkInteger != 
null && checkInteger.get() <= 0) {
  if (logger.isDebugEnabled()) {
 logger.debug(this + " is busy for the lack of credits. Current 
credits = " +
 availableCredits +

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

[tabish]

This closes #2393


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

Branch: refs/heads/master
Commit: 3a8c25c4c85fe5c3b02b3f0aae72e7395269a94f
Parents: 23cc4f4 5132775
Author: Timothy Bish 
Authored: Wed Oct 24 10:57:11 2018 -0400
Committer: Timothy Bish 
Committed: Wed Oct 24 10:57:11 2018 -0400

--
 .../activemq/artemis/core/server/impl/ServerConsumerImpl.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

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

[tabish]

This closes #2361


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

Branch: refs/heads/master
Commit: f5a73dfab1754105134425f017d6c5859e38be17
Parents: ae738c4 48b5563
Author: Timothy Bish 
Authored: Wed Oct 10 12:28:42 2018 -0400
Committer: Timothy Bish 
Committed: Wed Oct 10 12:28:42 2018 -0400

--
 .../apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/2] activemq-artemis git commit: ARTEMIS-2096 Fixing DivertTopicToQueueTest

[tabish]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master ae738c426 -> f5a73dfab


ARTEMIS-2096 Fixing DivertTopicToQueueTest

This is fixing the test 
org.apache.activemq.artemis.tests.integration.amqp.DivertTopicToQueueTest

This test was broken because the copy wouldn't use the Buffer view gotten by 
data.duplicate().


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

Branch: refs/heads/master
Commit: 48b5563241a28563a72d83431790b2f6b45b1582
Parents: ae738c4
Author: Clebert Suconic 
Authored: Wed Oct 10 12:09:40 2018 -0400
Committer: Timothy Bish 
Committed: Wed Oct 10 12:27:45 2018 -0400

--
 .../apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/48b55632/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 821356a..c7f1b50 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -497,7 +497,7 @@ public class AMQPMessage extends RefCountMessage {
 
   // Copy the full message contents with delivery annotations as they will
   // be trimmed on send and may become useful on the broker at a later 
time.
-  data.get(newData);
+  view.get(newData);
 
   AMQPMessage newEncode = new AMQPMessage(this.messageFormat, newData, 
extraProperties, coreMessageObjectPools);
   newEncode.setMessageID(this.getMessageID());

activemq git commit: AMQ-7065 Update to Qpid JMS v0.37.0

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 7d2ba5741 -> 4e627d28f


AMQ-7065 Update to Qpid JMS v0.37.0

Update to latest client release, adds some tests for split framed
message send / receive

(cherry picked from commit ac1e709dc4ed419c8d789fc29e970fde6b796ed1)


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

Branch: refs/heads/activemq-5.15.x
Commit: 4e627d28fe6d4ce6cd7bed439e4ec8662a517b2f
Parents: 7d2ba57
Author: Timothy Bish 
Authored: Tue Oct 2 15:20:11 2018 -0400
Committer: Timothy Bish 
Committed: Tue Oct 2 15:21:06 2018 -0400

--
 .../amqp/JMSLargeMessageSendRecvTest.java   | 124 +++
 .../transport/amqp/client/AmqpSender.java   |   3 +-
 pom.xml |   2 +-
 3 files changed, 104 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/4e627d28/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
--
diff --git 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
index 20ad2d9..7f96afc 100644
--- 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
+++ 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.transport.amqp;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -23,6 +24,7 @@ import static org.junit.Assert.assertTrue;
 import java.util.Arrays;
 import java.util.Collection;
 
+import javax.jms.BytesMessage;
 import javax.jms.Connection;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -45,6 +47,8 @@ import org.slf4j.LoggerFactory;
 @RunWith(Parameterized.class)
 public class JMSLargeMessageSendRecvTest extends AmqpClientTestSupport {
 
+protected static final Logger LOG = 
LoggerFactory.getLogger(JMSLargeMessageSendRecvTest.class);
+
 @Parameters(name="{0}")
 public static Collection data() {
 return Arrays.asList(new Object[][] {
@@ -55,46 +59,38 @@ public class JMSLargeMessageSendRecvTest extends 
AmqpClientTestSupport {
 });
 }
 
-public JMSLargeMessageSendRecvTest(String connectorScheme, boolean secure) 
{
-super(connectorScheme, secure);
-}
-
 @Rule
 public TestName testName = new TestName();
 
-protected static final Logger LOG = 
LoggerFactory.getLogger(JMSLargeMessageSendRecvTest.class);
-
-private String createLargeString(int sizeInBytes) {
-byte[] base = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
-StringBuilder builder = new StringBuilder();
-for (int i = 0; i < sizeInBytes; i++) {
-builder.append(base[i % base.length]);
-}
+public JMSLargeMessageSendRecvTest(String connectorScheme, boolean secure) 
{
+super(connectorScheme, secure);
+}
 
-LOG.debug("Created string with size : " + 
builder.toString().getBytes().length + " bytes");
-return builder.toString();
+@Test(timeout = 60 * 1000)
+public void testSendSmallerTextMessage() throws JMSException {
+doTestSendTextMessageOfGivenSize(1024);
 }
 
 @Test(timeout = 60 * 1000)
-public void testSendSmallerMessages() throws JMSException {
+public void testSendSeriesOfSmallerTextMessages() throws JMSException {
 for (int i = 512; i <= (8 * 1024); i += 512) {
-doTestSendLargeMessage(i);
+doTestSendTextMessageOfGivenSize(i);
 }
 }
 
 @Test(timeout = 60 * 1000)
-public void testSendFixedSizedMessages() throws JMSException {
-doTestSendLargeMessage(65536);
-doTestSendLargeMessage(65536 * 2);
-doTestSendLargeMessage(65536 * 4);
+public void testSendFixedSizedTextMessages() throws JMSException {
+doTestSendTextMessageOfGivenSize(65536);
+doTestSendTextMessageOfGivenSize(65536 * 2);
+doTestSendTextMessageOfGivenSize(65536 * 4);
 }
 
 @Test(timeout = 60 * 1000)
-public void testSendHugeMessage() throws JMSException {
-doTestSendLargeMessage(1024 * 1024 * 10);
+public void testSendHugeTextMessage() throws JMSException {
+doTestSendTextMessageOfGivenSize(1024 * 1024 * 5);
 }
 
-public void doTestSendLargeMessage(int expectedSize) 

activemq git commit: AMQ-7065 Update to Qpid JMS v0.37.0

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/master 524615128 -> ac1e709dc


AMQ-7065 Update to Qpid JMS v0.37.0

Update to latest client release, adds some tests for split framed
message send / receive

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

Branch: refs/heads/master
Commit: ac1e709dc4ed419c8d789fc29e970fde6b796ed1
Parents: 5246151
Author: Timothy Bish 
Authored: Tue Oct 2 15:20:11 2018 -0400
Committer: Timothy Bish 
Committed: Tue Oct 2 15:20:11 2018 -0400

--
 .../amqp/JMSLargeMessageSendRecvTest.java   | 124 +++
 .../transport/amqp/client/AmqpSender.java   |   3 +-
 pom.xml |   2 +-
 3 files changed, 104 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/ac1e709d/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
--
diff --git 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
index 20ad2d9..7f96afc 100644
--- 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
+++ 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JMSLargeMessageSendRecvTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.transport.amqp;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -23,6 +24,7 @@ import static org.junit.Assert.assertTrue;
 import java.util.Arrays;
 import java.util.Collection;
 
+import javax.jms.BytesMessage;
 import javax.jms.Connection;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -45,6 +47,8 @@ import org.slf4j.LoggerFactory;
 @RunWith(Parameterized.class)
 public class JMSLargeMessageSendRecvTest extends AmqpClientTestSupport {
 
+protected static final Logger LOG = 
LoggerFactory.getLogger(JMSLargeMessageSendRecvTest.class);
+
 @Parameters(name="{0}")
 public static Collection data() {
 return Arrays.asList(new Object[][] {
@@ -55,46 +59,38 @@ public class JMSLargeMessageSendRecvTest extends 
AmqpClientTestSupport {
 });
 }
 
-public JMSLargeMessageSendRecvTest(String connectorScheme, boolean secure) 
{
-super(connectorScheme, secure);
-}
-
 @Rule
 public TestName testName = new TestName();
 
-protected static final Logger LOG = 
LoggerFactory.getLogger(JMSLargeMessageSendRecvTest.class);
-
-private String createLargeString(int sizeInBytes) {
-byte[] base = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
-StringBuilder builder = new StringBuilder();
-for (int i = 0; i < sizeInBytes; i++) {
-builder.append(base[i % base.length]);
-}
+public JMSLargeMessageSendRecvTest(String connectorScheme, boolean secure) 
{
+super(connectorScheme, secure);
+}
 
-LOG.debug("Created string with size : " + 
builder.toString().getBytes().length + " bytes");
-return builder.toString();
+@Test(timeout = 60 * 1000)
+public void testSendSmallerTextMessage() throws JMSException {
+doTestSendTextMessageOfGivenSize(1024);
 }
 
 @Test(timeout = 60 * 1000)
-public void testSendSmallerMessages() throws JMSException {
+public void testSendSeriesOfSmallerTextMessages() throws JMSException {
 for (int i = 512; i <= (8 * 1024); i += 512) {
-doTestSendLargeMessage(i);
+doTestSendTextMessageOfGivenSize(i);
 }
 }
 
 @Test(timeout = 60 * 1000)
-public void testSendFixedSizedMessages() throws JMSException {
-doTestSendLargeMessage(65536);
-doTestSendLargeMessage(65536 * 2);
-doTestSendLargeMessage(65536 * 4);
+public void testSendFixedSizedTextMessages() throws JMSException {
+doTestSendTextMessageOfGivenSize(65536);
+doTestSendTextMessageOfGivenSize(65536 * 2);
+doTestSendTextMessageOfGivenSize(65536 * 4);
 }
 
 @Test(timeout = 60 * 1000)
-public void testSendHugeMessage() throws JMSException {
-doTestSendLargeMessage(1024 * 1024 * 10);
+public void testSendHugeTextMessage() throws JMSException {
+doTestSendTextMessageOfGivenSize(1024 * 1024 * 5);
 }
 
-public void doTestSendLargeMessage(int expectedSize) throws JMSException{
+public void doTestSendTextMessageOfGivenSize(int expectedSize) 

activemq-artemis git commit: ARTEMIS-2057 Fix runaway credit grants

[tabish]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 1fe4b9d99 -> d106d01ef


ARTEMIS-2057 Fix runaway credit grants

Ensure the broker looks at local receiver credit when checking for
credit top off threshold and then do a proper top off back to the high
water mark to sync with how client receivers manage their credit.

(cherry picked from commit 34254095c88b2fa41a65af5eb359f862e4c34496)


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

Branch: refs/heads/2.6.x
Commit: d106d01ef61a310a0e7e699c0f12781f31593a95
Parents: 1fe4b9d
Author: Timothy Bish 
Authored: Tue Aug 28 12:15:01 2018 -0400
Committer: Timothy Bish 
Committed: Tue Aug 28 14:42:13 2018 -0400

--
 .../amqp/broker/AMQPSessionCallback.java|   7 +-
 .../amqp/broker/AMQPSessionCallbackTest.java| 248 +++
 .../tests/integration/amqp/AmqpSenderTest.java  |   2 +-
 3 files changed, 254 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d106d01e/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 f940c5a..b99a053 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
@@ -581,8 +581,11 @@ public class AMQPSessionCallback implements 
SessionCallback {
  Runnable creditRunnable = () -> {
 connection.lock();
 try {
-   if (receiver.getRemoteCredit() <= threshold) {
-  receiver.flow(credits);
+   if (receiver.getCredit() <= threshold) {
+  int topUp = credits - receiver.getCredit();
+  if (topUp > 0) {
+ receiver.flow(topUp);
+  }
}
 } finally {
connection.unlock();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d106d01e/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallbackTest.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallbackTest.java
 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallbackTest.java
new file mode 100644
index 000..e86e960
--- /dev/null
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallbackTest.java
@@ -0,0 +1,248 @@
+/*
+ * 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.
+ */
+package org.apache.activemq.artemis.protocol.amqp.broker;
+
+import static 
org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport.AMQP_CREDITS_DEFAULT;
+import static 
org.apache.activemq.artemis.protocol.amqp.proton.AmqpSupport.AMQP_LOW_CREDITS_DEFAULT;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.never;
+
+import java.util.concurrent.Executor;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.paging.PagingManager;
+import 

[13/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/README.md
--
diff --git a/README.md b/README.md
new file mode 100644
index 000..0166ec8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,112 @@
+# Apache-NMS-AMQP
+### Overview
+The goal of this project is to combine the [.NET Message Service 
API](http://activemq.apache.org/nms/) (NMS) with
+the [Advanced Message Queuing Protocol (AMQP)](https://www.amqp.org/) 1.0 
standard wireline protocol. Historically, the Apache community created the NMS 
API which provided a vendor agnostic .NET interface to a variety of messaging 
systems. The NMS API gives the flexibility to write .NET applications in C#, VB 
or any other .NET language, all while using a single API to connect to any 
number of messaging providers. The Advanced Message Queuing Protocol (AMQP) is 
an open and standardized internet protocol for reliably passing messages 
between applications or organizations.
+Before AMQP became a standard, organizations used proprietary wireline 
protocols to connect their systems which lead to vendor lock-in and integration 
problems when integrating with external organizations.
+
+The key to enabling vendor independence and mass adoption of technology is to 
combine open source APIs and standard wireline protocols which is precisely 
what this  project is all about.  Here's how AMQP 1.0 support within NMS helps 
the .NET community:
+ - __More Choice:__ As more message brokers and services implement the AMQP 
1.0 standard wireline, .NET developers and architects will have more options 
for messaging technology.
+ - __No Migration Risk:__ Since AMQP 1.0 is a wireline standard, you won't run 
into the problems that used to happen when switching between implementations.
+ - __Innovation:__ Competition is a key component of technology innovation. 
Directly competitive messaging implementations, with seamless pluggability, 
forces vendors to innovate and differentiate.
+ 
+If you are a .NET developer that doesn't want to be locked into a messaging 
implementation then get engaged with this project. Here you will find the open 
source code base and please provide comments and make your own enhancements. 
The project will be folded into the Apache community once fully mature.
+
+
+### AMQP1.0 Protocol Engine AmqpNetLite
+Apache-NMS-AMQP uses [AmqpNetLite](https://github.com/Azure/amqpnetlite) as 
the underlying AMQP 1.0 transport Protocol engine. 
+
+### Overall Architecture
+Apache-NMS-AMQP should bridge the familiar NMS concepts to AMQP protocol 
concepts as described in the document 
[amqp-bindmap-jms-v1.0-wd07.pdf](https://www.oasis-open.org/committees/download.php/59981/amqp-bindmap-jms-v1.0-wd07.pdf).
+So in general most of the top level classes that implement the Apache.NMS 
interface _Connection, Session, MessageProducer,_ etc  create, manage, and 
destroy the amqpnetlite equivalent object _Connection, Session, Link,_ etc.
+
+### Building With Visual Studio 2017
+There are multiple projects: Apache-NMS-AMQP, Apache-NMS-AMQP.Test, and 
HelloWorld. All projects use the new csproj format available in Visual Studio 
2017.
+Apache-NMS-AMQP is the library which implements The Apache.NMS Interface using 
AmqpNetLite.
+Apache-NMS-AMQP.Test produces an NUnit dll for unit testing.
+HelloWorld is a sample application using the NMS library which can send 
messages to an AMQP Message Broker.
+
+To build, launch Visual Studio 2017 with the nms-amqp.sln file and build the 
solution.
+Build artifacts will be under 
`\\bin\$(Configuration)\$(TargetFramework)`.
+
+### Building With DotNet SDK
+Alternatively, to build without Visual Studio 2017 the project can be built 
using [.NET Core sdk tool](https://www.microsoft.com/net/download/windows), 
version 2.1.+.
+Execute the dotnet sdk command to build all projects :
+```
+C:\>dotnet build nms-amqp.sln 
+```
+__Note__ The .Net Framework SDK must be downloaded and installed to build the 
solution.  This means that the solution can only be built on a Windows 
platform.  The solution, nms-amqp.sln and the all the soure in this project is 
compatible with .NET Core.  The project files, _*.csproj_, can be modified to 
include the appropriate 'netcoreapp2.0'  or 'netstandard2.0' Framework in the 
target  element. However as the NMS API does not have a .NET Core 
build, the dependency will produce the following warning:
+ 
+```
+Apache-NMS-AMQP.csproj : warning NU1701: Package 'Apache.NMS 1.7.1' was 
restored using '.NETFramework,Version=v4.6.1' instead of the project target 
framework '.NETStandard,Version=v2.0'. This package may not be fully compatible 
with your project.
+```
+The resulting DLL will __not__ run.
+
+When a .NET Standard build of the NMS API is available, this project can be 
built
+on any platform.
+
+### Testing
+Tests use the NUnit Framework.  The tests include both unit and system tests 
(require a broker).  The test configuration is 

[15/15] activemq-nms-amqp git commit: This closes #2

[tabish]

This closes #2


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

Branch: refs/heads/master
Commit: ad246932039cc9cf6684c7a30ab7f0fa66c7eced
Parents: ed4639a 432c961
Author: Timothy Bish 
Authored: Mon Aug 27 17:15:24 2018 -0400
Committer: Timothy Bish 
Committed: Mon Aug 27 17:15:24 2018 -0400

--
 .gitignore  |  242 
 HelloWorld/App.config   |   23 +
 HelloWorld/HelloWorld.csproj|  149 ++
 HelloWorld/Properties/AssemblyInfo.cs   |   52 +
 HelloWorld/Properties/launchSettings.json   |8 +
 LICENSE-2.0.txt |  202 +++
 LICENSE.txt |  764 ---
 NMS.AMQP/Apache-NMS-AMQP.csproj |  124 ++
 NMS.AMQP/App.config |   33 +
 NMS.AMQP/Properties/AssemblyInfo.cs |   53 +
 NMS.AMQP/Properties/launchSettings.json |7 +
 README.md   |  112 ++
 StructuredMessage/App.config|   23 +
 StructuredMessage/Properties/AssemblyInfo.cs|   52 +
 .../Properties/launchSettings.json  |8 +
 StructuredMessage/StructuredMessage.csproj  |  149 ++
 apache-nms-amqp.sln |   81 ++
 src/example/csharp/HelloWorld/HelloWorld.cs |  306 +
 .../StructuredMessage/StructuredMessage.cs  |  314 +
 src/main/csharp/Connection.cs   | 1159 
 src/main/csharp/ConnectionFactory.cs|  465 +++
 src/main/csharp/ConnectionMetaData.cs   |  213 +++
 src/main/csharp/Destination.cs  |  341 +
 .../Message/AMQP/AMQPBytesMessageCloak.cs   |  217 +++
 .../csharp/Message/AMQP/AMQPMapMessageCloak.cs  |  163 +++
 .../csharp/Message/AMQP/AMQPMessageBuilder.cs   |  216 +++
 .../csharp/Message/AMQP/AMQPMessageCloak.cs |  650 +
 .../Message/AMQP/AMQPMessageTransformation.cs   |   79 ++
 .../Message/AMQP/AMQPObjectMessageCloak.cs  |  413 ++
 .../Message/AMQP/AMQPStreamMessageCloak.cs  |  211 +++
 .../csharp/Message/AMQP/AMQPTextMessageCloak.cs |  141 ++
 src/main/csharp/Message/BytesMessage.cs |  538 
 .../csharp/Message/Cloak/IBytesMessageCloak.cs  |   36 +
 .../csharp/Message/Cloak/IMapMessageCloak.cs|   32 +
 src/main/csharp/Message/Cloak/IMessageCloak.cs  |   61 +
 .../csharp/Message/Cloak/IObjectMessageCloak.cs |   36 +
 .../csharp/Message/Cloak/IStreamMessageCloak.cs |   39 +
 .../csharp/Message/Cloak/ITextMessageCloak.cs   |   30 +
 .../Message/Factory/AMQPMessageFactory.cs   |  137 ++
 .../csharp/Message/Factory/IMessageFactory.cs   |   75 +
 .../csharp/Message/Factory/MessageFactory.cs|   92 ++
 src/main/csharp/Message/MapMessage.cs   |   72 +
 src/main/csharp/Message/Message.cs  |  287 
 src/main/csharp/Message/ObjectMessage.cs|   73 +
 src/main/csharp/Message/StreamMessage.cs|  418 ++
 src/main/csharp/Message/TextMessage.cs  |   67 +
 src/main/csharp/MessageConsumer.cs  |  977 +
 src/main/csharp/MessageLink.cs  |  506 +++
 src/main/csharp/MessageProducer.cs  |  555 
 src/main/csharp/NMSConnectionFactory.cs |   40 +
 src/main/csharp/NMSResource.cs  |  158 +++
 src/main/csharp/Policies/RedeliveryPolicy.cs|   28 +
 src/main/csharp/Queue.cs|  140 ++
 src/main/csharp/RemoveSubscriptionLink.cs   |  165 +++
 src/main/csharp/Session.cs  |  920 +
 src/main/csharp/TemporaryLink.cs|  130 ++
 src/main/csharp/Topic.cs|  138 ++
 .../csharp/Transport/AMQP/TransportContext.cs   |  146 ++
 .../Transport/IProviderTransportContext.cs  |   46 +
 .../Secure/AMQP/SecureTransportContext.cs   |  484 +++
 .../Secure/IProviderSecureTransportContext.cs   |   50 +
 src/main/csharp/Util/AtomicSequence.cs  |   55 +
 src/main/csharp/Util/DispatchExecutor.cs|  733 ++
 src/main/csharp/Util/ExceptionSupport.cs|  331 +
 src/main/csharp/Util/IdGenerator.cs |  674 +
 src/main/csharp/Util/LinkCache.cs   |  190 +++
 src/main/csharp/Util/MessageSupport.cs  |  397 ++
 src/main/csharp/Util/PropertyUtil.cs| 1294 ++
 src/main/csharp/Util/SymbolUtil.cs  |  124 ++
 src/main/csharp/Util/TaskUtil.cs|   81 ++
 src/main/csharp/Util/Types/ConversionSupport.cs |  536 
 .../Util/Types/Map/AMQP/AMQPPrimitiveMap.cs |  

[14/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

AMQNET-575: NMS AMQP Client Rework
Add an NMS API implementation that wraps the
AMQPnetLite .NET API.


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

Branch: refs/heads/master
Commit: 432c9613836a46911b4d5ffd10102c546dd17054
Parents: ed4639a
Author: Ragnar Paulson 
Authored: Wed Aug 8 17:36:26 2018 -0400
Committer: Ragnar Paulson 
Committed: Wed Aug 8 17:36:26 2018 -0400

--
 .gitignore  |  242 
 HelloWorld/App.config   |   23 +
 HelloWorld/HelloWorld.csproj|  149 ++
 HelloWorld/Properties/AssemblyInfo.cs   |   52 +
 HelloWorld/Properties/launchSettings.json   |8 +
 LICENSE-2.0.txt |  202 +++
 LICENSE.txt |  764 ---
 NMS.AMQP/Apache-NMS-AMQP.csproj |  124 ++
 NMS.AMQP/App.config |   33 +
 NMS.AMQP/Properties/AssemblyInfo.cs |   53 +
 NMS.AMQP/Properties/launchSettings.json |7 +
 README.md   |  112 ++
 StructuredMessage/App.config|   23 +
 StructuredMessage/Properties/AssemblyInfo.cs|   52 +
 .../Properties/launchSettings.json  |8 +
 StructuredMessage/StructuredMessage.csproj  |  149 ++
 apache-nms-amqp.sln |   81 ++
 src/example/csharp/HelloWorld/HelloWorld.cs |  306 +
 .../StructuredMessage/StructuredMessage.cs  |  314 +
 src/main/csharp/Connection.cs   | 1159 
 src/main/csharp/ConnectionFactory.cs|  465 +++
 src/main/csharp/ConnectionMetaData.cs   |  213 +++
 src/main/csharp/Destination.cs  |  341 +
 .../Message/AMQP/AMQPBytesMessageCloak.cs   |  217 +++
 .../csharp/Message/AMQP/AMQPMapMessageCloak.cs  |  163 +++
 .../csharp/Message/AMQP/AMQPMessageBuilder.cs   |  216 +++
 .../csharp/Message/AMQP/AMQPMessageCloak.cs |  650 +
 .../Message/AMQP/AMQPMessageTransformation.cs   |   79 ++
 .../Message/AMQP/AMQPObjectMessageCloak.cs  |  413 ++
 .../Message/AMQP/AMQPStreamMessageCloak.cs  |  211 +++
 .../csharp/Message/AMQP/AMQPTextMessageCloak.cs |  141 ++
 src/main/csharp/Message/BytesMessage.cs |  538 
 .../csharp/Message/Cloak/IBytesMessageCloak.cs  |   36 +
 .../csharp/Message/Cloak/IMapMessageCloak.cs|   32 +
 src/main/csharp/Message/Cloak/IMessageCloak.cs  |   61 +
 .../csharp/Message/Cloak/IObjectMessageCloak.cs |   36 +
 .../csharp/Message/Cloak/IStreamMessageCloak.cs |   39 +
 .../csharp/Message/Cloak/ITextMessageCloak.cs   |   30 +
 .../Message/Factory/AMQPMessageFactory.cs   |  137 ++
 .../csharp/Message/Factory/IMessageFactory.cs   |   75 +
 .../csharp/Message/Factory/MessageFactory.cs|   92 ++
 src/main/csharp/Message/MapMessage.cs   |   72 +
 src/main/csharp/Message/Message.cs  |  287 
 src/main/csharp/Message/ObjectMessage.cs|   73 +
 src/main/csharp/Message/StreamMessage.cs|  418 ++
 src/main/csharp/Message/TextMessage.cs  |   67 +
 src/main/csharp/MessageConsumer.cs  |  977 +
 src/main/csharp/MessageLink.cs  |  506 +++
 src/main/csharp/MessageProducer.cs  |  555 
 src/main/csharp/NMSConnectionFactory.cs |   40 +
 src/main/csharp/NMSResource.cs  |  158 +++
 src/main/csharp/Policies/RedeliveryPolicy.cs|   28 +
 src/main/csharp/Queue.cs|  140 ++
 src/main/csharp/RemoveSubscriptionLink.cs   |  165 +++
 src/main/csharp/Session.cs  |  920 +
 src/main/csharp/TemporaryLink.cs|  130 ++
 src/main/csharp/Topic.cs|  138 ++
 .../csharp/Transport/AMQP/TransportContext.cs   |  146 ++
 .../Transport/IProviderTransportContext.cs  |   46 +
 .../Secure/AMQP/SecureTransportContext.cs   |  484 +++
 .../Secure/IProviderSecureTransportContext.cs   |   50 +
 src/main/csharp/Util/AtomicSequence.cs  |   55 +
 src/main/csharp/Util/DispatchExecutor.cs|  733 ++
 src/main/csharp/Util/ExceptionSupport.cs|  331 +
 src/main/csharp/Util/IdGenerator.cs |  674 +
 src/main/csharp/Util/LinkCache.cs   |  190 +++
 src/main/csharp/Util/MessageSupport.cs  |  397 ++
 src/main/csharp/Util/PropertyUtil.cs| 1294 ++
 src/main/csharp/Util/SymbolUtil.cs  |  124 ++
 src/main/csharp/Util/TaskUtil.cs|   81 ++
 

[11/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/main/csharp/Message/AMQP/AMQPMapMessageCloak.cs
--
diff --git a/src/main/csharp/Message/AMQP/AMQPMapMessageCloak.cs 
b/src/main/csharp/Message/AMQP/AMQPMapMessageCloak.cs
new file mode 100644
index 000..9754783
--- /dev/null
+++ b/src/main/csharp/Message/AMQP/AMQPMapMessageCloak.cs
@@ -0,0 +1,163 @@
+/*
+ * 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Apache.NMS;
+using Apache.NMS.Util;
+using Amqp.Types;
+using Amqp.Framing;
+
+namespace Apache.NMS.AMQP.Message.AMQP
+{
+using Cloak;
+using Factory;
+using Util;
+using Util.Types;
+using Util.Types.Map.AMQP;
+class AMQPMapMessageCloak : AMQPMessageCloak, IMapMessageCloak
+{
+private IPrimitiveMap map = null;
+private Map amqpmap = null;
+
+
+internal AMQPMapMessageCloak(Connection conn) : base(conn)
+{
+InitializeMapBody();
+}
+
+internal AMQPMapMessageCloak(MessageConsumer c, Amqp.Message msg) : 
base(c, msg)
+{
+InitializeMapBody();
+}
+
+internal override byte JMSMessageType { get { return 
MessageSupport.JMS_TYPE_MAP; } }
+
+private void InitializeMapBody()
+{
+if (message.BodySection == null)
+{
+amqpmap = new Map();
+map = new AMQPValueMap(amqpmap);
+AmqpValue val = new AmqpValue();
+val.Value = amqpmap;
+message.BodySection = val;
+}
+else 
+{
+if (message.BodySection is AmqpValue)
+{
+object obj = (message.BodySection as AmqpValue).Value;
+if (obj == null)
+{
+amqpmap = new Map();
+map = new AMQPValueMap(amqpmap);
+(message.BodySection as AmqpValue).Value = amqpmap;
+}
+else if (obj is Map)
+{
+amqpmap = obj as Map;
+map = new AMQPValueMap(amqpmap);
+}
+else
+{
+throw new NMSException(string.Format("Invalid message 
body value type. Type: {0}.", obj.GetType().Name));
+}
+}
+else
+{
+throw new NMSException("Invalid message body type.");
+}
+}
+
+}
+
+IPrimitiveMap IMapMessageCloak.Map
+{
+get
+{
+return map;
+}
+}
+
+IMapMessageCloak IMapMessageCloak.Copy()
+{
+IMapMessageCloak copy = new AMQPMapMessageCloak(Connection);
+CopyInto(copy);
+return copy;
+}
+
+protected override void CopyInto(IMessageCloak msg)
+{
+base.CopyInto(msg);
+IPrimitiveMap copy = (msg as IMapMessageCloak).Map;
+foreach (string key in this.map.Keys)
+{
+object value = map[key];
+if (value != null)
+{
+Type valType = value.GetType();
+if (valType.IsPrimitive)
+{
+// value copy primitive value
+copy[key] = value;
+}
+else if (valType.IsArray && valType.Equals(typeof(byte[])))
+{
+// use IPrimitive map SetBytes for most common 
implementation this is a deep copy.
+byte[] original = value as byte[];
+copy.SetBytes(key, original);
+}
+else if (valType.Equals(typeof(IDictionary)) || 
valType.Equals(typeof(Amqp.Types.Map)))
+{
+

[05/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/test/csharp/Test/Attribute/ConsumerSetup.cs
--
diff --git a/src/test/csharp/Test/Attribute/ConsumerSetup.cs 
b/src/test/csharp/Test/Attribute/ConsumerSetup.cs
new file mode 100644
index 000..bcb6b12
--- /dev/null
+++ b/src/test/csharp/Test/Attribute/ConsumerSetup.cs
@@ -0,0 +1,81 @@
+/*
+ * 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.Text;
+using System.Collections.Specialized;
+using NUnit.Framework;
+using NUnit.Framework.Interfaces;
+using Apache.NMS;
+using Apache.NMS.AMQP.Test.Util;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Collections;
+using System.Reflection;
+using Apache.NMS.AMQP.Test.TestCase;
+
+namespace Apache.NMS.AMQP.Test.Attribute
+{
+
+#region Consumer Setup Attribute Class
+
+internal class ConsumerSetupAttribute : 
SessionParentDestinationDependentSetupAttribute
+{
+
+public MessageListener OnMessage { get; set; } = null;
+
+protected override string InstanceName { get { return 
typeof(IMessageConsumer).Name; } }
+
+public ConsumerSetupAttribute(string sessionId, string destinationId, 
params string[] consumerIds) : base(sessionId, destinationId, consumerIds) { }
+
+public ConsumerSetupAttribute(string sessionId, string destinationId, 
string consumerId) : this(sessionId, destinationId, new string[] { consumerId 
}) { }
+
+public ConsumerSetupAttribute(string sessionId = null, string 
destinationId = null) : this(sessionId, destinationId, new string[] { null }) { 
}
+
+public override void BeforeTest(ITest test)
+{
+base.BeforeTest(test);
+InitializeNUnitTest(test);
+}
+
+public override void Setup(BaseTestCase nmsTest)
+{
+base.Setup(nmsTest);
+InitializeTest(nmsTest);
+}
+
+protected void InitializeConsumerProperties(IMessageConsumer consumer)
+{
+consumer.Listener += OnMessage;
+}
+
+protected override T CreateNMSInstance(BaseTestCase test, P 
parent)
+{
+IMessageConsumer consumer = test.CreateConsumer((ISession)parent, 
this.GetDestination(test));
+InitializeConsumerProperties(consumer);
+return (T)consumer;
+}
+
+protected override void AddInstance(BaseTestCase test, T instance, 
string id)
+{
+test.AddConsumer((IMessageConsumer)instance, id);
+}
+
+}
+
+#endregion
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/test/csharp/Test/Attribute/DestinationSetup.cs
--
diff --git a/src/test/csharp/Test/Attribute/DestinationSetup.cs 
b/src/test/csharp/Test/Attribute/DestinationSetup.cs
new file mode 100644
index 000..7bad1b9
--- /dev/null
+++ b/src/test/csharp/Test/Attribute/DestinationSetup.cs
@@ -0,0 +1,171 @@
+/*
+ * 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.Text;
+using System.Collections.Specialized;
+using NUnit.Framework;
+using NUnit.Framework.Interfaces;
+using Apache.NMS;
+using Apache.NMS.AMQP.Test.Util;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.Collections;
+using System.Reflection;
+using Apache.NMS.AMQP.Test.TestCase;

[09/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/main/csharp/MessageLink.cs
--
diff --git a/src/main/csharp/MessageLink.cs b/src/main/csharp/MessageLink.cs
new file mode 100644
index 000..8958f9b
--- /dev/null
+++ b/src/main/csharp/MessageLink.cs
@@ -0,0 +1,506 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Apache.NMS;
+using Apache.NMS.Util;
+using Amqp;
+using Amqp.Framing;
+using System.Reflection;
+using Apache.NMS.AMQP.Util;
+using System.Collections.Specialized;
+
+namespace Apache.NMS.AMQP
+{
+
+internal enum LinkState
+{
+UNKNOWN = -1,
+INITIAL = 0,
+ATTACHSENT = 1,
+ATTACHED = 2,
+DETACHSENT = 3,
+DETACHED = 4
+}
+
+internal enum TerminusDurability
+{
+NONE = 0,
+CONFIGURATION = 1,
+UNSETTLED_STATE = 2,
+}
+
+/// 
+/// Abstract Template for AmqpNetLite Amqp.ILink.
+/// This class Templates the performative Attach and Detached process for 
the amqp procotol engine class.
+/// The template operations are Attach and Detach.
+/// 
+abstract class MessageLink : NMSResource
+{
+private CountDownLatch responseLatch=null;
+private ILink impl;
+private Atomic state = new 
Atomic(LinkState.INITIAL);
+private readonly Session session;
+private readonly IDestination destination;
+private System.Threading.ManualResetEvent PerformativeOpenEvent = new 
System.Threading.ManualResetEvent(false);
+
+protected MessageLink(Session ses, Destination dest)
+{
+session = ses;
+destination = dest;
+}
+
+protected MessageLink(Session ses, IDestination dest)
+{
+session = ses;
+if(dest is Destination || dest == null)
+{
+destination = dest as Destination;
+}
+else
+{
+if (!dest.IsTemporary)
+{
+if(dest.IsQueue)
+{
+destination = Session.GetQueue((dest as 
IQueue).QueueName) as Destination;
+}
+else
+{
+destination = Session.GetQueue((dest as 
ITopic).TopicName) as Destination;
+}
+
+}
+else
+{
+throw new NotImplementedException("Foreign temporary 
Destination Implementation Not Supported.");
+}
+}
+
+}
+
+internal virtual Session Session { get => session; }
+
+internal IDestination Destination { get { return destination; } }
+
+protected LinkState State { get => this.state.Value; }
+
+protected ILink Link
+{
+get { return impl; }
+private set {  }
+}
+
+internal bool IsClosing { get { return 
state.Value.Equals(LinkState.DETACHSENT); } }
+
+internal bool IsClosed { get { return 
state.Value.Equals(LinkState.DETACHED); } }
+
+protected bool IsConfigurable { get { return 
state.Value.Equals(LinkState.INITIAL); } }
+
+protected bool IsOpening { get { return 
state.Value.Equals(LinkState.ATTACHSENT); } }
+
+protected bool IsRequestPending { get => this.responseLatch != null; }
+
+internal NMSException FailureCause { get; set; } = null;
+
+internal void SetFailureCause(Error error, string reason = "")
+{
+this.FailureCause = ExceptionSupport.GetException(error, reason);
+}
+
+internal void Attach()
+{
+if (state.CompareAndSet(LinkState.INITIAL, LinkState.ATTACHSENT))
+{
+PerformativeOpenEvent.Reset();
+responseLatch = new CountDownLatch(1);
+impl = CreateLink();
+this.Link.AddClosedCallback(this.OnInternalClosed);
+

[02/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/test/csharp/Test/TestCase/ProducerTest.cs
--
diff --git a/src/test/csharp/Test/TestCase/ProducerTest.cs 
b/src/test/csharp/Test/TestCase/ProducerTest.cs
new file mode 100644
index 000..57388b0
--- /dev/null
+++ b/src/test/csharp/Test/TestCase/ProducerTest.cs
@@ -0,0 +1,985 @@
+/*
+ * 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.Text;
+using System.Collections.Specialized;
+using System.Collections.Generic;
+using NUnit.Framework;
+using NUnit.Framework.Interfaces;
+using Apache.NMS;
+using Apache.NMS.Util;
+using Apache.NMS.AMQP.Test.Util;
+using Apache.NMS.AMQP.Test.Attribute;
+
+namespace Apache.NMS.AMQP.Test.TestCase
+{
+[TestFixture]
+class ProducerTest : BaseTestCase
+{
+
+const int TIMEOUT = 15000; // 15 secs
+
+public override void Setup()
+{
+base.Setup();
+waiter = new System.Threading.ManualResetEvent(false);
+}
+
+[Test]
+[ConnectionSetup(null, "c1")]
+[SessionSetup("c1", "s1")]
+[QueueSetup("s1","q1", Name = "nms.unique.queue")]
+[ProducerSetup("s1", "q1","sender", DeliveryMode = 
MsgDeliveryMode.NonPersistent)]
+public void TestProducerSend()
+{
+const int NUM_MSGS = 100;
+
+try
+{
+using(IConnection connection = GetConnection("c1"))
+using(IMessageProducer producer = GetProducer("sender"))
+{
+connection.ExceptionListener += DefaultExceptionListener;
+ITextMessage textMessage = producer.CreateTextMessage();
+for(int i=0; i destinations = this.GetDestinations(new 
string[] { "q1", "q2", "t1", "t2" });
+IList consumers = this.GetConsumers(new string[] 
{ "cq1", "cq2", "ct1", "ct2" });
+int DestinationPoolSize = destinations.Count;
+int ConsumerPoolSize = consumers.Count;
+
+IMessageProducer producer = null;
+
+using (ISession session = GetSession("s1"))
+using (IConnection connection = GetConnection("c1"))
+{
+try
+{
+connection.ExceptionListener += DefaultExceptionListener;
+foreach(IMessageConsumer c in consumers)
+{
+c.Listener += CreateListener(NUM_MSGS);
+}
+
+connection.Start();
+
+producer = session.CreateProducer();
+producer.DeliveryMode = MsgDeliveryMode.Persistent;
+ITextMessage textMessage = producer.CreateTextMessage();
+
+for (int i = 0; i < NUM_MSGS; )
+{
+foreach (IDestination dest in destinations)
+{
+Logger.Info("Sending message " + i + " to 
destination " + dest.ToString());
+textMessage.Text = "Num:" + dest.ToString() + ":" 
+ i;
+i++;
+
+producer.Send(dest, textMessage);
+}
+}
+
+Assert.IsTrue(waiter.WaitOne(TIMEOUT), "Failed to received 
all messages. Received {0} of {1} in {2}ms.", msgCount, NUM_MSGS, TIMEOUT);
+
+}
+catch (Exception ex)
+{
+this.PrintTestFailureAndAssert(GetTestMethodName(), 
"Unexpected exception.", ex);
+}
+}
+
+}
+
+[Test]
+//[Repeat(25)]
+[ConnectionSetup(null,"c1")]
+[SessionSetup("c1","s1")]
+[TopicSetup("s1","t1",Name = "nms.topic.test")]
+[ConsumerSetup("s1","t1","drain")]
+public void TestMultipleProducerCreateAndSend(
+[Values(MsgDeliveryMode.NonPersistent, MsgDeliveryMode.Persistent)]
+MsgDeliveryMode mode
+)
+{
+const int 

[12/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/main/csharp/Connection.cs
--
diff --git a/src/main/csharp/Connection.cs b/src/main/csharp/Connection.cs
new file mode 100644
index 000..024dc4c
--- /dev/null
+++ b/src/main/csharp/Connection.cs
@@ -0,0 +1,1159 @@
+/*
+ * 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.Collections.Concurrent;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Apache.NMS;
+using Amqp;
+using Amqp.Framing;
+using Apache.NMS.AMQP.Util;
+using Apache.NMS.AMQP.Transport;
+using System.Reflection;
+using Apache.NMS.Util;
+
+namespace Apache.NMS.AMQP
+{
+using Message.Factory;
+enum ConnectionState
+{
+UNKNOWN = -1,
+INITIAL = 0,
+CONNECTING = 1,
+CONNECTED = 2,
+CLOSING = 3,
+CLOSED = 4,
+
+}
+
+/// 
+/// Apache.NMS.AMQP.Connection facilitates management and creates the 
underlying Amqp.Connection protocol engine object.
+/// Apache.NMS.AMQP.Connection is also the NMS.AMQP.Session Factory.
+/// 
+class Connection : NMSResource, Apache.NMS.IConnection
+{
+public static readonly string MESSAGE_OBJECT_SERIALIZATION_PROP = 
PropertyUtil.CreateProperty("Message.Serialization", 
ConnectionFactory.ConnectionPropertyPrefix);
+
+private IRedeliveryPolicy redeliveryPolicy;
+private Amqp.IConnection impl;
+private ProviderCreateConnection implCreate;
+private ConnectionInfo connInfo;
+private readonly IdGenerator clientIdGenerator;
+private Atomic clientIdCanSet = new Atomic(true);
+private Atomic closing = new Atomic(false);
+private Atomic state = new 
Atomic(ConnectionState.INITIAL);
+private CountDownLatch latch;
+private ConcurrentDictionary sessions = new 
ConcurrentDictionary();
+private IdGenerator sesIdGen = null;
+private IdGenerator tempTopicIdGen = null;
+private IdGenerator tempQueueIdGen = null;
+private StringDictionary properties;
+private TemporaryLinkCache temporaryLinks = null;
+private IProviderTransportContext transportContext = null;
+private DispatchExecutor exceptionExecutor = null;
+
+#region Contructor
+
+internal Connection(Uri addr, IdGenerator clientIdGenerator)
+{
+connInfo = new ConnectionInfo();
+connInfo.remoteHost = addr;
+Info = connInfo;
+this.clientIdGenerator = clientIdGenerator;
+latch = new CountDownLatch(1);
+temporaryLinks = new TemporaryLinkCache(this);
+}
+
+#endregion
+
+#region Internal Properties
+
+internal Amqp.IConnection InnerConnection { get { return this.impl; } }
+
+internal IdGenerator SessionIdGenerator
+{
+get
+{
+IdGenerator sig = sesIdGen;
+lock (this)
+{
+if (sig == null)
+{
+sig = new NestedIdGenerator("ID:ses", connInfo.Id, 
true);
+sesIdGen = sig;
+}
+}
+return sig;
+}
+}
+
+internal IdGenerator TemporaryTopicGenerator
+{
+get
+{
+IdGenerator ttg = tempTopicIdGen;
+lock (this)
+{
+if (ttg == null)
+{
+ttg = new NestedIdGenerator("ID:nms-temp-topic", 
Info.Id, true);
+tempTopicIdGen = ttg;
+}
+}
+return ttg;
+}
+}
+
+internal IdGenerator TemporaryQueueGenerator
+{
+get
+{
+IdGenerator tqg = tempQueueIdGen;
+lock (this)
+{
+if (tqg == null)
+ 

[01/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

Repository: activemq-nms-amqp
Updated Branches:
  refs/heads/master ed4639a7b -> ad2469320


http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/test/csharp/Test/Util/NMSLogger.cs
--
diff --git a/src/test/csharp/Test/Util/NMSLogger.cs 
b/src/test/csharp/Test/Util/NMSLogger.cs
new file mode 100644
index 000..c21c492
--- /dev/null
+++ b/src/test/csharp/Test/Util/NMSLogger.cs
@@ -0,0 +1,146 @@
+/*
+ * 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 Apache.NMS;
+using Amqp;
+
+namespace Apache.NMS.AMQP.Test.Util
+{
+
+class NMSLogger : ITrace
+{
+public enum LogLevel
+{
+OFF = -1,
+FATAL,
+ERROR,
+WARN,
+INFO,
+DEBUG
+}
+
+public static LogLevel ToLogLevel(string logString)
+{
+if (logString == null || logString.Length == 0)
+{
+return LogLevel.OFF;
+}
+if ("FATAL".StartsWith(logString, 
StringComparison.CurrentCultureIgnoreCase))
+{
+return LogLevel.FATAL;
+}
+else if ("ERROR".StartsWith(logString, 
StringComparison.CurrentCultureIgnoreCase))
+{
+return LogLevel.ERROR;
+}
+else if ("WARN".StartsWith(logString, 
StringComparison.CurrentCultureIgnoreCase))
+{
+return LogLevel.WARN;
+}
+else if ("INFO".StartsWith(logString, 
StringComparison.CurrentCultureIgnoreCase))
+{
+return LogLevel.INFO;
+}
+else if ("DEBUG".StartsWith(logString, 
StringComparison.CurrentCultureIgnoreCase))
+{
+return LogLevel.DEBUG;
+}
+else
+{
+return LogLevel.OFF;
+}
+}
+
+private LogLevel lv;
+
+public NMSLogger(LogLevel lvl)
+{
+lv = lvl;
+}
+
+public bool IsDebugEnabled
+{
+get
+{
+return lv >= LogLevel.DEBUG;
+}
+}
+
+public bool IsErrorEnabled
+{
+get
+{
+
+return lv >= LogLevel.ERROR;
+}
+}
+
+public bool IsFatalEnabled
+{
+get
+{
+return lv >= LogLevel.FATAL;
+}
+}
+
+public bool IsInfoEnabled
+{
+get
+{
+return lv >= LogLevel.INFO;
+}
+}
+
+public bool IsWarnEnabled
+{
+get
+{
+return lv >= LogLevel.WARN;
+}
+}
+
+public void Debug(string message)
+{
+if (IsDebugEnabled)
+Console.WriteLine("Debug: {0}", message);
+}
+
+public void Error(string message)
+{
+if (IsErrorEnabled)
+Console.WriteLine("Error: {0}", message);
+}
+
+public void Fatal(string message)
+{
+if (IsFatalEnabled)
+Console.WriteLine("Fatal: {0}", message);
+}
+
+public void Info(string message)
+{
+if (IsInfoEnabled)
+Console.WriteLine("Info: {0}", message);
+}
+
+public void Warn(string message)
+{
+if (IsWarnEnabled)
+Console.WriteLine("Warn: {0}", message);
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/test/csharp/Test/Util/TestConfig.cs
--
diff --git a/src/test/csharp/Test/Util/TestConfig.cs 
b/src/test/csharp/Test/Util/TestConfig.cs
new file mode 100644
index 000..1bb82c9
--- /dev/null
+++ b/src/test/csharp/Test/Util/TestConfig.cs
@@ -0,0 +1,249 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional 

[08/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/main/csharp/TemporaryLink.cs
--
diff --git a/src/main/csharp/TemporaryLink.cs b/src/main/csharp/TemporaryLink.cs
new file mode 100644
index 000..fbd011c
--- /dev/null
+++ b/src/main/csharp/TemporaryLink.cs
@@ -0,0 +1,130 @@
+/*
+ * 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 Apache.NMS;
+using Apache.NMS.AMQP.Util;
+using Amqp;
+using Amqp.Framing;
+
+namespace Apache.NMS.AMQP
+{
+internal class TemporaryLink : MessageLink
+{
+private readonly string TOPIC = "Topic";
+private readonly string QUEUE = "Queue";
+private readonly string CREATOR_TOPIC = "temp-topic-creator";
+private readonly string CREATOR_QUEUE = "temp-queue-creator";
+
+internal TemporaryLink(Session session, TemporaryDestination 
destination) : base(session, destination)
+{
+Info = new TemporaryLinkInfo(destination.DestinationId);
+this.RequestTimeout = session.Connection.RequestTimeout;
+}
+
+private TemporaryDestination TemporaryDestination { get => Destination 
as TemporaryDestination; }
+
+private bool IsTopic { get => TemporaryDestination.IsTopic; }
+
+private string LocalDestinationName { get => 
TemporaryDestination.DestinationId.ToString(); }
+
+private string DestinationTypeName { get { return IsTopic ? TOPIC : 
QUEUE; } }
+
+private void OnAttachResponse(ILink link, Attach attachResponse)
+{
+Tracer.InfoFormat("Received attach response for Temporary creator 
link. Link = {0}, Attach = {1}", link.Name, attachResponse);
+Target target = (attachResponse.Target as Amqp.Framing.Target);
+if(target?.Address != null)
+{
+this.TemporaryDestination.DestinationName = target.Address;
+}
+this.OnResponse();
+}
+
+private Source CreateSource()
+{
+Source result = new Source();
+
+return result;
+}
+
+private Target CreateTarget()
+{
+Target result = new Target();
+result.Durable = (uint)TerminusDurability.NONE;
+
+result.Capabilities = new[] { 
SymbolUtil.GetTerminusCapabilitiesForDestination(Destination) };
+result.Dynamic = true;
+
+result.ExpiryPolicy = SymbolUtil.ATTACH_EXPIRY_POLICY_LINK_DETACH;
+Amqp.Types.Fields dnp = new Amqp.Types.Fields();
+dnp.Add(
+SymbolUtil.ATTACH_DYNAMIC_NODE_PROPERTY_LIFETIME_POLICY,
+SymbolUtil.DELETE_ON_CLOSE
+);
+result.DynamicNodeProperties = dnp;
+
+return result;
+}
+
+private Attach CreateAttach()
+{
+Attach result = new Attach()
+{
+Source = CreateSource(),
+Target = CreateTarget(),
+SndSettleMode = SenderSettleMode.Unsettled,
+RcvSettleMode = ReceiverSettleMode.First,
+};
+
+return result;
+}
+
+protected override ILink CreateLink()
+{
+Amqp.Session parentImpl = this.Session.InnerSession as 
Amqp.Session;
+string linkDestinationName = "apache-nms:" + ((IsTopic) ? 
CREATOR_TOPIC : CREATOR_QUEUE ) + LocalDestinationName;
+SenderLink link = new SenderLink(parentImpl, linkDestinationName, 
CreateAttach(), OnAttachResponse);
+return link;
+}
+
+protected override void OnInternalClosed(IAmqpObject sender, Error 
error)
+{
+base.OnInternalClosed(sender, error);
+this.OnResponse();
+}
+
+internal override void Shutdown()
+{
+base.Shutdown();
+this.Session.Connection.Remove(this.TemporaryDestination);
+}
+
+protected override void StopResource()
+{
+}
+
+}
+
+internal class TemporaryLinkInfo : LinkInfo
+{
+public TemporaryLinkInfo (Id id) : base(id)
+{
+
+}
+
+}
+}

[03/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/test/csharp/Test/TestCase/MessageTest.cs
--
diff --git a/src/test/csharp/Test/TestCase/MessageTest.cs 
b/src/test/csharp/Test/TestCase/MessageTest.cs
new file mode 100644
index 000..5023bb3
--- /dev/null
+++ b/src/test/csharp/Test/TestCase/MessageTest.cs
@@ -0,0 +1,1240 @@
+/*
+ * 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.Text;
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+using NUnit.Framework.Interfaces;
+using Apache.NMS;
+using Apache.NMS.Util;
+using Apache.NMS.AMQP.Test.Util;
+using Apache.NMS.AMQP.Test.Attribute;
+
+namespace Apache.NMS.AMQP.Test.TestCase
+{
+[TestFixture]
+class MessageTest : BaseTestCase
+{
+internal static readonly TimeSpan TIMEOUT = 
TimeSpan.FromMilliseconds(3);
+internal static readonly string MaxString;
+internal static readonly string AlmostMaxString;
+internal static readonly string String256;
+internal static readonly byte[] Bytes256;
+internal static readonly byte[] Bytes257;
+internal static readonly byte[] MaxBytes;
+internal static readonly Dictionary LargeDictionary;
+internal static readonly List LargeList;
+internal static readonly Dictionary SmallDictionary;
+internal static readonly List SmallList;
+internal static readonly object[] NMSPrimitiveTestValues = new object[]
+{
+(byte)0xef,
+48,
+false,
+'c',
+"smallString",
+"longerString",
+
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-=_+,./<>?;':\"[]\\{}|",
+
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-=_+,./<>?;':\"[]\\{}|abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-=_+,./<>?;':\"[]\\{}|abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-=_+,.",
+
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-=_+,./<>?;':\"[]\\{}|abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-=_+,./<>?;':\"[]\\{}|abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-=_+,.?",
+1.12f,
+9223372036854775807L,
+30U,
+Convert.ToByte(0x41),
+Convert.ToInt16(-95),
+55.123456789123456789,
+new byte[]{ 0xff, 0xe1, 0x1f, 0x5b, 0x8d },
+};
+
+// MaxFrameSize denotes the Maximum size an amqp message can be on a 
connection for the Message Tests.
+// 
+const int MaxFrameSize = 1024 * 1024 * 1024; // 1 GiB
+
+// Limit read by config file.
+static readonly int MaxDataChunkSize = 
(int)TestConfig.Instance.DataGeneratedChunkSize;
+
+// Normalized value of MaxDataChunkSize. 
+// If MaxDataChunkSize negative as int LargeLen is 0 - 
MaxDataChunkSize else MaxDataChunkSize
+// LargeLen has a minimum value of ushort.max .
+static readonly int LargeLen;
+// SmallLen is ten (2^10 = 1024) orders of magnitude lower then 
LargeLen with a minimum value of byte.MaxValue.
+static readonly int SmallLen;
+
+static MessageTest()
+{
+int limit = (MaxDataChunkSize < 0) ? 0 - MaxDataChunkSize : 
MaxDataChunkSize;
+LargeLen = Math.Max(limit, Convert.ToInt32(ushort.MaxValue) );
+SmallLen = Math.Max(LargeLen / 1024, 
Convert.ToInt32(byte.MaxValue));
+ulong charIndex = 0;
+ulong byteIndex = 0;
+int ValueIndex = 0;
+StringBuilder sb = new StringBuilder(LargeLen);
+LargeDictionary = new Dictionary(LargeLen);
+LargeList = new List(LargeLen);
+SmallDictionary = new Dictionary(SmallLen);
+SmallList = new List(SmallLen);
+Bytes256 = new byte[256];
+Bytes257 = new byte[257];
+MaxBytes = new byte[LargeLen];
+for(int i = 0; i< LargeLen; i++)

[10/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/main/csharp/Message/Cloak/ITextMessageCloak.cs
--
diff --git a/src/main/csharp/Message/Cloak/ITextMessageCloak.cs 
b/src/main/csharp/Message/Cloak/ITextMessageCloak.cs
new file mode 100644
index 000..b85f947
--- /dev/null
+++ b/src/main/csharp/Message/Cloak/ITextMessageCloak.cs
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Apache.NMS.AMQP.Message.Cloak
+{
+interface ITextMessageCloak : IMessageCloak
+{
+string Text { get; set; }
+new ITextMessageCloak Copy();
+}
+}

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/main/csharp/Message/Factory/AMQPMessageFactory.cs
--
diff --git a/src/main/csharp/Message/Factory/AMQPMessageFactory.cs 
b/src/main/csharp/Message/Factory/AMQPMessageFactory.cs
new file mode 100644
index 000..8b0268d
--- /dev/null
+++ b/src/main/csharp/Message/Factory/AMQPMessageFactory.cs
@@ -0,0 +1,137 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Apache.NMS;
+using Apache.NMS.Util;
+using Apache.NMS.AMQP;
+using Amqp;
+
+namespace Apache.NMS.AMQP.Message.Factory
+{
+using Cloak;
+using AMQP;
+class AMQPMessageFactory : MessageFactory where T : ConnectionInfo
+{
+
+protected readonly AMQPMessageTransformation transformFactory;
+protected AMQPObjectEncodingType encodingType = 
AMQPObjectEncodingType.UNKOWN;
+
+internal AMQPMessageFactory(NMSResource resource) : base(resource)
+{
+transformFactory = new AMQPMessageTransformation(this);
+InitEncodingType();
+}
+
+internal MessageTransformation TransformFactory { get { return 
transformFactory; } }
+
+internal Connection Parent { get { return parent as Connection; } }
+
+public override MessageTransformation GetTransformFactory()
+{
+return transformFactory;
+}
+
+public override IBytesMessage CreateBytesMessage()
+{
+IBytesMessageCloak cloak = new AMQPBytesMessageCloak(Parent);
+return new BytesMessage(cloak);
+}
+
+public override IBytesMessage CreateBytesMessage(byte[] body)
+{
+IBytesMessage msg = CreateBytesMessage();
+msg.WriteBytes(body);
+return msg;
+}
+
+public override IMapMessage CreateMapMessage()
+{
+IMapMessageCloak cloak = new AMQPMapMessageCloak(Parent);
+return new MapMessage(cloak);
+}
+
+public override IMessage CreateMessage()
+{
+IMessageCloak cloak = new AMQPMessageCloak(Parent);
+return new Message(cloak);
+}
+
+public override IObjectMessage CreateObjectMessage(object body)
+{
+IObjectMessageCloak cloak = new AMQPObjectMessageCloak(Parent, 
encodingType);
+return new ObjectMessage(cloak) { Body=body };
+}
+
+public override 

[04/15] activemq-nms-amqp git commit: AMQNET-575: NMS AMQP Client Rework Add an NMS API implementation that wraps the AMQPnetLite .NET API.

[tabish]

http://git-wip-us.apache.org/repos/asf/activemq-nms-amqp/blob/432c9613/src/test/csharp/Test/TestCase/ConsumerTest.cs
--
diff --git a/src/test/csharp/Test/TestCase/ConsumerTest.cs 
b/src/test/csharp/Test/TestCase/ConsumerTest.cs
new file mode 100644
index 000..473b0f7
--- /dev/null
+++ b/src/test/csharp/Test/TestCase/ConsumerTest.cs
@@ -0,0 +1,828 @@
+/*
+ * 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.Specialized;
+using System.Collections.Generic;
+using NUnit.Framework;
+using NUnit.Framework.Interfaces;
+using Apache.NMS;
+using Apache.NMS.AMQP.Test.Util;
+using Apache.NMS.AMQP.Test.Attribute;
+using System.Text;
+
+namespace Apache.NMS.AMQP.Test.TestCase
+{
+[TestFixture]
+class ConsumerTest : BaseTestCase
+{
+
+
+const string CUSTOM_CLIENT_ID = "foobar";
+
+public override void Setup()
+{
+base.Setup();
+msgCount = 0;
+asyncEx = null;
+waiter = new System.Threading.ManualResetEvent(false);
+}
+
+
+protected void SendMessages(IMessageProducer producer, int 
messageCount)
+{
+ITextMessage message = producer.CreateTextMessage();
+
+for (int i = 0; i < messageCount; i++)
+{
+message.Text = "num:" + i;
+producer.Send(message, MsgDeliveryMode.NonPersistent, 
MsgPriority.Normal, TimeSpan.Zero);
+}
+}
+
+[Test]
+[ConnectionSetup(null, "default")]
+[SessionSetup("default", "default", AckMode = 
AcknowledgementMode.AutoAcknowledge)]
+[TopicSetup("default", "testdest1", Name = "nms.test")]
+[ConsumerSetup("default", "testdest1", "con1")]
+[ProducerSetup("default", "testdest1", "pro1")]
+public void TestReceiveMessageSync()
+{
+const int NUM_MSGS = 100;
+const int CONUSMER_TIMEOUT = 25; // 25 ms to pull from consumer.
+const int BACKOFF_SLEEP = 500; // 0.5 secs to sleep when consumer 
pull times out.
+using (IConnection connection = this.GetConnection())
+using (IMessageConsumer consumer = this.GetConsumer("con1"))
+using (IMessageProducer producer = this.GetProducer("pro1"))
+{
+try
+{
+connection.ExceptionListener += DefaultExceptionListener;
+connection.Start();
+
+SendMessages(producer, NUM_MSGS);
+
+ITextMessage textMessage = null;
+IMessage message = null;
+int backoffCount = 0;
+DateTime start = DateTime.Now;
+TimeSpan duration;
+while (msgCount < NUM_MSGS && backoffCount < 3)
+{
+while ((message = 
consumer.Receive(TimeSpan.FromMilliseconds(CONUSMER_TIMEOUT))) != null)
+{
+textMessage = message as ITextMessage;
+Assert.AreEqual("num:" + msgCount, 
textMessage.Text, "Received message out of order.");
+msgCount++;
+}
+backoffCount++;
+if (backoffCount < 3 && msgCount < NUM_MSGS)
+{
+System.Threading.Thread.Sleep(BACKOFF_SLEEP);
+}
+}
+
+duration = (DateTime.Now - start);
+int milis = Convert.ToInt32(duration.TotalMilliseconds);
+Assert.AreEqual(NUM_MSGS, msgCount, "Received {0} messages 
out of {1} in {0}ms.", msgCount, NUM_MSGS, milis);
+
+}
+catch (Exception ex)
+{
+this.PrintTestFailureAndAssert(this.GetMethodName(), 
"Unexpected Exception.", ex);
+}
+}
+}
+
+[Test]
+[ConnectionSetup(null, "default")]
+[SessionSetup("default", "default", AckMode = 
AcknowledgementMode.AutoAcknowledge)]
+