[3/3] activemq git commit: AMQ-6706 - Protecting preShutdownHooks with an AtomicBoolean

[cshannon]

AMQ-6706 - Protecting preShutdownHooks with an AtomicBoolean


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

Branch: refs/heads/master
Commit: 2311749aa2629cf344fb5642910c3cc39f869b58
Parents: 3593afe
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Jun 20 11:05:29 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Jun 20 11:05:29 2017 -0400

--
 .../apache/activemq/broker/BrokerService.java   | 21 +---
 1 file changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/2311749a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
index 97fb814..c177b76 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -125,7 +125,6 @@ import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.StoreUtil;
 import org.apache.activemq.util.ThreadPoolUtils;
 import org.apache.activemq.util.TimeUtils;
-import org.apache.activemq.util.URISupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -199,6 +198,7 @@ public class BrokerService implements Service {
 private final AtomicBoolean started = new AtomicBoolean(false);
 private final AtomicBoolean stopped = new AtomicBoolean(false);
 private final AtomicBoolean stopping = new AtomicBoolean(false);
+private final AtomicBoolean preShutdownHooksInvoked = new 
AtomicBoolean(false);
 private BrokerPlugin[] plugins;
 private boolean keepDurableSubsActive = true;
 private boolean useVirtualTopics = true;
@@ -268,7 +268,7 @@ public class BrokerService implements Service {
 private boolean rollbackOnlyOnAsyncException = true;
 
 private int storeOpenWireVersion = OpenWireFormat.DEFAULT_STORE_VERSION;
-private List preShutdownHooks = new CopyOnWriteArrayList<>();
+private final List preShutdownHooks = new 
CopyOnWriteArrayList<>();
 
 static {
 
@@ -603,6 +603,7 @@ public class BrokerService implements Service {
 
 setStartException(null);
 stopping.set(false);
+preShutdownHooksInvoked.set(false);
 startDate = new Date();
 MDC.put("activemq.broker", brokerName);
 
@@ -801,11 +802,17 @@ public class BrokerService implements Service {
 public void stop() throws Exception {
 final ServiceStopper stopper = new ServiceStopper();
 
-for (Runnable hook : preShutdownHooks) {
-try {
-hook.run();
-} catch (Throwable e) {
-stopper.onException(hook, e);
+//The preShutdownHooks need to run before stopping.compareAndSet()
+//so there is a separate AtomicBoolean so the hooks only run once
+//We want to make sure the hooks are run before stop is initialized
+//including setting the stopping variable - See AMQ-6706
+if (preShutdownHooksInvoked.compareAndSet(false, true)) {
+for (Runnable hook : preShutdownHooks) {
+try {
+hook.run();
+} catch (Throwable e) {
+stopper.onException(hook, e);
+}
 }
 }
 

activemq git commit: [maven-release-plugin] prepare release activemq-5.15.0

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 4b8cd46a0 -> 5f0d6943c


[maven-release-plugin] prepare release activemq-5.15.0


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

Branch: refs/heads/master
Commit: 5f0d6943cb97b0570bf8d58e8eaf9f0003a5cb6c
Parents: 4b8cd46
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Jun 27 13:41:01 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Jun 27 13:41:01 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/5f0d6943/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index b6c1da6..4cd142b 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.0-SNAPSHOT
+5.15.0
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/5f0d6943/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index d5e2ca2..38a4f87 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.0-SNAPSHOT
+5.15.0
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/5f0d6943/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 66e8158..49467e3 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.0-SNAPSHOT
+5.15.0
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/5f0d6943/activemq

[activemq] Git Push Summary

[cshannon]

Repository: activemq
Updated Tags:  refs/tags/activemq-5.15.0 [created] 88ae0c0d7

activemq git commit: [maven-release-plugin] prepare for next development iteration

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 5f0d6943c -> a9fe4e33c


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/master
Commit: a9fe4e33c3f2d93f40b49be01041de487c4c79f3
Parents: 5f0d694
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Jun 27 13:41:28 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Jun 27 13:41:28 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/a9fe4e33/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 4cd142b..11a04d7 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.0
+5.16.0-SNAPSHOT
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/a9fe4e33/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 38a4f87..cc2da52 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.0
+5.16.0-SNAPSHOT
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/a9fe4e33/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 49467e3..451ec9a 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.0
+5.16.0-SNAPSHOT
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/a9fe4e33/activemq

activemq git commit: AMQ-6698 - Allow timeout of SSL handshake for auto+nio+ssl

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master daeb70929 -> 2a0b785a0


AMQ-6698 - Allow timeout of SSL handshake for auto+nio+ssl

The handshake now takes place inside of the async task that timesout so
that if the SSL handshake takes too long the connection attempt will
honor protocolDetectionTimeout and actually timeout.  Also, change the
default of protocolDetectionTimeout to 30 seconds so it matches the rest
of the broker's default connection timeout settings.


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

Branch: refs/heads/master
Commit: 2a0b785a041f35aa668d2371c9374eb0fd02063c
Parents: daeb709
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Jun 8 12:32:35 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Jun 8 12:34:15 2017 -0400

--
 .../activemq/transport/auto/AutoTcpTransportServer.java   |  2 +-
 .../transport/auto/nio/AutoNIOSSLTransportServer.java | 10 +++---
 .../activemq/openwire/OpenWireConnectionTimeoutTest.java  |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/2a0b785a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
 
b/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
index 8b9a73f..309e368 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
@@ -78,7 +78,7 @@ public class AutoTcpTransportServer extends 
TcpTransportServer {
 protected final ThreadPoolExecutor newConnectionExecutor;
 protected final ThreadPoolExecutor protocolDetectionExecutor;
 protected int maxConnectionThreadPoolSize = Integer.MAX_VALUE;
-protected int protocolDetectionTimeOut = 15000;
+protected int protocolDetectionTimeOut = 3;
 
 private static final FactoryFinder TRANSPORT_FACTORY_FINDER = new 
FactoryFinder("META-INF/services/org/apache/activemq/transport/");
 private final ConcurrentMap<String, TransportFactory> transportFactories = 
new ConcurrentHashMap<String, TransportFactory>();

http://git-wip-us.apache.org/repos/asf/activemq/blob/2a0b785a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
 
b/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
index 572352e..78d1de2 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
@@ -110,14 +110,18 @@ public class AutoNIOSSLTransportServer extends 
AutoTcpTransportServer {
 //Clone the map because we will need to set the options later on 
the actual transport
 IntrospectionSupport.setProperties(in, new 
HashMap<>(transportOptions));
 }
-in.start();
-SSLEngine engine = in.getSslSession();
 
 //Attempt to read enough bytes to detect the protocol until the 
timeout period
 //is reached
 Future future = protocolDetectionExecutor.submit(new Runnable() {
 @Override
 public void run() {
+try {
+in.start();
+} catch (Exception e) {
+throw new IllegalStateException("Could not complete 
Transport start", e);
+}
+
 int attempts = 0;
 do {
 if(attempts > 0) {
@@ -157,7 +161,7 @@ public class AutoNIOSSLTransportServer extends 
AutoTcpTransportServer {
 }
 
 WireFormat format = 
protocolInfo.detectedWireFormatFactory.createWireFormat();
-Transport transport = createTransport(socket, format, engine, 
initBuffer, in.getInputBuffer(), protocolInfo.detectedTransportFactory);
+Transport transport = createTransport(socket, format, 
in.getSslSession(), initBuffer, in.getInputBuffer(), 
protocolInfo.detectedTransportFactory

activemq git commit: AMQ-6698 - Allow timeout of SSL handshake for auto+nio+ssl

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x e38ac94a2 -> 4b4d1defe


AMQ-6698 - Allow timeout of SSL handshake for auto+nio+ssl

The handshake now takes place inside of the async task that timesout so
that if the SSL handshake takes too long the connection attempt will
honor protocolDetectionTimeout and actually timeout.  Also, change the
default of protocolDetectionTimeout to 30 seconds so it matches the rest
of the broker's default connection timeout settings.

(cherry picked from commit 2a0b785a041f35aa668d2371c9374eb0fd02063c)


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

Branch: refs/heads/activemq-5.14.x
Commit: 4b4d1defe525e203c9f83f4eb6144a42634b7eb8
Parents: e38ac94
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Jun 8 12:32:35 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Jun 8 12:34:42 2017 -0400

--
 .../activemq/transport/auto/AutoTcpTransportServer.java   |  2 +-
 .../transport/auto/nio/AutoNIOSSLTransportServer.java | 10 +++---
 .../activemq/openwire/OpenWireConnectionTimeoutTest.java  |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/4b4d1def/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
 
b/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
index 8b9a73f..309e368 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/transport/auto/AutoTcpTransportServer.java
@@ -78,7 +78,7 @@ public class AutoTcpTransportServer extends 
TcpTransportServer {
 protected final ThreadPoolExecutor newConnectionExecutor;
 protected final ThreadPoolExecutor protocolDetectionExecutor;
 protected int maxConnectionThreadPoolSize = Integer.MAX_VALUE;
-protected int protocolDetectionTimeOut = 15000;
+protected int protocolDetectionTimeOut = 3;
 
 private static final FactoryFinder TRANSPORT_FACTORY_FINDER = new 
FactoryFinder("META-INF/services/org/apache/activemq/transport/");
 private final ConcurrentMap<String, TransportFactory> transportFactories = 
new ConcurrentHashMap<String, TransportFactory>();

http://git-wip-us.apache.org/repos/asf/activemq/blob/4b4d1def/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
 
b/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
index 572352e..78d1de2 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/transport/auto/nio/AutoNIOSSLTransportServer.java
@@ -110,14 +110,18 @@ public class AutoNIOSSLTransportServer extends 
AutoTcpTransportServer {
 //Clone the map because we will need to set the options later on 
the actual transport
 IntrospectionSupport.setProperties(in, new 
HashMap<>(transportOptions));
 }
-in.start();
-SSLEngine engine = in.getSslSession();
 
 //Attempt to read enough bytes to detect the protocol until the 
timeout period
 //is reached
 Future future = protocolDetectionExecutor.submit(new Runnable() {
 @Override
 public void run() {
+try {
+in.start();
+} catch (Exception e) {
+throw new IllegalStateException("Could not complete 
Transport start", e);
+}
+
 int attempts = 0;
 do {
 if(attempts > 0) {
@@ -157,7 +161,7 @@ public class AutoNIOSSLTransportServer extends 
AutoTcpTransportServer {
 }
 
 WireFormat format = 
protocolInfo.detectedWireFormatFactory.createWireFormat();
-Transport transport = createTransport(socket, format, engine, 
initBuffer, in.getInputBuffer(), protocolInfo.detectedTransportFactory);
+Transport transport = createTransport(socket, fo

activemq git commit: AMQ-6585 - Fixing ActiveMQ camel components for 2.18.x

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master b6cb0eace -> 395a48dee


AMQ-6585 - Fixing ActiveMQ camel components for 2.18.x

The new version of Camel adds username and password to JmsComponent and
JmsConfiguration which interferes with the ActiveMQ version.  Fixing
ActiveMQComponent and ActiveMQConfiguration to use the inherited
properties now which fixes username/password unit tests.  Also fixed a
couple of other tests that had bad configuration.


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

Branch: refs/heads/master
Commit: 395a48deea8806e76f91278b486f52bc4b9841a2
Parents: b6cb0ea
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Jun 13 10:11:07 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Jun 13 10:13:21 2017 -0400

--
 .../camel/component/ActiveMQComponent.java  | 17 +++---
 .../camel/component/ActiveMQConfiguration.java  | 34 
 ...DestinationExclusiveConsumerTest-context.xml |  5 +++
 .../activemq/camel/SetHeaderTest-context.xml|  4 +++
 4 files changed, 27 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/395a48de/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
--
diff --git 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
index d1328f2..440b46a 100644
--- 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
+++ 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
@@ -104,21 +104,11 @@ public class ActiveMQComponent extends JmsComponent 
implements EndpointCompleter
 }
 
 /**
- * Sets the username to be used to login to ActiveMQ
+ * @deprecated - use JmsComponent#setUsername(String)
+ * @see JmsComponent#setUsername(String)
  */
 public void setUserName(String userName) {
-if (getConfiguration() instanceof ActiveMQConfiguration) {
-((ActiveMQConfiguration)getConfiguration()).setUserName(userName);
-}
-}
-
-/**
- * Sets the password/passcode used to login to ActiveMQ
- */
-public void setPassword(String password) {
-if (getConfiguration() instanceof ActiveMQConfiguration) {
-((ActiveMQConfiguration)getConfiguration()).setPassword(password);
-}
+setUsername(userName);
 }
 
 public void setTrustAllPackages(boolean trustAllPackages) {
@@ -303,6 +293,7 @@ public class ActiveMQComponent extends JmsComponent 
implements EndpointCompleter
  *
  * @return false
  */
+@Override
 public boolean isAllowAutoWiredConnectionFactory() {
 return false;
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/395a48de/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
--
diff --git 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
index 26d31a6..4179b7b 100644
--- 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
+++ 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQConfiguration.java
@@ -35,8 +35,6 @@ public class ActiveMQConfiguration extends JmsConfiguration {
 private String brokerURL = ActiveMQConnectionFactory.DEFAULT_BROKER_URL;
 private boolean useSingleConnection = false;
 private boolean usePooledConnection = true;
-private String userName;
-private String password;
 private boolean trustAllPackages;
 
 public ActiveMQConfiguration() {
@@ -60,26 +58,22 @@ public class ActiveMQConfiguration extends JmsConfiguration 
{
 return useSingleConnection;
 }
 
-public String getUserName() {
-return userName;
-}
-
 /**
- * Sets the username to be used to login to ActiveMQ
+ * @deprecated - use JmsConfiguration#getUsername()
+ * @see JmsConfiguration#getUsername()
  */
-public void setUserName(String userName) {
-this.userName = userName;
-}
-
-public String getPassword() {
-return password;
+@Deprecated
+public String getUserName() {
+return getUsername();
 }
 
 /

activemq git commit: AMQ-6704 - Upgrade Spring to 4.3.9

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master df3bd83c0 -> 25583ad18


AMQ-6704 - Upgrade Spring to 4.3.9


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

Branch: refs/heads/master
Commit: 25583ad184f037b6e2fb35c6a12bc30fe2884a54
Parents: df3bd83
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Jun 15 09:12:45 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Jun 15 09:12:45 2017 -0400

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/25583ad1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 982c411..12fbf86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
 2.1.5
 1.7.13
 1.1.2
-4.1.9.RELEASE
+4.3.9.RELEASE
 1.2.1
 3.0.2
 1.2.5

activemq git commit: AMQ-6704 - Update to latest Jetty 9.2.x release

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 25583ad18 -> bfbdd3c5a


AMQ-6704 - Update to latest Jetty 9.2.x release


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

Branch: refs/heads/master
Commit: bfbdd3c5ad8daab43f9cded2647d1e82a5b0c11d
Parents: 25583ad
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Jun 15 09:18:10 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Jun 15 09:18:10 2017 -0400

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/bfbdd3c5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 12fbf86..c927840 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
 1.9.2
 2.2.11_1
 1.0
-9.2.13.v20150730
+9.2.22.v20170606
 ${jetty9-version}
 3.4.1
 8.0.24

activemq git commit: AMQ-6585 - update to Camel 2.19.1

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master b07821ab6 -> 6b9883f10


AMQ-6585 - update to Camel 2.19.1


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

Branch: refs/heads/master
Commit: 6b9883f10f6c5d1468e67924aeb37ec7d9d48554
Parents: b07821a
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Jun 15 13:44:44 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Jun 15 13:45:20 2017 -0400

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/6b9883f1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c927840..f3218f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 1.1.0
 1.1.1
 1.0-M3-dev
-2.18.4
+2.19.1
 [2.18,3)
 2.2
 1.9.2

activemq git commit: AMQ-6585 - Upgrade to Camel 2.18.4

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 2a0b785a0 -> a6782443c


AMQ-6585 - Upgrade to Camel 2.18.4

Added the camel-blueprint feature to work with Spring 4.x as Spring DM
support for Camel was deprecated


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

Branch: refs/heads/master
Commit: a6782443c1695f54176afecfda6c5c423bc18a84
Parents: 2a0b785
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Fri Jun 9 07:13:11 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Fri Jun 9 07:13:11 2017 -0400

--
 activemq-camel/pom.xml  |  4 ++--
 ...ctiveMQBrokerNdExternalCamelFeatureTest.java |  6 --
 .../src/main/resources/features-core.xml|  2 +-
 activemq-karaf/src/main/resources/features.xml  |  2 ++
 activemq-osgi/pom.xml   | 22 
 .../activemq/osgi/ActiveMQServiceFactory.java   |  2 +-
 pom.xml | 12 +++
 7 files changed, 36 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-camel/pom.xml
--
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 37877e0..05f743c 100644
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -32,7 +32,7 @@
 
   
 
-   org.springframework.jms*;version="[3,5)",
+   org.springframework.jms*;version="[4,5)",
org.apache.activemq.pool,
org.apache.camel*;version="${camel-version-range}",
*
@@ -102,7 +102,7 @@
 
 
   org.apache.camel
-  camel-test-spring3
+  camel-test-spring
   test
 
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
--
diff --git 
a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
 
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
index b948ecc..b25f05e 100644
--- 
a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
+++ 
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
@@ -26,11 +26,12 @@ import java.util.concurrent.Callable;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
 
-//@RunWith(PaxExam.class)
-@Ignore
+@RunWith(PaxExam.class)
 public class ActiveMQBrokerNdExternalCamelFeatureTest extends 
AbstractFeatureTest {
 
 @Configuration
@@ -53,6 +54,7 @@ public class ActiveMQBrokerNdExternalCamelFeatureTest extends 
AbstractFeatureTes
 
 assertBrokerStarted();
 withinReason(new Runnable() {
+@Override
 public void run() {
 getBundle("org.apache.activemq.activemq-camel");
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-karaf/src/main/resources/features-core.xml
--
diff --git a/activemq-karaf/src/main/resources/features-core.xml 
b/activemq-karaf/src/main/resources/features-core.xml
index 0f318c6..0e615ab 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -22,7 +22,7 @@
 
 
 
-spring
+spring
 mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1
 mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1
 mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1

http://git-wip-us.apache.org/repos/asf/activemq/blob/a6782443/activemq-karaf/src/main/resources/features.xml
--
diff --git a/activemq-karaf/src/main/resources/features.xml 
b/activemq-karaf/src/main/resources/features.xml
index 7299ef7..586e324 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -42,6 +42,8 @@
 
mvn:org.apache.activemq/activemq-camel/${project.version}
 camel-jms
 camel
+camel-spring
+camel-blue

activemq-cli-tools git commit: [maven-release-plugin] prepare for next development iteration

[cshannon]

Repository: activemq-cli-tools
Updated Branches:
  refs/heads/master 70c7f8be8 -> bc69ab9e3


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/master
Commit: bc69ab9e3ce73a0d3aa6a0e49055ff0b49a10821
Parents: 70c7f8b
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon May 1 13:18:24 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon May 1 13:18:24 2017 -0400

--
 activemq-kahadb-exporter/pom.xml | 2 +-
 assembly/pom.xml | 2 +-
 pom.xml  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/bc69ab9e/activemq-kahadb-exporter/pom.xml
--
diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml
index 6c1b777..125d5a8 100644
--- a/activemq-kahadb-exporter/pom.xml
+++ b/activemq-kahadb-exporter/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.0
+0.1.1-SNAPSHOT
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/bc69ab9e/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 63bb44a..760a3f8 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -13,7 +13,7 @@
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.0
+0.1.1-SNAPSHOT
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/bc69ab9e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0119af3..80ed8e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.activemq
   activemq-cli-tools-parent
-  0.1.0
+  0.1.1-SNAPSHOT
   pom
 
   ActiveMQ CLI Tools
@@ -56,7 +56,7 @@
 
scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git
 https://git-wip-us.apache.org/repos/asf?p=activemq-cli-tools.git
-0.1.0
+HEAD
   
   
 https://issues.apache.org/jira/browse/AMQCLI

activemq-cli-tools git commit: [maven-release-plugin] prepare release 0.1.0

[cshannon]

Repository: activemq-cli-tools
Updated Branches:
  refs/heads/master b29778c20 -> 70c7f8be8


[maven-release-plugin] prepare release 0.1.0


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

Branch: refs/heads/master
Commit: 70c7f8be826968cfcbd6d3499654f494baae
Parents: b29778c
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon May 1 13:18:02 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon May 1 13:18:02 2017 -0400

--
 activemq-kahadb-exporter/pom.xml | 5 ++---
 assembly/pom.xml | 5 ++---
 pom.xml  | 7 +++
 3 files changed, 7 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/70c7f8be/activemq-kahadb-exporter/pom.xml
--
diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml
index 2b884ee..6c1b777 100644
--- a/activemq-kahadb-exporter/pom.xml
+++ b/activemq-kahadb-exporter/pom.xml
@@ -15,12 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.0-SNAPSHOT
+0.1.0
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/70c7f8be/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6c97782..63bb44a 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -9,12 +9,11 @@
   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. -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.0-SNAPSHOT
+0.1.0
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/70c7f8be/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 94a4ba9..0119af3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
 
   
 org.apache
@@ -27,7 +26,7 @@
 
   org.apache.activemq
   activemq-cli-tools-parent
-  0.1.0-SNAPSHOT
+  0.1.0
   pom
 
   ActiveMQ CLI Tools
@@ -57,7 +56,7 @@
 
scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git
 https://git-wip-us.apache.org/repos/asf?p=activemq-cli-tools.git
-HEAD
+0.1.0
   
   
 https://issues.apache.org/jira/browse/AMQCLI

[activemq-cli-tools] Git Push Summary

[cshannon]

Repository: activemq-cli-tools
Updated Tags:  refs/tags/0.1.0 [created] 684b848ae

activemq-cli-tools git commit: NO-JIRA: Updating version to 0.2.0-SNAPSHOT

[cshannon]

Repository: activemq-cli-tools
Updated Branches:
  refs/heads/master bc69ab9e3 -> 068f87e52


NO-JIRA: Updating version to 0.2.0-SNAPSHOT


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

Branch: refs/heads/master
Commit: 068f87e521c67d38a3ab2cc2122291e56e3c3cbd
Parents: bc69ab9
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon May 1 14:13:48 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon May 1 14:13:48 2017 -0400

--
 activemq-kahadb-exporter/pom.xml | 2 +-
 assembly/pom.xml | 2 +-
 pom.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/068f87e5/activemq-kahadb-exporter/pom.xml
--
diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml
index 125d5a8..acd3dc2 100644
--- a/activemq-kahadb-exporter/pom.xml
+++ b/activemq-kahadb-exporter/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.1-SNAPSHOT
+0.2.0-SNAPSHOT
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/068f87e5/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 760a3f8..1825a90 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -13,7 +13,7 @@
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.1-SNAPSHOT
+0.2.0-SNAPSHOT
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/068f87e5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 80ed8e4..552e758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.activemq
   activemq-cli-tools-parent
-  0.1.1-SNAPSHOT
+  0.2.0-SNAPSHOT
   pom
 
   ActiveMQ CLI Tools

activemq-cli-tools git commit: Update README.md

[cshannon]

Repository: activemq-cli-tools
Updated Branches:
  refs/heads/master 068f87e52 -> 76563e567


Update README.md

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

Branch: refs/heads/master
Commit: 76563e5674114ab144b270429205dc2caa61c109
Parents: 068f87e
Author: Christopher L. Shannon 
Authored: Mon May 1 14:15:36 2017 -0400
Committer: GitHub 
Committed: Mon May 1 14:15:36 2017 -0400

--
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/76563e56/README.md
--
diff --git a/README.md b/README.md
index c7359f5..7792542 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ useful for users of the ActiveMQ and ActiveMQ Artemis messaging 
brokers
 
 This tool can be used to export a KahaDB or MultiKahaDB store to Artemis XML 
format.  The resulting XML document can then be imported into an Artemis broker 
using the Artemis CLI tool.  See [Artemis CLI 
tool](https://activemq.apache.org/artemis/docs/1.5.3/tools.html)
 
-###Usage###
+### Usage
 ```
 $ ./bin/export help
 usage: export  []
@@ -51,7 +51,7 @@ OPTIONS
 Topic Export Pattern
 ```
 
-###Examples:###
+### Examples:
 
 Export entire store:
 

activemq-cli-tools git commit: Update README.md

[cshannon]

Repository: activemq-cli-tools
Updated Branches:
  refs/heads/master 76563e567 -> 1504f9882


Update README.md

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

Branch: refs/heads/master
Commit: 1504f9882858389ee085822b62779585d8feb423
Parents: 76563e5
Author: Christopher L. Shannon 
Authored: Mon May 1 14:16:39 2017 -0400
Committer: GitHub 
Committed: Mon May 1 14:16:39 2017 -0400

--
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/1504f988/README.md
--
diff --git a/README.md b/README.md
index 7792542..5e0419d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Apache ActiveMQ Command Line Tools
 The ActiveMQ Command Line Tools project is home to several CLI based projects
 useful for users of the ActiveMQ and ActiveMQ Artemis messaging brokers
 
-##ActiveMQ KahaDB Export Tool##
+## ActiveMQ KahaDB Export Tool
 
 This tool can be used to export a KahaDB or MultiKahaDB store to Artemis XML 
format.  The resulting XML document can then be imported into an Artemis broker 
using the Artemis CLI tool.  See [Artemis CLI 
tool](https://activemq.apache.org/artemis/docs/1.5.3/tools.html)
 

[activemq-cli-tools] Git Push Summary

[cshannon]

Repository: activemq-cli-tools
Updated Branches:
  refs/heads/0.1.x [created] bc69ab9e3

activemq-cli-tools git commit: Update README.md

[cshannon]

Repository: activemq-cli-tools
Updated Branches:
  refs/heads/master 1504f9882 -> 9c03d340b


Update README.md

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

Branch: refs/heads/master
Commit: 9c03d340b64fc5bf781427f2ce3c953d392f6a92
Parents: 1504f98
Author: Christopher L. Shannon 
Authored: Mon May 1 14:20:04 2017 -0400
Committer: GitHub 
Committed: Mon May 1 14:20:04 2017 -0400

--
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/9c03d340/README.md
--
diff --git a/README.md b/README.md
index 5e0419d..cefaa36 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ useful for users of the ActiveMQ and ActiveMQ Artemis messaging 
brokers
 
 ## ActiveMQ KahaDB Export Tool
 
-This tool can be used to export a KahaDB or MultiKahaDB store to Artemis XML 
format.  The resulting XML document can then be imported into an Artemis broker 
using the Artemis CLI tool.  See [Artemis CLI 
tool](https://activemq.apache.org/artemis/docs/1.5.3/tools.html)
+This tool can be used to export a KahaDB or MultiKahaDB store to Artemis XML 
format.  The resulting XML document can then be imported into an Artemis broker 
(version 2.0.0+) using the Artemis CLI tool.  See [Artemis CLI 
tool](https://activemq.apache.org/artemis/docs/2.0.0/tools.html)
 
 ### Usage
 ```

[1/2] activemq-cli-tools git commit: Revert "[maven-release-plugin] prepare for next development iteration"

[cshannon]

Repository: activemq-cli-tools
Updated Branches:
  refs/heads/master 87576603b -> b29778c20


Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit 87576603b153c0e896f202342f283cf9ba14f830.


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

Branch: refs/heads/master
Commit: eca6a2c71720d18a853becec07e31813b95279b4
Parents: 8757660
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon May 1 12:57:00 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon May 1 12:57:00 2017 -0400

--
 activemq-kahadb-exporter/pom.xml | 2 +-
 assembly/pom.xml | 2 +-
 pom.xml  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/eca6a2c7/activemq-kahadb-exporter/pom.xml
--
diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml
index 125d5a8..6c1b777 100644
--- a/activemq-kahadb-exporter/pom.xml
+++ b/activemq-kahadb-exporter/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.1-SNAPSHOT
+0.1.0
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/eca6a2c7/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 760a3f8..63bb44a 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -13,7 +13,7 @@
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.1-SNAPSHOT
+0.1.0
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/eca6a2c7/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 80ed8e4..0119af3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.activemq
   activemq-cli-tools-parent
-  0.1.1-SNAPSHOT
+  0.1.0
   pom
 
   ActiveMQ CLI Tools
@@ -56,7 +56,7 @@
 
scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git
 https://git-wip-us.apache.org/repos/asf?p=activemq-cli-tools.git
-HEAD
+0.1.0
   
   
 https://issues.apache.org/jira/browse/AMQCLI

[2/2] activemq-cli-tools git commit: Revert "[maven-release-plugin] prepare release 0.1.0"

[cshannon]

Revert "[maven-release-plugin] prepare release 0.1.0"

This reverts commit e57e36854c6d1cd024519b64e982de9fbec5dbb6.


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

Branch: refs/heads/master
Commit: b29778c2094a0124d84a25e36940d44eae5319c6
Parents: eca6a2c
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon May 1 12:57:11 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon May 1 12:57:11 2017 -0400

--
 activemq-kahadb-exporter/pom.xml | 5 +++--
 assembly/pom.xml | 5 +++--
 pom.xml  | 7 ---
 3 files changed, 10 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/b29778c2/activemq-kahadb-exporter/pom.xml
--
diff --git a/activemq-kahadb-exporter/pom.xml b/activemq-kahadb-exporter/pom.xml
index 6c1b777..2b884ee 100644
--- a/activemq-kahadb-exporter/pom.xml
+++ b/activemq-kahadb-exporter/pom.xml
@@ -15,11 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.0
+0.1.0-SNAPSHOT
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/b29778c2/assembly/pom.xml
--
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 63bb44a..6c97782 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -9,11 +9,12 @@
   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. -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
   
 org.apache.activemq
 activemq-cli-tools-parent
-0.1.0
+0.1.0-SNAPSHOT
   
   4.0.0
 

http://git-wip-us.apache.org/repos/asf/activemq-cli-tools/blob/b29778c2/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0119af3..94a4ba9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
 
   
 org.apache
@@ -26,7 +27,7 @@
 
   org.apache.activemq
   activemq-cli-tools-parent
-  0.1.0
+  0.1.0-SNAPSHOT
   pom
 
   ActiveMQ CLI Tools
@@ -56,7 +57,7 @@
 
scm:git:http://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git
 
scm:git:https://git-wip-us.apache.org/repos/asf/activemq-cli-tools.git
 https://git-wip-us.apache.org/repos/asf?p=activemq-cli-tools.git
-0.1.0
+HEAD
   
   
 https://issues.apache.org/jira/browse/AMQCLI

[activemq-cli-tools] Git Push Summary

[cshannon]

Repository: activemq-cli-tools
Updated Tags:  refs/tags/0.1.0 [deleted] 1486749e7

activemq git commit: AMQ-6664 - Adding missing header tag to JSP files

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x bf395fcdb -> 908ef6472


AMQ-6664 - Adding missing header tag to JSP files

Also fixing JSP comments.  This fix is a follow on to
AMQ-6620

(cherry picked from commit 04b60cb188932a91be9f59d6cda09290219d8a45)


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

Branch: refs/heads/activemq-5.14.x
Commit: 908ef647289a80a6fec500a6d37dd59059dccfbd
Parents: bf395fc
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed May 24 16:22:23 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed May 24 16:24:10 2017 -0400

--
 activemq-web-console/src/main/webapp/browse.jsp   | 2 +-
 activemq-web-console/src/main/webapp/connection.jsp   | 2 +-
 activemq-web-console/src/main/webapp/connections.jsp  | 2 +-
 activemq-web-console/src/main/webapp/graph.jsp| 2 +-
 activemq-web-console/src/main/webapp/index.jsp| 2 +-
 activemq-web-console/src/main/webapp/message.jsp  | 2 +-
 activemq-web-console/src/main/webapp/network.jsp  | 2 +-
 activemq-web-console/src/main/webapp/queueConsumers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queueGraph.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queueProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queues.jsp   | 2 +-
 activemq-web-console/src/main/webapp/scheduled.jsp| 2 +-
 activemq-web-console/src/main/webapp/send.jsp | 2 +-
 activemq-web-console/src/main/webapp/slave.jsp| 2 +-
 activemq-web-console/src/main/webapp/subscribers.jsp  | 2 +-
 activemq-web-console/src/main/webapp/topicProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/topicSubscribers.jsp | 2 +-
 activemq-web-console/src/main/webapp/topics.jsp   | 2 +-
 activemq-web-console/src/main/webapp/xml/queues.jsp   | 2 ++
 activemq-web-console/src/main/webapp/xml/subscribers.jsp  | 2 ++
 activemq-web-console/src/main/webapp/xml/topics.jsp   | 2 ++
 21 files changed, 24 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/browse.jsp
--
diff --git a/activemq-web-console/src/main/webapp/browse.jsp 
b/activemq-web-console/src/main/webapp/browse.jsp
index c07e9ae..0e18e15 100644
--- a/activemq-web-console/src/main/webapp/browse.jsp
+++ b/activemq-web-console/src/main/webapp/browse.jsp
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/connection.jsp
--
diff --git a/activemq-web-console/src/main/webapp/connection.jsp 
b/activemq-web-console/src/main/webapp/connection.jsp
index df0e69c..7d218e2 100644
--- a/activemq-web-console/src/main/webapp/connection.jsp
+++ b/activemq-web-console/src/main/webapp/connection.jsp
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/connections.jsp
--
diff --git a/activemq-web-console/src/main/webapp/connections.jsp 
b/activemq-web-console/src/main/webapp/connections.jsp
index d13e0cf..1d6fbab 100644
--- a/activemq-web-console/src/main/webapp/connections.jsp
+++ b/activemq-web-console/src/main/webapp/connections.jsp
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/908ef647/activemq-web-console/src/main/webapp/graph.jsp
--
diff --git a/activemq-web-console/src/main/webapp/graph.jsp 
b/activemq-web-console/src/main/webapp/graph.jsp
index fb4a268..5c0c2fd 

activemq git commit: AMQ-6664 - Adding missing header tag to JSP files

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 7cae60eae -> 04b60cb18


AMQ-6664 - Adding missing header tag to JSP files

Also fixing JSP comments.  This fix is a follow on to
AMQ-6620


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

Branch: refs/heads/master
Commit: 04b60cb188932a91be9f59d6cda09290219d8a45
Parents: 7cae60e
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed May 24 16:22:23 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed May 24 16:22:23 2017 -0400

--
 activemq-web-console/src/main/webapp/browse.jsp   | 2 +-
 activemq-web-console/src/main/webapp/connection.jsp   | 2 +-
 activemq-web-console/src/main/webapp/connections.jsp  | 2 +-
 activemq-web-console/src/main/webapp/graph.jsp| 2 +-
 activemq-web-console/src/main/webapp/index.jsp| 2 +-
 activemq-web-console/src/main/webapp/message.jsp  | 2 +-
 activemq-web-console/src/main/webapp/network.jsp  | 2 +-
 activemq-web-console/src/main/webapp/queueConsumers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queueGraph.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queueProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/queues.jsp   | 2 +-
 activemq-web-console/src/main/webapp/scheduled.jsp| 2 +-
 activemq-web-console/src/main/webapp/send.jsp | 2 +-
 activemq-web-console/src/main/webapp/slave.jsp| 2 +-
 activemq-web-console/src/main/webapp/subscribers.jsp  | 2 +-
 activemq-web-console/src/main/webapp/topicProducers.jsp   | 2 +-
 activemq-web-console/src/main/webapp/topicSubscribers.jsp | 2 +-
 activemq-web-console/src/main/webapp/topics.jsp   | 2 +-
 activemq-web-console/src/main/webapp/xml/queues.jsp   | 2 ++
 activemq-web-console/src/main/webapp/xml/subscribers.jsp  | 2 ++
 activemq-web-console/src/main/webapp/xml/topics.jsp   | 2 ++
 21 files changed, 24 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/04b60cb1/activemq-web-console/src/main/webapp/browse.jsp
--
diff --git a/activemq-web-console/src/main/webapp/browse.jsp 
b/activemq-web-console/src/main/webapp/browse.jsp
index c07e9ae..0e18e15 100644
--- a/activemq-web-console/src/main/webapp/browse.jsp
+++ b/activemq-web-console/src/main/webapp/browse.jsp
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/04b60cb1/activemq-web-console/src/main/webapp/connection.jsp
--
diff --git a/activemq-web-console/src/main/webapp/connection.jsp 
b/activemq-web-console/src/main/webapp/connection.jsp
index df0e69c..7d218e2 100644
--- a/activemq-web-console/src/main/webapp/connection.jsp
+++ b/activemq-web-console/src/main/webapp/connection.jsp
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/04b60cb1/activemq-web-console/src/main/webapp/connections.jsp
--
diff --git a/activemq-web-console/src/main/webapp/connections.jsp 
b/activemq-web-console/src/main/webapp/connections.jsp
index d13e0cf..1d6fbab 100644
--- a/activemq-web-console/src/main/webapp/connections.jsp
+++ b/activemq-web-console/src/main/webapp/connections.jsp
@@ -14,7 +14,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
-
+<%-- Workaround for https://ops4j1.jira.com/browse/PAXWEB-1070 --%>
 <%@include file="WEB-INF/jspf/headertags.jspf" %>
 
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/04b60cb1/activemq-web-console/src/main/webapp/graph.jsp
--
diff --git a/activemq-web-console/src/main/webapp/graph.jsp 
b/activemq-web-console/src/main/webapp/graph.jsp
index fb4a268..5c0c2fd 100644
--- a/activemq-web-console/src/main/webapp/graph.jsp
+++ b/activemq-web-console/

activemq git commit: AMQ-6811 - moving ActiveMQMessageIsMarshalled test to src/test/java

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 01f6aeb01 -> 2015888ad


AMQ-6811 - moving ActiveMQMessageIsMarshalled test to src/test/java

(cherry picked from commit 6b27708ae15818d025e9f65a1bf8d54a31e01045)


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

Branch: refs/heads/activemq-5.15.x
Commit: 2015888ad7eb24a5888e6e55a70de33bbb9854a5
Parents: 01f6aeb
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Fri Sep 15 12:20:44 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Fri Sep 15 12:21:52 2017 -0400

--
 .../ActiveMQMessageIsMarshalledTest.java| 188 ---
 .../ActiveMQMessageIsMarshalledTest.java| 188 +++
 2 files changed, 188 insertions(+), 188 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/2015888a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessageIsMarshalledTest.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessageIsMarshalledTest.java
 
b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessageIsMarshalledTest.java
deleted file mode 100644
index 79a4a2a..000
--- 
a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessageIsMarshalledTest.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  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.command;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.util.ByteSequence;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test to make sure message.isMarshalled() returns the correct value
- */
-@RunWith(Parameterized.class)
-public class ActiveMQMessageIsMarshalledTest {
-
-protected enum MessageType {BYTES, MAP, TEXT, OBJECT, STREAM, MESSAGE}
-
-private final MessageType messageType;
-
-@Parameters(name="messageType={0}")
-public static Collection<Object[]> data() {
-return Arrays.asList(new Object[][] {
-{MessageType.BYTES},
-{MessageType.MAP},
-{MessageType.TEXT},
-{MessageType.OBJECT},
-{MessageType.STREAM},
-{MessageType.MESSAGE}
-});
-}
-
-public ActiveMQMessageIsMarshalledTest(final MessageType messageType) {
-super();
-this.messageType = messageType;
-}
-
-@Test
-public void testIsMarshalledWithBodyAndProperties() throws Exception {
-ActiveMQMessage message = getMessage(true, true);
-assertIsMarshalled(message, true, true);
-}
-
-@Test
-public void testIsMarshalledWithPropertyEmptyBody() throws Exception {
-ActiveMQMessage message = getMessage(false, true);
-assertIsMarshalled(message, false, true);
-}
-
-@Test
-public void testIsMarshalledWithBodyEmptyProperties() throws Exception {
-ActiveMQMessage message = getMessage(true, false);
-assertIsMarshalled(message, true, false);
-}
-
-@Test
-public void testIsMarshalledWithEmptyBodyEmptyProperties() throws 
Exception {
-ActiveMQMessage message = getMessage(false, false);
-
-//No body or properties so the message should be considered marshalled 
already
-assertTrue(message.isMarshalled());
-}
-
-private ActiveMQMessage getMessage(boolean includ

activemq git commit: AMQ-6811 - moving ActiveMQMessageIsMarshalled test to src/test/java

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master f82993d9c -> 6b27708ae


AMQ-6811 - moving ActiveMQMessageIsMarshalled test to src/test/java


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

Branch: refs/heads/master
Commit: 6b27708ae15818d025e9f65a1bf8d54a31e01045
Parents: f82993d
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Fri Sep 15 12:20:44 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Fri Sep 15 12:20:44 2017 -0400

--
 .../ActiveMQMessageIsMarshalledTest.java| 188 ---
 .../ActiveMQMessageIsMarshalledTest.java| 188 +++
 2 files changed, 188 insertions(+), 188 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/6b27708a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessageIsMarshalledTest.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessageIsMarshalledTest.java
 
b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessageIsMarshalledTest.java
deleted file mode 100644
index 79a4a2a..000
--- 
a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessageIsMarshalledTest.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  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.command;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.util.ByteSequence;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- * Test to make sure message.isMarshalled() returns the correct value
- */
-@RunWith(Parameterized.class)
-public class ActiveMQMessageIsMarshalledTest {
-
-protected enum MessageType {BYTES, MAP, TEXT, OBJECT, STREAM, MESSAGE}
-
-private final MessageType messageType;
-
-@Parameters(name="messageType={0}")
-public static Collection<Object[]> data() {
-return Arrays.asList(new Object[][] {
-{MessageType.BYTES},
-{MessageType.MAP},
-{MessageType.TEXT},
-{MessageType.OBJECT},
-{MessageType.STREAM},
-{MessageType.MESSAGE}
-});
-}
-
-public ActiveMQMessageIsMarshalledTest(final MessageType messageType) {
-super();
-this.messageType = messageType;
-}
-
-@Test
-public void testIsMarshalledWithBodyAndProperties() throws Exception {
-ActiveMQMessage message = getMessage(true, true);
-assertIsMarshalled(message, true, true);
-}
-
-@Test
-public void testIsMarshalledWithPropertyEmptyBody() throws Exception {
-ActiveMQMessage message = getMessage(false, true);
-assertIsMarshalled(message, false, true);
-}
-
-@Test
-public void testIsMarshalledWithBodyEmptyProperties() throws Exception {
-ActiveMQMessage message = getMessage(true, false);
-assertIsMarshalled(message, true, false);
-}
-
-@Test
-public void testIsMarshalledWithEmptyBodyEmptyProperties() throws 
Exception {
-ActiveMQMessage message = getMessage(false, false);
-
-//No body or properties so the message should be considered marshalled 
already
-assertTrue(message.isMarshalled());
-}
-
-private ActiveMQMessage getMessage(boolean includeBody, boolean 
includeProperties) throws Exception {
-if (MessageType.BYTES == messageType

activemq git commit: AMQ-6820 - Properly handle ClosedChannelException

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 592b31343 -> 3ef457125


AMQ-6820 - Properly handle ClosedChannelException

When a ClosedChannelException occurs inside SelectorSelection properly
call the transport listener onError() method to handle cleanup and
logging.

(cherry picked from commit 6e33507bf2fc2acea9f61e230cf8e2a9cbccc3ce)


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

Branch: refs/heads/activemq-5.15.x
Commit: 3ef457125b11decc4e9b03dfbbc3e926725ff91c
Parents: 592b313
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Sep 21 08:13:42 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Sep 21 08:15:02 2017 -0400

--
 .../java/org/apache/activemq/transport/nio/SelectorSelection.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/3ef45712/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
 
b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
index a0dd210..b0aafd2 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
@@ -44,7 +44,7 @@ public final class SelectorSelection {
 try {
 SelectorSelection.this.key = 
selectable.register(worker.selector, 0, SelectorSelection.this);
 } catch (Exception e) {
-e.printStackTrace();
+onError(e);
 }
 }
 });

activemq git commit: AMQ-6820 - Properly handle ClosedChannelException

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 61d3231d3 -> 6e33507bf


AMQ-6820 - Properly handle ClosedChannelException

When a ClosedChannelException occurs inside SelectorSelection properly
call the transport listener onError() method to handle cleanup and
logging.


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

Branch: refs/heads/master
Commit: 6e33507bf2fc2acea9f61e230cf8e2a9cbccc3ce
Parents: 61d3231
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Sep 21 08:13:42 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Sep 21 08:14:19 2017 -0400

--
 .../java/org/apache/activemq/transport/nio/SelectorSelection.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/6e33507b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
 
b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
index a0dd210..b0aafd2 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/transport/nio/SelectorSelection.java
@@ -44,7 +44,7 @@ public final class SelectorSelection {
 try {
 SelectorSelection.this.key = 
selectable.register(worker.selector, 0, SelectorSelection.this);
 } catch (Exception e) {
-e.printStackTrace();
+onError(e);
 }
 }
 });

activemq git commit: AMQ-6834 - Adding back in spring schemas for camel

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 98a5e55a9 -> 0c396a23e


AMQ-6834 - Adding back in spring schemas for camel


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

Branch: refs/heads/master
Commit: 0c396a23e761c9371edacbdbddff891fcc0e3a04
Parents: 98a5e55
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon Oct 16 09:20:36 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon Oct 16 09:21:59 2017 -0400

--
 activemq-osgi/pom.xml   | 16 +++-
 .../src/main/resources/META-INF/spring.handlers |  2 ++
 .../src/main/resources/META-INF/spring.schemas  |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/0c396a23/activemq-osgi/pom.xml
--
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 464994c..9a406f0 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -162,10 +162,8 @@
 
   ${project.groupId}
   activemq-web
-  ${project.version}
   
-
-  org.apache.activemq
+  
   activemq-all
 
   
@@ -211,7 +209,7 @@
   
 
 
-  
+  
   
 org.apache.maven.plugins
 maven-dependency-plugin
@@ -223,7 +221,15 @@
 
 
   
-
+
+  org.apache.camel
+  camel-spring
+  ${camel-version}
+  jar
+  false
+  
${basedir}/target/extra-resources/
+  camel-spring.xsd
+
 
   org.apache.camel
   camel-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/0c396a23/activemq-osgi/src/main/resources/META-INF/spring.handlers
--
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.handlers 
b/activemq-osgi/src/main/resources/META-INF/spring.handlers
index 296c9e2..900c754 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.handlers
+++ b/activemq-osgi/src/main/resources/META-INF/spring.handlers
@@ -18,3 +18,5 @@
 # manual creation to include camel handler so we can embed camel context in 
xbean xml config
 #
 
http\://activemq.apache.org/schema/core=org.apache.xbean.spring.context.v2.XBeanNamespaceHandler
+http\://camel.apache.org/schema/spring=org.apache.camel.spring.handler.CamelNamespaceHandler
+http\://camel.apache.org/schema/spring/v2.10=org.apache.camel.spring.handler.CamelNamespaceHandler

http://git-wip-us.apache.org/repos/asf/activemq/blob/0c396a23/activemq-osgi/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas 
b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index e36184d..dd1b16d 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -57,6 +57,8 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
 
+http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
+
 
http\://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd
 
http\://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd
 
http\://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd

activemq git commit: AMQ-6834 - Adding back in spring schemas for camel

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x b27b4d9a3 -> bc4da284f


AMQ-6834 - Adding back in spring schemas for camel

(cherry picked from commit 0c396a23e761c9371edacbdbddff891fcc0e3a04)


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

Branch: refs/heads/activemq-5.15.x
Commit: bc4da284f58230b6d900975aaf628627d6dea227
Parents: b27b4d9
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon Oct 16 09:20:36 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon Oct 16 09:25:24 2017 -0400

--
 activemq-osgi/pom.xml   | 16 +++-
 .../src/main/resources/META-INF/spring.handlers |  2 ++
 .../src/main/resources/META-INF/spring.schemas  |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/bc4da284/activemq-osgi/pom.xml
--
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index a9e9124..48b82a8 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -162,10 +162,8 @@
 
   ${project.groupId}
   activemq-web
-  ${project.version}
   
-
-  org.apache.activemq
+  
   activemq-all
 
   
@@ -211,7 +209,7 @@
   
 
 
-  
+  
   
 org.apache.maven.plugins
 maven-dependency-plugin
@@ -223,7 +221,15 @@
 
 
   
-
+
+  org.apache.camel
+  camel-spring
+  ${camel-version}
+  jar
+  false
+  
${basedir}/target/extra-resources/
+  camel-spring.xsd
+
 
   org.apache.camel
   camel-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/bc4da284/activemq-osgi/src/main/resources/META-INF/spring.handlers
--
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.handlers 
b/activemq-osgi/src/main/resources/META-INF/spring.handlers
index 296c9e2..900c754 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.handlers
+++ b/activemq-osgi/src/main/resources/META-INF/spring.handlers
@@ -18,3 +18,5 @@
 # manual creation to include camel handler so we can embed camel context in 
xbean xml config
 #
 
http\://activemq.apache.org/schema/core=org.apache.xbean.spring.context.v2.XBeanNamespaceHandler
+http\://camel.apache.org/schema/spring=org.apache.camel.spring.handler.CamelNamespaceHandler
+http\://camel.apache.org/schema/spring/v2.10=org.apache.camel.spring.handler.CamelNamespaceHandler

http://git-wip-us.apache.org/repos/asf/activemq/blob/bc4da284/activemq-osgi/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas 
b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index e36184d..dd1b16d 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -57,6 +57,8 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
 
+http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
+
 
http\://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd
 
http\://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd
 
http\://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd

[activemq] Git Push Summary

[cshannon]

Repository: activemq
Updated Tags:  refs/tags/activemq-5.15.2 [created] dd4e60f5f

activemq git commit: [maven-release-plugin] prepare for next development iteration

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 9e595d867 -> c4d460bf6


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/activemq-5.15.x
Commit: c4d460bf601520408a71d2dc8d9a9cce3882482e
Parents: 9e595d8
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Oct 17 10:16:08 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Oct 17 10:16:08 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/c4d460bf/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 55b99d7..e2dabbb 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.2
+5.15.3-SNAPSHOT
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/c4d460bf/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index f272f8f..b14e0de 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.2
+5.15.3-SNAPSHOT
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/c4d460bf/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index fc8d45e..fb0108b 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.2
+5.15.3-SNAPSHOT
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/c4d460bf/activemq

svn commit: r22509 - /dev/activemq/activemq/5.15.2/

[cshannon]

Author: cshannon
Date: Tue Oct 17 14:34:22 2017
New Revision: 22509

Log:
5.15.2 artifacts

Added:
dev/activemq/activemq/5.15.2/
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip   
(with props)
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.asc  
 (with props)
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.md5

dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.sha512
dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz   (with 
props)
dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.asc   (with 
props)
dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.md5
dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.sha512
dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.zip   (with props)
dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.asc   (with 
props)
dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.md5
dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.zip.sha512

Added: dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip
==
Binary file - no diff available.

Propchange: 
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip
--
svn:mime-type = application/zip

Added: 
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.asc
==
Binary file - no diff available.

Propchange: 
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.md5
==
--- dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.md5 
(added)
+++ dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.md5 
Tue Oct 17 14:34:22 2017
@@ -0,0 +1 @@
+5b8f285908f9701f8fe70abfd132e854  activemq-parent-5.15.2-source-release.zip

Added: 
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.sha512
==
--- 
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.sha512 
(added)
+++ 
dev/activemq/activemq/5.15.2/activemq-parent-5.15.2-source-release.zip.sha512 
Tue Oct 17 14:34:22 2017
@@ -0,0 +1 @@
+57a2c2b15b8764251de2ccb62ead1bad6bd89696f70bf35f6bec0d20262b20cbb803eaf94c458b07bfb7b162c0851a6a5ccb1bc93115d3bc76693ef868947fdc
  activemq-parent-5.15.2-source-release.zip

Added: dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz
==
Binary file - no diff available.

Propchange: dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz
--
svn:mime-type = application/x-gzip

Added: dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.asc
==
Binary file - no diff available.

Propchange: dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.md5
==
--- dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.md5 (added)
+++ dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.md5 Tue Oct 
17 14:34:22 2017
@@ -0,0 +1 @@
+ed2da381eeea5d0d43601f4e97d91bb8  apache-activemq-5.15.2-bin.tar.gz

Added: dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.sha512
==
--- dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.sha512 
(added)
+++ dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.tar.gz.sha512 Tue 
Oct 17 14:34:22 2017
@@ -0,0 +1 @@
+351e16319552b944b5a9931f990c9f0a896514a0aab4047e6e765deff889a80e418d8bc3be58b1fa53f176f6d9e9f98bb36b96bdf1b9732692293e5ad575
  apache-activemq-5.15.2-bin.tar.gz

Added: dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.zip
==
Binary file - no diff available.

Propchange: dev/activemq/activemq/5.15.2/apache-activemq-5.15.2-bin.zip
--
svn:mime-type = application/zip

Added: dev/activemq

activemq git commit: NO-JIRA: Adding 5.15.2 schema mapping

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 0c396a23e -> b3f41cb44


NO-JIRA: Adding 5.15.2 schema mapping


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

Branch: refs/heads/master
Commit: b3f41cb44bdc5fe11b20f5f1a9fb07fb03b63239
Parents: 0c396a2
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Oct 17 09:59:54 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Oct 17 09:59:54 2017 -0400

--
 activemq-osgi/src/main/resources/META-INF/spring.schemas   | 1 +
 activemq-spring/src/main/resources/META-INF/spring.schemas | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/b3f41cb4/activemq-osgi/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas 
b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index dd1b16d..35b0628 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -56,6 +56,7 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.4.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.2.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/b3f41cb4/activemq-spring/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-spring/src/main/resources/META-INF/spring.schemas 
b/activemq-spring/src/main/resources/META-INF/spring.schemas
index da9c7c8..790b575 100644
--- a/activemq-spring/src/main/resources/META-INF/spring.schemas
+++ b/activemq-spring/src/main/resources/META-INF/spring.schemas
@@ -56,6 +56,7 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.4.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.2.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd

activemq git commit: NO-JIRA: Adding 5.15.2 schema mapping

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x bc4da284f -> 5886114ae


NO-JIRA: Adding 5.15.2 schema mapping

(cherry picked from commit b3f41cb44bdc5fe11b20f5f1a9fb07fb03b63239)


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

Branch: refs/heads/activemq-5.15.x
Commit: 5886114aecdca2c0ede7a63762faf96fb5934b2e
Parents: bc4da28
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Oct 17 09:59:54 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Oct 17 10:00:38 2017 -0400

--
 activemq-osgi/src/main/resources/META-INF/spring.schemas   | 1 +
 activemq-spring/src/main/resources/META-INF/spring.schemas | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/5886114a/activemq-osgi/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas 
b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index dd1b16d..35b0628 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -56,6 +56,7 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.4.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.2.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/5886114a/activemq-spring/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-spring/src/main/resources/META-INF/spring.schemas 
b/activemq-spring/src/main/resources/META-INF/spring.schemas
index da9c7c8..790b575 100644
--- a/activemq-spring/src/main/resources/META-INF/spring.schemas
+++ b/activemq-spring/src/main/resources/META-INF/spring.schemas
@@ -56,6 +56,7 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.4.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.2.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd

activemq git commit: [maven-release-plugin] prepare release activemq-5.15.2

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 5886114ae -> 9e595d867


[maven-release-plugin] prepare release activemq-5.15.2


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

Branch: refs/heads/activemq-5.15.x
Commit: 9e595d8674456810ee3bd2d4a9920ed8b680937b
Parents: 5886114
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Oct 17 10:09:04 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Oct 17 10:09:04 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/9e595d86/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index f291126..55b99d7 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.2-SNAPSHOT
+5.15.2
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/9e595d86/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 165ed80..f272f8f 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.2-SNAPSHOT
+5.15.2
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/9e595d86/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 32fd1b5..fc8d45e 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.2-SNAPSHOT
+5.15.2
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/9e595d86/activemq

activemq git commit: [AMQ-6831, AMQ-6771] trigger eofexception on read -1 - AMQ6522Test

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x b19ed4815 -> d66e96e8b


[AMQ-6831, AMQ-6771] trigger eofexception on read -1 - AMQ6522Test

(cherry picked from commit e793260573f30365572a1e7507cd98e9ed17b1b5)


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

Branch: refs/heads/activemq-5.15.x
Commit: d66e96e8bc7be51a93835149e132204407d79b5f
Parents: b19ed48
Author: gtully <gary.tu...@gmail.com>
Authored: Wed Oct 11 00:20:26 2017 +0100
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed Oct 11 07:49:16 2017 -0400

--
 .../src/main/java/org/apache/activemq/util/ByteSequence.java | 6 +-
 .../apache/activemq/store/kahadb/disk/journal/Journal.java   | 8 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/d66e96e8/activemq-client/src/main/java/org/apache/activemq/util/ByteSequence.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/util/ByteSequence.java 
b/activemq-client/src/main/java/org/apache/activemq/util/ByteSequence.java
index ac1e01a..5a19f43 100644
--- a/activemq-client/src/main/java/org/apache/activemq/util/ByteSequence.java
+++ b/activemq-client/src/main/java/org/apache/activemq/util/ByteSequence.java
@@ -75,7 +75,11 @@ public class ByteSequence {
 
 public void reset() {
 length = remaining();
-System.arraycopy(data, offset, data, 0, length);
+if (length > 0) {
+System.arraycopy(data, offset, data, 0, length);
+} else {
+length = 0;
+}
 offset = 0;
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/d66e96e8/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
index 8e04414..67d4c86 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
@@ -627,7 +627,13 @@ public class Journal {
 private void ensureAvailable(ByteSequence bs, RandomAccessFile reader, int 
required) throws IOException {
 if (bs.remaining() < required) {
 bs.reset();
-bs.setLength(bs.length + reader.read(bs.data, bs.length, 
bs.data.length - bs.length));
+int read = reader.read(bs.data, bs.length, bs.data.length - 
bs.length);
+if (read < 0) {
+if (bs.remaining() == 0) {
+throw new EOFException("request for " + required + " bytes 
reached EOF");
+}
+}
+bs.setLength(bs.length + read);
 }
 }
 

activemq git commit: [maven-release-plugin] prepare release activemq-5.15.1

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x ded391161 -> 37227fbf8


[maven-release-plugin] prepare release activemq-5.15.1


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

Branch: refs/heads/activemq-5.15.x
Commit: 37227fbf8bf2308d45dddb169483864007ef5560
Parents: ded3911
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon Sep 25 09:17:38 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon Sep 25 09:17:38 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/37227fbf/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 92c58a5..e00f51d 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1-SNAPSHOT
+5.15.1
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/37227fbf/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 8b22854..cbee7ab 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1-SNAPSHOT
+5.15.1
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/37227fbf/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 4787f98..6f22573 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1-SNAPSHOT
+5.15.1
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/37227fbf/activemq

svn commit: r21980 - /dev/activemq/activemq/5.15.1/

[cshannon]

Author: cshannon
Date: Mon Sep 25 13:53:58 2017
New Revision: 21980

Log:
Adding release artifacts for 5.15.1

Added:
dev/activemq/activemq/5.15.1/
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip   
(with props)
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.asc  
 (with props)
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5

dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz   (with 
props)
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.asc   (with 
props)
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.md5
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip   (with props)
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.asc   (with 
props)
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.md5
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.sha512

Added: dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip
==
Binary file - no diff available.

Propchange: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip
--
svn:mime-type = application/zip

Added: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.asc
==
Binary file - no diff available.

Propchange: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5
==
--- dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5 
(added)
+++ dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5 
Mon Sep 25 13:53:58 2017
@@ -0,0 +1 @@
+35c13f2d385bc85567f1b6859bbd4ad2  activemq-parent-5.15.1-source-release.zip

Added: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512
==
--- 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512 
(added)
+++ 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512 
Mon Sep 25 13:53:58 2017
@@ -0,0 +1 @@
+38bc9fb33a8523db3f58d7017bf343f5195139838441fd167088c101b253d3e179593c95563f8b58d875d9372ce957de6cfaf9557a97f42eb601c94567d49db2
  activemq-parent-5.15.1-source-release.zip

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz
==
Binary file - no diff available.

Propchange: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz
--
svn:mime-type = application/x-gzip

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.asc
==
Binary file - no diff available.

Propchange: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.md5
==
--- dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.md5 (added)
+++ dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.md5 Mon Sep 
25 13:53:58 2017
@@ -0,0 +1 @@
+aee9ed744d53c41cd51ab2f93296ed19  apache-activemq-5.15.1-bin.tar.gz

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512
==
--- dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512 
(added)
+++ dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512 Mon 
Sep 25 13:53:58 2017
@@ -0,0 +1 @@
+3581870aab2829646207312c99266b460876e1a465061836f5e81187224c022cca550d64e270d29ce171857abdaa1f9b15c19abdeb1639cacdf0108142eac967
  apache-activemq-5.15.1-bin.tar.gz

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip
==
Binary file - no diff available.

Propchange: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip
--
svn:mime-type = application/zip

Added

activemq git commit: [maven-release-plugin] prepare for next development iteration

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 37227fbf8 -> e2eabeb1c


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/activemq-5.15.x
Commit: e2eabeb1c2a8234d2763238eae8a2a143e1860a6
Parents: 37227fb
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon Sep 25 09:23:32 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon Sep 25 09:23:32 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/e2eabeb1/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index e00f51d..f291126 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.2-SNAPSHOT
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/e2eabeb1/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index cbee7ab..165ed80 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.2-SNAPSHOT
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/e2eabeb1/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 6f22573..32fd1b5 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.2-SNAPSHOT
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/e2eabeb1/activemq

[activemq] Git Push Summary

[cshannon]

Repository: activemq
Updated Tags:  refs/tags/activemq-5.15.1 [created] bf86cae37

svn commit: r22027 - /dev/activemq/activemq/5.15.1/

[cshannon]

Author: cshannon
Date: Thu Sep 28 15:04:28 2017
New Revision: 22027

Log:
Adding 5.15.1 release artifacts

Added:
dev/activemq/activemq/5.15.1/
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip   
(with props)
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.asc  
 (with props)
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5

dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz   (with 
props)
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.asc   (with 
props)
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.md5
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip   (with props)
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.asc   (with 
props)
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.md5
dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip.sha512

Added: dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip
==
Binary file - no diff available.

Propchange: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip
--
svn:mime-type = application/zip

Added: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.asc
==
Binary file - no diff available.

Propchange: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.asc
--
svn:mime-type = application/pgp-signature

Added: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5
==
--- dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5 
(added)
+++ dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.md5 
Thu Sep 28 15:04:28 2017
@@ -0,0 +1 @@
+2ef600e4b14910b334823d013ad4cf39  activemq-parent-5.15.1-source-release.zip

Added: 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512
==
--- 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512 
(added)
+++ 
dev/activemq/activemq/5.15.1/activemq-parent-5.15.1-source-release.zip.sha512 
Thu Sep 28 15:04:28 2017
@@ -0,0 +1 @@
+d65c277df01376fd41404a2469fcbd65addedd9f67a5b4bfa4032d50f46d62c12f4e57e627185ec7fcd778d6eaf32e5c9985ce74130d37e166f2ca30d1f15286
  activemq-parent-5.15.1-source-release.zip

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz
==
Binary file - no diff available.

Propchange: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz
--
svn:mime-type = application/x-gzip

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.asc
==
Binary file - no diff available.

Propchange: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.md5
==
--- dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.md5 (added)
+++ dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.md5 Thu Sep 
28 15:04:28 2017
@@ -0,0 +1 @@
+f0dbdd5c9f927d4965664e6860d9dbfb  apache-activemq-5.15.1-bin.tar.gz

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512
==
--- dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512 
(added)
+++ dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.tar.gz.sha512 Thu 
Sep 28 15:04:28 2017
@@ -0,0 +1 @@
+6bb30e5a836a2496d207fbb234a47ed6bea3830020ef894bda636a1e515e193dbd33150b9f49ea4a2d910110b680f6d392cbce30806378ba950e8ebf2c8f1d08
  apache-activemq-5.15.1-bin.tar.gz

Added: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip
==
Binary file - no diff available.

Propchange: dev/activemq/activemq/5.15.1/apache-activemq-5.15.1-bin.zip
--
svn:mime-type = application/zip

Added: dev

activemq git commit: [maven-release-plugin] prepare release activemq-5.15.1

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 1d0121ccd -> d17a8740f


[maven-release-plugin] prepare release activemq-5.15.1


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

Branch: refs/heads/activemq-5.15.x
Commit: d17a8740fcb3f344b05474dbdb48248d0e0a31fb
Parents: 1d0121c
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Sep 28 10:28:20 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Sep 28 10:28:20 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/d17a8740/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 92c58a5..e00f51d 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1-SNAPSHOT
+5.15.1
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/d17a8740/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 8b22854..cbee7ab 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1-SNAPSHOT
+5.15.1
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/d17a8740/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 4787f98..6f22573 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1-SNAPSHOT
+5.15.1
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/d17a8740/activemq

[activemq] Git Push Summary

[cshannon]

Repository: activemq
Updated Tags:  refs/tags/activemq-5.15.1 [created] 952894287

activemq git commit: [maven-release-plugin] prepare for next development iteration

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x d17a8740f -> a218119e6


[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/activemq-5.15.x
Commit: a218119e6b840d8304a59d560b702c23877569e8
Parents: d17a874
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Sep 28 10:45:21 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Sep 28 10:45:21 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/a218119e/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index e00f51d..f291126 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.2-SNAPSHOT
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/a218119e/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index cbee7ab..165ed80 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.2-SNAPSHOT
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/a218119e/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 6f22573..32fd1b5 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.2-SNAPSHOT
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/a218119e/activemq

svn commit: r1019016 [2/5] - /websites/production/activemq/content/schema/core/

[cshannon]

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html
 Mon Oct  2 15:14:08 2017
@@ -0,0 +1,3162 @@
+
+
+
+Schema for namespace: http://activemq.apache.org/schema/core
+
+
+
+
+
+
+
+Root Element
+
+  ElementDescriptionClass
+  brokerAn ActiveMQ Message Broker. It 
consists of a number of transport
+connectors, network connectors and a bunch of properties which can be used to
+configure the broker as its lazily 
created.org.apache.activemq.xbean.XBeanBrokerService
+
+
+Element Summary
+
+  ElementDescriptionClass
+  abortSlowAckConsumerStrategyAbort
 slow consumers when they reach the configured threshold of slowness,
+
+default is that a consumer that has not Ack'd a message for 30 seconds is 
slow.org.apache.activemq.broker.region.policy.AbortSlowAckConsumerStrategy
+  abortSlowConsumerStrategyAbort 
slow consumers when they reach the configured threshold of slowness, default is 
slow for 30 
secondsorg.apache.activemq.broker.region.policy.AbortSlowConsumerStrategy
+  authenticationUserA 
helper object used to configure simple authentication 
pluginorg.apache.activemq.security.AuthenticationUser
+  authorizationEntryRepresents an entry 
in a {@link DefaultAuthorizationMap} for assigning
+different operations (read, write, admin) of user roles to a specific
+destination or a hierarchical wildcard area of 
destinations.org.apache.activemq.security.XBeanAuthorizationEntry
+  authorizationMaporg.apache.activemq.security.XBeanAuthorizationMap
+  authorizationPluginAn 
authorization plugin where each operation on a destination is checked
+against an 
authorizationMaporg.apache.activemq.security.AuthorizationPlugin
+  axionJDBCAdapterAxion 
specific Adapter.
+
+Axion does not seem to support ALTER statements or sub-selects.  This means:
+- We cannot auto upgrade the schema was we roll out new versions of ActiveMQ
+- We cannot delete durable sub messages that have be acknowledged by all 
consumers.org.apache.activemq.store.jdbc.adapter.AxionJDBCAdapter
+  blobJDBCAdapterThis 
JDBCAdapter inserts and extracts BLOB data using the getBlob()/setBlob()
+operations. This is a little more involved since to insert a blob you have
+to:
+
+1: insert empty blob. 2: select the blob 3: finally update the blob with data
+value.
+
+The databases/JDBC drivers that use this adapter are:
+
+
+org.apache.activemq.store.jdbc.adapter.BlobJDBCAdapter
+  brokerAn ActiveMQ Message Broker. It 
consists of a number of transport
+connectors, network connectors and a bunch of properties which can be used to
+configure the broker as its lazily 
created.org.apache.activemq.xbean.XBeanBrokerService
+  brokerServiceManages the 
life-cycle of an ActiveMQ Broker. A BrokerService consists of a
+number of transport connectors, network connectors and a bunch of properties
+which can be used to configure the broker as its lazily 
created.org.apache.activemq.broker.BrokerService
+  bytesJDBCAdapterThis 
JDBCAdapter inserts and extracts BLOB data using the
+setBytes()/getBytes() operations. The databases/JDBC drivers that use this
+adapter 
are:org.apache.activemq.store.jdbc.adapter.BytesJDBCAdapter
+  cachedLDAPAuthorizationMapA 
{@link DefaultAuthorizationMap} implementation which uses LDAP to initialize 
and update authorization
+policy.org.apache.activemq.security.CachedLDAPAuthorizationMap
+  cachedMessageGroupMapFactoryA 
factory to create instances of {@link 
org.apache.activemq.broker.region.group.CachedMessageGroupMap} when 
implementing the
+http://activemq.apache.org/message-groups.html;>Message Groups 
functionality.org.apache.activemq.broker.region.group.CachedMessageGroupMapFactory
+  camelEndpointLoaderA 
helper bean which populates a {@link CamelContext} with ActiveMQ Queue 
endpointsorg.apache.activemq.camel.component.CamelEndpointLoader
+  camelRoutesBrokerPluginA 
CamelRoutesBrokerPlugin
+
+load camel routes dynamically from a routes.xml file located in same directory 
as 
ActiveMQ.xmlorg.apache.activemq.camel.camelplugin.CamelRoutesBrokerPlugin
+  compositeDemandForwardingBridgeA
 demand forwarding bridge which works with multicast style transports where
+a single Transport could be communicating with multiple remote 
brokersorg.apache.activemq.network.CompositeDemandForwardingBridge
+  compositeQueueRepresents a 
virtual queue which forwards to a number of other 
destinations.org.apache.activemq.broker.region.virtual.CompositeQueue
+  compositeTopicRepresents a 
virtual topic which forwards to a number of other 
destinations.org.apache.activemq.broker.region.virtual.CompositeTopic
+  conditionalNetworkBridgeFilterFactoryimplement
 conditional behavior for queue consumers, allows replaying back to
+origin if no consumers are present on 

svn commit: r1019016 [4/5] - /websites/production/activemq/content/schema/core/

[cshannon]

Added: websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd
==
--- websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd 
(added)
+++ websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd 
Mon Oct  2 15:14:08 2017
@@ -0,0 +1,10458 @@
+
+
+
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+
+
+  
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+ 

svn commit: r22075 - /dev/activemq/activemq/5.15.1/

[cshannon]

Author: cshannon
Date: Mon Oct  2 15:15:19 2017
New Revision: 22075

Log:
removing 5.15.1 after release

Removed:
dev/activemq/activemq/5.15.1/

svn commit: r22074 - /release/activemq/5.15.1/

[cshannon]

Author: cshannon
Date: Mon Oct  2 15:06:45 2017
New Revision: 22074

Log:
add files for activemq-5.15.1

Added:
release/activemq/5.15.1/
  - copied from r22073, dev/activemq/activemq/5.15.1/

svn commit: r1019016 [1/5] - /websites/production/activemq/content/schema/core/

[cshannon]

Author: cshannon
Date: Mon Oct  2 15:14:08 2017
New Revision: 1019016

Log:
Adding 5.15.1 schemas

Added:

websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html

websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc
   (with props)

websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc.md5

websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc.sha1

websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.md5

websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.sha1
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd

websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc   
(with props)

websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc.md5

websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc.sha1

websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.md5

websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.sha1

svn commit: r1019016 [5/5] - /websites/production/activemq/content/schema/core/

[cshannon]

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc
==
Binary file - no diff available.

Propchange: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc
--
svn:mime-type = application/pgp-signature

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc.md5
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc.md5
 Mon Oct  2 15:14:08 2017
@@ -0,0 +1,17 @@
+
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1.xsd.asc.md5 
not found in local storage of repository Releases 
[id=releases]
+
+
+https://repository.apache.org/favicon.png;>
+
+
+https://repository.apache.org/static/css/Sonatype-content.css?2.13.0-01; 
type="text/css" media="screen" title="no title" charset="utf-8">
+  
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1.xsd.asc.md5 
not found in local storage of repository Releases [id=releases]
+Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1.xsd.asc.md5 
not found in local storage of repository Releases [id=releases]
+  
+

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc.sha1
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.asc.sha1
 Mon Oct  2 15:14:08 2017
@@ -0,0 +1,17 @@
+
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1.xsd.asc.sha1 
not found in local storage of repository Releases 
[id=releases]
+
+
+https://repository.apache.org/favicon.png;>
+
+
+https://repository.apache.org/static/css/Sonatype-content.css?2.13.0-01; 
type="text/css" media="screen" title="no title" charset="utf-8">
+  
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1.xsd.asc.sha1 
not found in local storage of repository Releases [id=releases]
+Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1.xsd.asc.sha1 
not found in local storage of repository Releases [id=releases]
+  
+

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.md5 
(added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.md5 
Mon Oct  2 15:14:08 2017
@@ -0,0 +1 @@
+bbf6e2c4de0eb5194d10a672758b5597
\ No newline at end of file

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.sha1 
(added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.1.xsd.sha1 
Mon Oct  2 15:14:08 2017
@@ -0,0 +1 @@
+9a13f4ba8bcbcd56bfb98b6d4dc995d680aa19e7
\ No newline at end of file

svn commit: r1019016 [3/5] - /websites/production/activemq/content/schema/core/

[cshannon]

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc
==
Binary file - no diff available.

Propchange: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc
--
svn:mime-type = application/pgp-signature

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc.md5
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc.md5
 Mon Oct  2 15:14:08 2017
@@ -0,0 +1,17 @@
+
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1-schema.html.asc.md5
 not found in local storage of repository Releases 
[id=releases]
+
+
+https://repository.apache.org/favicon.png;>
+
+
+https://repository.apache.org/static/css/Sonatype-content.css?2.13.0-01; 
type="text/css" media="screen" title="no title" charset="utf-8">
+  
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1-schema.html.asc.md5
 not found in local storage of repository Releases 
[id=releases]
+Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1-schema.html.asc.md5
 not found in local storage of repository Releases [id=releases]
+  
+

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc.sha1
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.asc.sha1
 Mon Oct  2 15:14:08 2017
@@ -0,0 +1,17 @@
+
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1-schema.html.asc.sha1
 not found in local storage of repository Releases 
[id=releases]
+
+
+https://repository.apache.org/favicon.png;>
+
+
+https://repository.apache.org/static/css/Sonatype-content.css?2.13.0-01; 
type="text/css" media="screen" title="no title" charset="utf-8">
+  
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1-schema.html.asc.sha1
 not found in local storage of repository Releases 
[id=releases]
+Path 
/org/apache/activemq/activemq-spring/5.15.1/activemq-spring-5.15.1-schema.html.asc.sha1
 not found in local storage of repository Releases [id=releases]
+  
+

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.md5
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.md5
 Mon Oct  2 15:14:08 2017
@@ -0,0 +1 @@
+759fd80bdd02d9d7c5cd99c010ab3930
\ No newline at end of file

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.sha1
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.1-schema.html.sha1
 Mon Oct  2 15:14:08 2017
@@ -0,0 +1 @@
+99bd0b382706cbea405a552718642f94c8b7f502
\ No newline at end of file

svn commit: r1019015 - /websites/production/activemq/content/schema/core/activemq-core.xsd

[cshannon]

Author: cshannon
Date: Mon Oct  2 15:13:23 2017
New Revision: 1019015

Log:
Adding 5.15.1 schemas

Added:
websites/production/activemq/content/schema/core/activemq-core.xsd   (with 
props)

Added: websites/production/activemq/content/schema/core/activemq-core.xsd
==
--- websites/production/activemq/content/schema/core/activemq-core.xsd (added)
+++ websites/production/activemq/content/schema/core/activemq-core.xsd Mon Oct  
2 15:13:23 2017
@@ -0,0 +1 @@
+link activemq-core-5.15.1.xsd
\ No newline at end of file

Propchange: websites/production/activemq/content/schema/core/activemq-core.xsd
--
svn:special = *

svn commit: r1019019 - in /websites/production/activemq/content/maven: ./ 5.15.1/ 5.15.1/apidocs/ 5.15.1/apidocs/org/ 5.15.1/apidocs/org/apache/ 5.15.1/apidocs/org/apache/activemq/ 5.15.1/apidocs/org/

[cshannon]

Author: cshannon
Date: Mon Oct  2 16:25:17 2017
New Revision: 1019019

Log:
Adding 5.15.1 apidocs


[This commit notification would consist of 3330 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

activemq git commit: [AMQ-6824] remove time dependency in test assertion

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 16568aae7 -> fe82d02e3


[AMQ-6824] remove time dependency in test assertion

(cherry picked from commit 578eacab455d82989da2ac26980379a04eeb2ad0)


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

Branch: refs/heads/activemq-5.15.x
Commit: fe82d02e381a166f67c9da23004f3a8739b18258
Parents: 16568aa
Author: gtully <gary.tu...@gmail.com>
Authored: Thu Sep 28 11:34:03 2017 +0100
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Sep 28 09:40:35 2017 -0400

--
 .../org/apache/activemq/JMSConsumerTest.java| 23 ++--
 1 file changed, 16 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/fe82d02e/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java 
b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
index abf9f62..36a4aac 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
@@ -48,6 +48,7 @@ import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.broker.region.TopicSubscription;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.util.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -251,7 +252,7 @@ public class JMSConsumerTest extends JmsTestSupport {
 
 final List subscriptions = 
getDestinationConsumers(broker, destination);
 
-assertTrue("prefetch extension back to 0",
+assertTrue("prefetch extension..",
 subscriptions.stream().
 filter(s -> s instanceof TopicSubscription).
 mapToInt(s -> 
((TopicSubscription)s).getPrefetchExtension().get()).
@@ -260,11 +261,15 @@ public class JMSConsumerTest extends JmsTestSupport {
 assertNull(consumer.receiveNoWait());
 message.acknowledge();
 
-assertTrue("prefetch extension back to 0",
-subscriptions.stream().
+assertTrue("prefetch extension back to 0", Wait.waitFor(new 
Wait.Condition() {
+@Override
+public boolean isSatisified() throws Exception {
+return subscriptions.stream().
 filter(s -> s instanceof TopicSubscription).
 mapToInt(s -> 
((TopicSubscription)s).getPrefetchExtension().get()).
-allMatch(e -> e == 0));
+allMatch(e -> e == 0);
+}
+}));
 
 }
 
@@ -299,11 +304,15 @@ public class JMSConsumerTest extends JmsTestSupport {
 assertNull(consumer.receiveNoWait());
 message.acknowledge();
 
-assertTrue("prefetch extension back to 0",
-subscriptions.stream().
+assertTrue("prefetch extension back to 0", Wait.waitFor(new 
Wait.Condition() {
+@Override
+public boolean isSatisified() throws Exception {
+return subscriptions.stream().
 filter(s -> s instanceof QueueSubscription).
 mapToInt(s -> 
((QueueSubscription)s).getPrefetchExtension().get()).
-allMatch(e -> e == 0));
+allMatch(e -> e == 0);
+}
+}));
 }
 
 public void initCombosForTestDurableConsumerSelectorChange() {

activemq git commit: [maven-release-plugin] prepare release activemq-5.15.1

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x fe82d02e3 -> 756b858fa


[maven-release-plugin] prepare release activemq-5.15.1


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

Branch: refs/heads/activemq-5.15.x
Commit: 756b858fa458757a0a5824c6ffe94e684c5771c9
Parents: fe82d02
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Sep 28 09:59:18 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Sep 28 09:59:18 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/756b858f/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 92c58a5..e00f51d 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1-SNAPSHOT
+5.15.1
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/756b858f/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 8b22854..cbee7ab 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1-SNAPSHOT
+5.15.1
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/756b858f/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 4787f98..6f22573 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1-SNAPSHOT
+5.15.1
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/756b858f/activemq

[activemq] Git Push Summary

[cshannon]

Repository: activemq
Updated Tags:  refs/tags/activemq-5.15.1 [created] dc3acc6a4

activemq git commit: Revert "[maven-release-plugin] prepare release activemq-5.15.1"

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 756b858fa -> 1d0121ccd


Revert "[maven-release-plugin] prepare release activemq-5.15.1"

This reverts commit 756b858fa458757a0a5824c6ffe94e684c5771c9.


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

Branch: refs/heads/activemq-5.15.x
Commit: 1d0121ccd436f07690d2a41973e60a821a496fa3
Parents: 756b858
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Sep 28 10:05:01 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Sep 28 10:05:01 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/1d0121cc/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index e00f51d..92c58a5 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.1-SNAPSHOT
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/1d0121cc/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index cbee7ab..8b22854 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.1-SNAPSHOT
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/1d0121cc/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 6f22573..4787f98 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.1-SNAPSHOT
   
 
   activemq-

[activemq] Git Push Summary

[cshannon]

Repository: activemq
Updated Tags:  refs/tags/activemq-5.15.1 [deleted] dc3acc6a4

svn commit: r22096 - /release/activemq/5.15.0/

[cshannon]

Author: cshannon
Date: Tue Oct  3 16:51:00 2017
New Revision: 22096

Log:
removing 5.15.0

Removed:
release/activemq/5.15.0/

activemq git commit: NO-JIRA: Adding schema definition for 5.15.1

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master e50e1661b -> 76cc77966


NO-JIRA: Adding schema definition for 5.15.1


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

Branch: refs/heads/master
Commit: 76cc7796686ddf1243e5fb327214580b2c90a5e0
Parents: e50e166
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon Sep 25 08:43:04 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon Sep 25 08:43:04 2017 -0400

--
 activemq-osgi/src/main/resources/META-INF/spring.schemas   | 1 +
 activemq-spring/src/main/resources/META-INF/spring.schemas | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/76cc7796/activemq-osgi/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas 
b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index 270c66f..2547616 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -55,6 +55,7 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.3.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.4.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd

http://git-wip-us.apache.org/repos/asf/activemq/blob/76cc7796/activemq-spring/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-spring/src/main/resources/META-INF/spring.schemas 
b/activemq-spring/src/main/resources/META-INF/spring.schemas
index b114a57..da9c7c8 100644
--- a/activemq-spring/src/main/resources/META-INF/spring.schemas
+++ b/activemq-spring/src/main/resources/META-INF/spring.schemas
@@ -55,6 +55,7 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.3.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.4.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd

activemq git commit: NO-JIRA: Adding schema definition for 5.15.1

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x bfdbdfd10 -> ded391161


NO-JIRA: Adding schema definition for 5.15.1

(cherry picked from commit 76cc7796686ddf1243e5fb327214580b2c90a5e0)


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

Branch: refs/heads/activemq-5.15.x
Commit: ded3911612aab8048bf58487051eeb527eb7f4fc
Parents: bfdbdfd
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon Sep 25 08:43:04 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon Sep 25 08:44:40 2017 -0400

--
 activemq-osgi/src/main/resources/META-INF/spring.schemas   | 1 +
 activemq-spring/src/main/resources/META-INF/spring.schemas | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/ded39116/activemq-osgi/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas 
b/activemq-osgi/src/main/resources/META-INF/spring.schemas
index 270c66f..2547616 100644
--- a/activemq-osgi/src/main/resources/META-INF/spring.schemas
+++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas
@@ -55,6 +55,7 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.3.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.4.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd

http://git-wip-us.apache.org/repos/asf/activemq/blob/ded39116/activemq-spring/src/main/resources/META-INF/spring.schemas
--
diff --git a/activemq-spring/src/main/resources/META-INF/spring.schemas 
b/activemq-spring/src/main/resources/META-INF/spring.schemas
index b114a57..da9c7c8 100644
--- a/activemq-spring/src/main/resources/META-INF/spring.schemas
+++ b/activemq-spring/src/main/resources/META-INF/spring.schemas
@@ -55,6 +55,7 @@ 
http\://activemq.apache.org/schema/core/activemq-core-5.14.3.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.4.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.14.5.xsd=activemq.xsd
 http\://activemq.apache.org/schema/core/activemq-core-5.15.0.xsd=activemq.xsd
+http\://activemq.apache.org/schema/core/activemq-core-5.15.1.xsd=activemq.xsd
 
 http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
 http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd

activemq git commit: NO-JIRA: Exclude logo.svg from apache-rat check

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 76cc77966 -> 62ce85265


NO-JIRA: Exclude logo.svg from apache-rat check


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

Branch: refs/heads/master
Commit: 62ce85265978e503c64024994bf391c185fbbd4c
Parents: 76cc779
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon Sep 25 08:47:04 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon Sep 25 08:47:04 2017 -0400

--
 pom.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/62ce8526/pom.xml
--
diff --git a/pom.xml b/pom.xml
index aef244e..57dcb58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1487,6 +1487,7 @@
 **/stomp.js
 **/__init__.py
 **/webapp/decorators/footer.jsp
+**/docs/img/logo.svg
   
 
   

activemq git commit: AMQ-6798 - Clean up store usage object on Queue stop

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 8e9f80e7d -> eca72dc81


AMQ-6798 - Clean up store usage object on Queue stop

When queues are stopped the StoreUsage object needs to be stopped so it
will be removed from the parent StoreUsage.  This allows the object to
be garbage collected and prevents a memory leak.

(cherry picked from commit 35bd3ad938f5c378b17a34980d2f3480bf3bbfc3)


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

Branch: refs/heads/activemq-5.15.x
Commit: eca72dc81ad8113e31fadf161580bf5e2b93e27a
Parents: 8e9f80e
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Aug 24 09:23:17 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Aug 24 09:25:13 2017 -0400

--
 .../apache/activemq/broker/region/Queue.java|   3 +
 .../QueueMemoryAndStoreUsageCleanupTest.java| 103 +++
 2 files changed, 106 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/eca72dc8/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 612aeeb..49dd5a2 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1026,6 +1026,9 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 if (memoryUsage != null) {
 memoryUsage.stop();
 }
+if (systemUsage.getStoreUsage() != null) {
+systemUsage.getStoreUsage().stop();
+}
 if (store != null) {
 store.stop();
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/eca72dc8/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
new file mode 100644
index 000..3259f40
--- /dev/null
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
@@ -0,0 +1,103 @@
+/**
+ * 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.usage;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Test for AMQ-6798
+ */
+public class QueueMemoryAndStoreUsageCleanupTest {
+protected static final Logger LOG = LoggerFactory
+.getLogger(QueueMemoryAndStoreUsageCleanupTest.class);
+
+@Rule
+public TemporaryFolder dataFileDir = new TemporaryFolder(new 
File("target"));
+private BrokerService broker;
+private SystemUsage systemUsage;
+
+@Before
+public void setUpBroker() throws Exception {
+broker = new BrokerService();
+broker.setPersistent(true);
+broker.setDataDirectoryFile(dataFileDir.getRoot());
+broker.setDeleteAll

activemq git commit: AMQ-6798 - Clean up store usage object on Queue stop

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master c7291f1ec -> 35bd3ad93


AMQ-6798 - Clean up store usage object on Queue stop

When queues are stopped the StoreUsage object needs to be stopped so it
will be removed from the parent StoreUsage.  This allows the object to
be garbage collected and prevents a memory leak.


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

Branch: refs/heads/master
Commit: 35bd3ad938f5c378b17a34980d2f3480bf3bbfc3
Parents: c7291f1
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Aug 24 09:23:17 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Aug 24 09:24:36 2017 -0400

--
 .../apache/activemq/broker/region/Queue.java|   3 +
 .../QueueMemoryAndStoreUsageCleanupTest.java| 103 +++
 2 files changed, 106 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/35bd3ad9/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 612aeeb..49dd5a2 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1026,6 +1026,9 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 if (memoryUsage != null) {
 memoryUsage.stop();
 }
+if (systemUsage.getStoreUsage() != null) {
+systemUsage.getStoreUsage().stop();
+}
 if (store != null) {
 store.stop();
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/35bd3ad9/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
new file mode 100644
index 000..3259f40
--- /dev/null
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/usage/QueueMemoryAndStoreUsageCleanupTest.java
@@ -0,0 +1,103 @@
+/**
+ * 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.usage;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.List;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Test for AMQ-6798
+ */
+public class QueueMemoryAndStoreUsageCleanupTest {
+protected static final Logger LOG = LoggerFactory
+.getLogger(QueueMemoryAndStoreUsageCleanupTest.class);
+
+@Rule
+public TemporaryFolder dataFileDir = new TemporaryFolder(new 
File("target"));
+private BrokerService broker;
+private SystemUsage systemUsage;
+
+@Before
+public void setUpBroker() throws Exception {
+broker = new BrokerService();
+broker.setPersistent(true);
+broker.setDataDirectoryFile(dataFileDir.getRoot());
+broker.setDeleteAllMessagesOnStartup(true);
+systemUsage = broker.getSystemUsage();
+  

activemq git commit: [AMQ-6790] add netty kqueue osgi dependency to the activemq-amqp-client feature

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 26788f5fd -> 95b3ba50b


[AMQ-6790] add netty kqueue osgi dependency to the activemq-amqp-client feature

(cherry picked from commit 33b52b5914b30e73663a344f095a30c1dd484f49)


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

Branch: refs/heads/activemq-5.15.x
Commit: 95b3ba50b0a7f31a413d1601311d205f95843e54
Parents: 26788f5
Author: gtully <gary.tu...@gmail.com>
Authored: Wed Sep 27 12:43:38 2017 +0100
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed Sep 27 08:53:21 2017 -0400

--
 activemq-karaf/src/main/resources/features.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/95b3ba50/activemq-karaf/src/main/resources/features.xml
--
diff --git a/activemq-karaf/src/main/resources/features.xml 
b/activemq-karaf/src/main/resources/features.xml
index a5a8670..c989705 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -65,6 +65,7 @@
   mvn:io.netty/netty-common/${qpid-jms-netty-version}
   mvn:io.netty/netty-transport/${qpid-jms-netty-version}
   
mvn:io.netty/netty-transport-native-epoll/${qpid-jms-netty-version}
+  
mvn:io.netty/netty-transport-native-kqueue/${qpid-jms-netty-version}
   
mvn:io.netty/netty-transport-native-unix-common/${qpid-jms-netty-version}
   mvn:io.netty/netty-buffer/${qpid-jms-netty-version}
   mvn:io.netty/netty-codec/${qpid-jms-netty-version}

[1/2] activemq git commit: Revert "[maven-release-plugin] prepare for next development iteration"

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 95b3ba50b -> 76474fbc6


Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit e2eabeb1c2a8234d2763238eae8a2a143e1860a6.


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

Branch: refs/heads/activemq-5.15.x
Commit: ade1a87e09342326013718f5f28d3bad52641cd5
Parents: 95b3ba5
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed Sep 27 08:54:36 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed Sep 27 08:54:36 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/ade1a87e/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index f291126..e00f51d 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.2-SNAPSHOT
+5.15.1
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/ade1a87e/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 165ed80..cbee7ab 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.2-SNAPSHOT
+5.15.1
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/ade1a87e/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 32fd1b5..6f22573 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.2-SNAPSHOT
+5.15.1
   
 
   activemq-

[2/2] activemq git commit: Revert "[maven-release-plugin] prepare release activemq-5.15.1"

[cshannon]

Revert "[maven-release-plugin] prepare release activemq-5.15.1"

This reverts commit 37227fbf8bf2308d45dddb169483864007ef5560.


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

Branch: refs/heads/activemq-5.15.x
Commit: 76474fbc675bd98ac3ad4cfbe67baf4383387809
Parents: ade1a87
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed Sep 27 08:54:44 2017 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed Sep 27 08:54:44 2017 -0400

--
 activemq-all/pom.xml   | 2 +-
 activemq-amqp/pom.xml  | 2 +-
 activemq-blueprint/pom.xml | 2 +-
 activemq-broker/pom.xml| 2 +-
 activemq-camel/pom.xml | 2 +-
 activemq-cf/pom.xml| 2 +-
 activemq-client/pom.xml| 2 +-
 activemq-console/pom.xml   | 2 +-
 activemq-http/pom.xml  | 2 +-
 activemq-itests-spring31/pom.xml   | 2 +-
 activemq-jaas/pom.xml  | 2 +-
 activemq-jdbc-store/pom.xml| 2 +-
 activemq-jms-pool/pom.xml  | 2 +-
 activemq-kahadb-store/pom.xml  | 2 +-
 activemq-karaf-itest/pom.xml   | 2 +-
 activemq-karaf/pom.xml | 2 +-
 activemq-leveldb-store/pom.xml | 2 +-
 activemq-log4j-appender/pom.xml| 2 +-
 activemq-mqtt/pom.xml  | 2 +-
 activemq-openwire-generator/pom.xml| 2 +-
 activemq-openwire-legacy/pom.xml   | 2 +-
 activemq-osgi/pom.xml  | 2 +-
 activemq-partition/pom.xml | 2 +-
 activemq-pool/pom.xml  | 2 +-
 activemq-ra/pom.xml| 2 +-
 activemq-rar/pom.xml   | 2 +-
 activemq-run/pom.xml   | 2 +-
 activemq-runtime-config/pom.xml| 2 +-
 activemq-shiro/pom.xml | 2 +-
 activemq-spring/pom.xml| 2 +-
 activemq-stomp/pom.xml | 2 +-
 activemq-tooling/activemq-junit/pom.xml| 2 +-
 activemq-tooling/activemq-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-memtest-maven-plugin/pom.xml | 2 +-
 activemq-tooling/activemq-perf-maven-plugin/pom.xml| 2 +-
 activemq-tooling/pom.xml   | 2 +-
 activemq-unit-tests/pom.xml| 2 +-
 activemq-web-console/pom.xml   | 2 +-
 activemq-web-demo/pom.xml  | 2 +-
 activemq-web/pom.xml   | 2 +-
 assembly/pom.xml   | 2 +-
 pom.xml| 4 ++--
 42 files changed, 43 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/76474fbc/activemq-all/pom.xml
--
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index e00f51d..92c58a5 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.1-SNAPSHOT
   
 
   activemq-all

http://git-wip-us.apache.org/repos/asf/activemq/blob/76474fbc/activemq-amqp/pom.xml
--
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index cbee7ab..8b22854 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.1-SNAPSHOT
   
 
   activemq-amqp

http://git-wip-us.apache.org/repos/asf/activemq/blob/76474fbc/activemq-blueprint/pom.xml
--
diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
index 6f22573..4787f98 100644
--- a/activemq-blueprint/pom.xml
+++ b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.activemq
 activemq-parent
-5.15.1
+5.15.1-SNAPSHOT
   
 
   activemq-blueprint

http://git-wip-us.apache.org/repos/asf/activemq/blob/76474fbc/a

[activemq] Git Push Summary

[cshannon]

Repository: activemq
Updated Tags:  refs/tags/activemq-5.15.1 [deleted] bf86cae37

svn commit: r22010 - /dev/activemq/activemq/5.15.1/

[cshannon]

Author: cshannon
Date: Wed Sep 27 13:50:55 2017
New Revision: 22010

Log:
removing 5.15.1, it will be rebuilt

Removed:
dev/activemq/activemq/5.15.1/

activemq git commit: AMQ-6858 - Allow configuration of the client Id token in network bridge

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 41211c78d -> 3ca439cad


AMQ-6858 - Allow configuration of the client Id token in network bridge

The client id token that is used to separate parts of a generated local
client id in a network bridge should be configurable so bridge names and
broker names can contain underscores if desired


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

Branch: refs/heads/master
Commit: 3ca439cadaa8c40f506aa1ef683b36624d216254
Parents: 41211c7
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Nov 14 14:26:22 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Nov 14 15:23:26 2017 -0500

--
 .../network/DemandForwardingBridgeSupport.java  |  25 +-
 .../network/NetworkBridgeConfiguration.java |   9 +
 .../DurableFiveBrokerNetworkBridgeTest.java | 293 ++-
 3 files changed, 167 insertions(+), 160 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/3ca439ca/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 03e79e4..75084d1 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -37,6 +37,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 
 import javax.management.ObjectName;
 
@@ -492,7 +493,7 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 
 localConnectionInfo = new ConnectionInfo();
 localConnectionInfo.setConnectionId(new 
ConnectionId(idGenerator.generateId()));
-localClientId = configuration.getName() + "_" + 
remoteBrokerName + "_inbound_" + configuration.getBrokerName();
+localClientId = configuration.getName() + 
configuration.getClientIdToken() + remoteBrokerName + 
configuration.getClientIdToken() + "inbound" + configuration.getClientIdToken() 
+ configuration.getBrokerName();
 localConnectionInfo.setClientId(localClientId);
 
localConnectionInfo.setUserName(configuration.getUserName());
 
localConnectionInfo.setPassword(configuration.getPassword());
@@ -520,8 +521,8 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 
 ConnectionInfo duplexLocalConnectionInfo = new 
ConnectionInfo();
 duplexLocalConnectionInfo.setConnectionId(new 
ConnectionId(idGenerator.generateId()));
-
duplexLocalConnectionInfo.setClientId(configuration.getName() + "_" + 
remoteBrokerName + "_inbound_duplex_"
-+ configuration.getBrokerName());
+
duplexLocalConnectionInfo.setClientId(configuration.getName() + 
configuration.getClientIdToken() + remoteBrokerName + 
configuration.getClientIdToken() + "inbound" + configuration.getClientIdToken() 
+ "duplex"
++ configuration.getClientIdToken() + 
configuration.getBrokerName());
 
duplexLocalConnectionInfo.setUserName(configuration.getUserName());
 
duplexLocalConnectionInfo.setPassword(configuration.getPassword());
 
@@ -609,7 +610,7 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 }
 remoteConnectionInfo = new ConnectionInfo();
 remoteConnectionInfo.setConnectionId(new 
ConnectionId(idGenerator.generateId()));
-remoteConnectionInfo.setClientId(configuration.getName() + "_" 
+ configuration.getBrokerName() + "_outbound");
+remoteConnectionInfo.setClientId(configuration.getName() + 
configuration.getClientIdToken() + configuration.getBrokerName() + 
configuration.getClientIdToken() + "outbound");
 remoteConnectionInfo.se

activemq git commit: AMQ-6875 - Use the correct destination for Virtual destination consumers when using Virtual Topics

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master d3e439378 -> 56baba96c


AMQ-6875 - Use the correct destination for Virtual destination consumers
when using Virtual Topics


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

Branch: refs/heads/master
Commit: 56baba96c657d4e44b88955a964d6c92ff39b822
Parents: d3e4393
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Dec 14 16:00:37 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Dec 14 16:01:10 2017 -0500

--
 .../activemq/advisory/AdvisoryBroker.java   | 46 +++-
 .../network/VirtualConsumerDemandTest.java  | 24 --
 2 files changed, 65 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/56baba96/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
 
b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
index 1acd524..1508c61 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
@@ -17,6 +17,7 @@
 package org.apache.activemq.advisory;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -42,6 +43,7 @@ import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.broker.region.TopicRegion;
 import org.apache.activemq.broker.region.TopicSubscription;
 import org.apache.activemq.broker.region.virtual.VirtualDestination;
+import org.apache.activemq.broker.region.virtual.VirtualTopic;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQTopic;
@@ -58,6 +60,7 @@ import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.RemoveSubscriptionInfo;
 import org.apache.activemq.command.SessionId;
+import org.apache.activemq.filter.DestinationPath;
 import org.apache.activemq.security.SecurityContext;
 import org.apache.activemq.state.ProducerState;
 import org.apache.activemq.usage.Usage;
@@ -604,7 +607,7 @@ public class AdvisoryBroker extends BrokerFilter {
 
 if(brokerConsumerDests.putIfAbsent(pair, info) == null) {
 LOG.debug("Virtual consumer pair added: {} for consumer: 
{} ", pair, info);
-
info.setDestination(virtualDestination.getVirtualDestination());
+setConsumerInfoVirtualDest(info, virtualDestination, 
activeMQDest);
 ActiveMQTopic topic = 
AdvisorySupport.getVirtualDestinationConsumerAdvisoryTopic(info.getDestination());
 
 if (virtualDestinationConsumers.putIfAbsent(info, 
virtualDestination) == null) {
@@ -616,7 +619,7 @@ public class AdvisoryBroker extends BrokerFilter {
 //this is the case of a real consumer coming online
 } else {
 info = info.copy();
-info.setDestination(virtualDestination.getVirtualDestination());
+setConsumerInfoVirtualDest(info, virtualDestination, activeMQDest);
 ActiveMQTopic topic = 
AdvisorySupport.getVirtualDestinationConsumerAdvisoryTopic(info.getDestination());
 
 if (virtualDestinationConsumers.putIfAbsent(info, 
virtualDestination) == null) {
@@ -626,6 +629,45 @@ public class AdvisoryBroker extends BrokerFilter {
 }
 }
 
+/**
+ * Sets the virtual destination on the ConsumerInfo
+ * If this is a VirtualTopic then the destination used will be the actual 
topic subscribed
+ * to in order to track demand properly
+ *
+ * @param info
+ * @param virtualDestination
+ * @param activeMQDest
+ */
+private void setConsumerInfoVirtualDest(ConsumerInfo info, 
VirtualDestination virtualDestination, ActiveMQDestination activeMQDest) {
+info.setDestination(virtualDestination.getVirtualDestination());
+if (virtualDestination instanceof VirtualTopic) {
+VirtualTopic vt = (VirtualTopic) virtualDestination;
+String prefix = vt.getPrefix() != null ? vt.getPrefix() : "";
+String postfix = vt.getPostfix() != null ? vt.getPostfix() : "";
+if (pr

activemq git commit: AMQ-6875 - Use the correct destination for Virtual destination consumers when using Virtual Topics

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x c5d8a9810 -> 94aea677a


AMQ-6875 - Use the correct destination for Virtual destination consumers
when using Virtual Topics

(cherry picked from commit 56baba96c657d4e44b88955a964d6c92ff39b822)


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

Branch: refs/heads/activemq-5.15.x
Commit: 94aea677acab41fc8ba425c9fefc9c351fb31a94
Parents: c5d8a98
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Dec 14 16:00:37 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Dec 14 16:02:06 2017 -0500

--
 .../activemq/advisory/AdvisoryBroker.java   | 46 +++-
 .../network/VirtualConsumerDemandTest.java  | 24 --
 2 files changed, 65 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/94aea677/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
 
b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
index 1acd524..1508c61 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
@@ -17,6 +17,7 @@
 package org.apache.activemq.advisory;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -42,6 +43,7 @@ import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.broker.region.TopicRegion;
 import org.apache.activemq.broker.region.TopicSubscription;
 import org.apache.activemq.broker.region.virtual.VirtualDestination;
+import org.apache.activemq.broker.region.virtual.VirtualTopic;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQTopic;
@@ -58,6 +60,7 @@ import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.RemoveSubscriptionInfo;
 import org.apache.activemq.command.SessionId;
+import org.apache.activemq.filter.DestinationPath;
 import org.apache.activemq.security.SecurityContext;
 import org.apache.activemq.state.ProducerState;
 import org.apache.activemq.usage.Usage;
@@ -604,7 +607,7 @@ public class AdvisoryBroker extends BrokerFilter {
 
 if(brokerConsumerDests.putIfAbsent(pair, info) == null) {
 LOG.debug("Virtual consumer pair added: {} for consumer: 
{} ", pair, info);
-
info.setDestination(virtualDestination.getVirtualDestination());
+setConsumerInfoVirtualDest(info, virtualDestination, 
activeMQDest);
 ActiveMQTopic topic = 
AdvisorySupport.getVirtualDestinationConsumerAdvisoryTopic(info.getDestination());
 
 if (virtualDestinationConsumers.putIfAbsent(info, 
virtualDestination) == null) {
@@ -616,7 +619,7 @@ public class AdvisoryBroker extends BrokerFilter {
 //this is the case of a real consumer coming online
 } else {
 info = info.copy();
-info.setDestination(virtualDestination.getVirtualDestination());
+setConsumerInfoVirtualDest(info, virtualDestination, activeMQDest);
 ActiveMQTopic topic = 
AdvisorySupport.getVirtualDestinationConsumerAdvisoryTopic(info.getDestination());
 
 if (virtualDestinationConsumers.putIfAbsent(info, 
virtualDestination) == null) {
@@ -626,6 +629,45 @@ public class AdvisoryBroker extends BrokerFilter {
 }
 }
 
+/**
+ * Sets the virtual destination on the ConsumerInfo
+ * If this is a VirtualTopic then the destination used will be the actual 
topic subscribed
+ * to in order to track demand properly
+ *
+ * @param info
+ * @param virtualDestination
+ * @param activeMQDest
+ */
+private void setConsumerInfoVirtualDest(ConsumerInfo info, 
VirtualDestination virtualDestination, ActiveMQDestination activeMQDest) {
+info.setDestination(virtualDestination.getVirtualDestination());
+if (virtualDestination instanceof VirtualTopic) {
+VirtualTopic vt = (VirtualTopic) virtualDestination;
+String prefix = vt.getPrefix() != null ? vt.getPrefix() : "";
+Strin

[1/2] activemq git commit: [AMQ-6847] pause dispatch for message move to avoid redelivery with pending ack/remove/audit rollback

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x b04b97168 -> 0464d5323


[AMQ-6847] pause dispatch for message move to avoid redelivery with pending 
ack/remove/audit rollback

(cherry picked from commit 2ea5d1420bbbf90bd151e19a75e6ca33c773f1f4)


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

Branch: refs/heads/activemq-5.15.x
Commit: eb9e50f3c9ea9de4777a6c6295ff8065aa3b4252
Parents: b04b971
Author: gtully <gary.tu...@gmail.com>
Authored: Fri Oct 27 11:40:06 2017 +0100
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Dec 19 07:18:01 2017 -0500

--
 .../apache/activemq/broker/region/Queue.java| 31 +
 .../apache/activemq/broker/jmx/MBeanTest.java   | 47 
 2 files changed, 70 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/eb9e50f3/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index fba78cb..ac206e3 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1462,18 +1462,33 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
  * @throws Exception
  */
 public boolean moveMessageTo(ConnectionContext context, 
QueueMessageReference m, ActiveMQDestination dest) throws Exception {
-BrokerSupport.resend(context, m.getMessage(), dest);
-removeMessage(context, m);
-messagesLock.writeLock().lock();
+Set destsToPause = regionBroker.getDestinations(dest);
 try {
-messages.rollback(m.getMessageId());
-if (isDLQ()) {
-DeadLetterStrategy stratagy = getDeadLetterStrategy();
-stratagy.rollback(m.getMessage());
+for (Destination d: destsToPause) {
+if (d instanceof Queue) {
+((Queue)d).pauseDispatch();
+}
+}
+BrokerSupport.resend(context, m.getMessage(), dest);
+removeMessage(context, m);
+messagesLock.writeLock().lock();
+try {
+messages.rollback(m.getMessageId());
+if (isDLQ()) {
+DeadLetterStrategy stratagy = getDeadLetterStrategy();
+stratagy.rollback(m.getMessage());
+}
+} finally {
+messagesLock.writeLock().unlock();
 }
 } finally {
-messagesLock.writeLock().unlock();
+for (Destination d: destsToPause) {
+if (d instanceof Queue) {
+((Queue)d).resumeDispatch();
+}
+}
 }
+
 return true;
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/eb9e50f3/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index d72d709..ecc6894 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -54,6 +54,7 @@ import org.apache.activemq.ActiveMQPrefetchPolicy;
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.BlobMessage;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.RedeliveryPolicy;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.BaseDestination;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
@@ -180,6 +181,52 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 assertEquals("no forwards", 0, queueNew.getForwardCount());
 }
 
+public void testMoveFromDLQImmediateDLQ() throws Exception {
+
+RedeliveryPolicy redeliveryPolicy = new RedeliveryPolicy();
+redeliveryPolicy.setMaximumRedeliveries(0);
+
((ActiveMQConnectionFactory)connectionFactory).setRedeliveryPolicy(redeliveryPolicy);
+Connection connection = connectionFactory.createConnection();
+
+// populate
+   

[2/2] activemq git commit: [AMQ-6847] limit the retry loop to one iteration overa all pending messages such that new additions are not replayed to avoid duplicates

[cshannon]

[AMQ-6847] limit the retry loop to one iteration overa all pending messages 
such that new additions are not replayed to avoid duplicates

(cherry picked from commit 03b19b9da4d50c3bb8985f930e93596c7d994d26)


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

Branch: refs/heads/activemq-5.15.x
Commit: 0464d53233f95535dfaf8da6adcef9470cb52bdf
Parents: eb9e50f
Author: gtully <gary.tu...@gmail.com>
Authored: Wed Nov 1 11:26:36 2017 +
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Dec 19 07:18:12 2017 -0500

--
 .../java/org/apache/activemq/broker/region/Queue.java | 10 +++---
 .../java/org/apache/activemq/broker/jmx/MBeanTest.java| 10 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/0464d532/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index ac206e3..48cbfbe 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1475,8 +1475,8 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 try {
 messages.rollback(m.getMessageId());
 if (isDLQ()) {
-DeadLetterStrategy stratagy = getDeadLetterStrategy();
-stratagy.rollback(m.getMessage());
+DeadLetterStrategy strategy = getDeadLetterStrategy();
+strategy.rollback(m.getMessage());
 }
 } finally {
 messagesLock.writeLock().unlock();
@@ -1560,6 +1560,9 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 throw new Exception("Retry of message is only possible on Dead 
Letter Queues!");
 }
 int restoredCounter = 0;
+// ensure we deal with a snapshot to avoid potential duplicates in the 
event of messages
+// getting immediate dlq'ed
+long numberOfRetryAttemptsToCheckAllMessagesOnce = 
this.destinationStatistics.getMessages().getCount();
 Set set = new LinkedHashSet();
 do {
 doPageIn(true);
@@ -1571,6 +1574,7 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 }
 List list = new ArrayList(set);
 for (MessageReference ref : list) {
+numberOfRetryAttemptsToCheckAllMessagesOnce--;
 if (ref.getMessage().getOriginalDestination() != null) {
 
 moveMessageTo(context, (QueueMessageReference)ref, 
ref.getMessage().getOriginalDestination());
@@ -1580,7 +1584,7 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 }
 }
 }
-} while (set.size() < 
this.destinationStatistics.getMessages().getCount() && set.size() < 
maximumMessages);
+} while (numberOfRetryAttemptsToCheckAllMessagesOnce > 0 && set.size() 
< this.destinationStatistics.getMessages().getCount());
 return restoredCounter;
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/0464d532/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index ecc6894..0ccf1cb 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -206,22 +206,26 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 }});
 
 
+ObjectName queueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
getDestinationString());
+QueueViewMBean queue = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
+
 ObjectName dlqQueueViewMBeanName = assertRegisteredObjectName(domain + 
":type=

activemq git commit: AMQ-6847 - fix compilation for java 7

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 185160c0d -> a5d32da8a


AMQ-6847 - fix compilation for java 7


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

Branch: refs/heads/activemq-5.14.x
Commit: a5d32da8a143ad541cc484f10fac759c81449482
Parents: 185160c
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Dec 19 07:27:30 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Dec 19 07:27:30 2017 -0500

--
 .../test/java/org/apache/activemq/broker/jmx/MBeanTest.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/a5d32da8/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index e0a2ee0..9c83ce4 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -207,10 +207,10 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 
 
 ObjectName queueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
getDestinationString());
-QueueViewMBean queue = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
+final QueueViewMBean queue = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
 
 ObjectName dlqQueueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
SharedDeadLetterStrategy.DEFAULT_DEAD_LETTER_QUEUE_NAME );
-QueueViewMBean dlq = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, 
dlqQueueViewMBeanName, QueueViewMBean.class, true);
+final QueueViewMBean dlq = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, 
dlqQueueViewMBeanName, QueueViewMBean.class, true);
 
 assertTrue("messages on dlq", Wait.waitFor(new Wait.Condition() {
 @Override
@@ -258,7 +258,7 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 echo("Now browsing the second queue");
 
 queueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
newDestination );
-QueueViewMBean queueNew = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
+final QueueViewMBean queueNew = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
 
 long newQueuesize = queueNew.getQueueSize();
 assertEquals("Expect one", 1, newQueuesize);

[2/2] activemq git commit: [AMQ-6847] limit the retry loop to one iteration overa all pending messages such that new additions are not replayed to avoid duplicates

[cshannon]

[AMQ-6847] limit the retry loop to one iteration overa all pending messages 
such that new additions are not replayed to avoid duplicates

(cherry picked from commit 03b19b9da4d50c3bb8985f930e93596c7d994d26)


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

Branch: refs/heads/activemq-5.14.x
Commit: 185160c0daf955bf7ef43a9440cf5bc9672bd461
Parents: e62705a
Author: gtully <gary.tu...@gmail.com>
Authored: Wed Nov 1 11:26:36 2017 +
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Dec 19 07:19:19 2017 -0500

--
 .../java/org/apache/activemq/broker/region/Queue.java | 10 +++---
 .../java/org/apache/activemq/broker/jmx/MBeanTest.java| 10 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/185160c0/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 78010e9..1fe4f58 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1443,8 +1443,8 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 try {
 messages.rollback(m.getMessageId());
 if (isDLQ()) {
-DeadLetterStrategy stratagy = getDeadLetterStrategy();
-stratagy.rollback(m.getMessage());
+DeadLetterStrategy strategy = getDeadLetterStrategy();
+strategy.rollback(m.getMessage());
 }
 } finally {
 messagesLock.writeLock().unlock();
@@ -1523,6 +1523,9 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 throw new Exception("Retry of message is only possible on Dead 
Letter Queues!");
 }
 int restoredCounter = 0;
+// ensure we deal with a snapshot to avoid potential duplicates in the 
event of messages
+// getting immediate dlq'ed
+long numberOfRetryAttemptsToCheckAllMessagesOnce = 
this.destinationStatistics.getMessages().getCount();
 Set set = new LinkedHashSet();
 do {
 doPageIn(true);
@@ -1534,6 +1537,7 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 }
 List list = new ArrayList(set);
 for (MessageReference ref : list) {
+numberOfRetryAttemptsToCheckAllMessagesOnce--;
 if (ref.getMessage().getOriginalDestination() != null) {
 
 moveMessageTo(context, (QueueMessageReference)ref, 
ref.getMessage().getOriginalDestination());
@@ -1543,7 +1547,7 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 }
 }
 }
-} while (set.size() < 
this.destinationStatistics.getMessages().getCount() && set.size() < 
maximumMessages);
+} while (numberOfRetryAttemptsToCheckAllMessagesOnce > 0 && set.size() 
< this.destinationStatistics.getMessages().getCount());
 return restoredCounter;
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/185160c0/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index e79f007..e0a2ee0 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -206,22 +206,26 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 }});
 
 
+ObjectName queueViewMBeanName = assertRegisteredObjectName(domain + 
":type=Broker,brokerName=localhost,destinationType=Queue,destinationName=" + 
getDestinationString());
+QueueViewMBean queue = 
MBeanServerInvocationHandler.newProxyInstance(mbeanServer, queueViewMBeanName, 
QueueViewMBean.class, true);
+
 ObjectName dlqQueueViewMBeanName = assertRegisteredObjectName(domain + 
":type=

[1/2] activemq git commit: [AMQ-6847] pause dispatch for message move to avoid redelivery with pending ack/remove/audit rollback

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 30edca5b2 -> 185160c0d


[AMQ-6847] pause dispatch for message move to avoid redelivery with pending 
ack/remove/audit rollback

(cherry picked from commit 2ea5d1420bbbf90bd151e19a75e6ca33c773f1f4)


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

Branch: refs/heads/activemq-5.14.x
Commit: e62705aa9d7646108e42c321d390189aa26587ba
Parents: 30edca5
Author: gtully <gary.tu...@gmail.com>
Authored: Fri Oct 27 11:40:06 2017 +0100
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Tue Dec 19 07:19:10 2017 -0500

--
 .../apache/activemq/broker/region/Queue.java| 31 +
 .../apache/activemq/broker/jmx/MBeanTest.java   | 47 
 2 files changed, 70 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/e62705aa/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
index 6283232..78010e9 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
@@ -1430,18 +1430,33 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
  * @throws Exception
  */
 public boolean moveMessageTo(ConnectionContext context, 
QueueMessageReference m, ActiveMQDestination dest) throws Exception {
-BrokerSupport.resend(context, m.getMessage(), dest);
-removeMessage(context, m);
-messagesLock.writeLock().lock();
+Set destsToPause = regionBroker.getDestinations(dest);
 try {
-messages.rollback(m.getMessageId());
-if (isDLQ()) {
-DeadLetterStrategy stratagy = getDeadLetterStrategy();
-stratagy.rollback(m.getMessage());
+for (Destination d: destsToPause) {
+if (d instanceof Queue) {
+((Queue)d).pauseDispatch();
+}
+}
+BrokerSupport.resend(context, m.getMessage(), dest);
+removeMessage(context, m);
+messagesLock.writeLock().lock();
+try {
+messages.rollback(m.getMessageId());
+if (isDLQ()) {
+DeadLetterStrategy stratagy = getDeadLetterStrategy();
+stratagy.rollback(m.getMessage());
+}
+} finally {
+messagesLock.writeLock().unlock();
 }
 } finally {
-messagesLock.writeLock().unlock();
+for (Destination d: destsToPause) {
+if (d instanceof Queue) {
+((Queue)d).resumeDispatch();
+}
+}
 }
+
 return true;
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/e62705aa/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index 5304424..e79f007 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -54,6 +54,7 @@ import org.apache.activemq.ActiveMQPrefetchPolicy;
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.BlobMessage;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.RedeliveryPolicy;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.BaseDestination;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
@@ -180,6 +181,52 @@ public class MBeanTest extends EmbeddedBrokerTestSupport {
 assertEquals("no forwards", 0, queueNew.getForwardCount());
 }
 
+public void testMoveFromDLQImmediateDLQ() throws Exception {
+
+RedeliveryPolicy redeliveryPolicy = new RedeliveryPolicy();
+redeliveryPolicy.setMaximumRedeliveries(0);
+
((ActiveMQConnectionFactory)connectionFactory).setRedeliveryPolicy(redeliveryPolicy);
+Connection connection = connectionFactory.createConnection();
+
+// populate
+   

activemq git commit: (AMQ-6858) - add extra precautionary check for demand subs

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 2e3a7f611 -> 08aa5118f


(AMQ-6858) - add extra precautionary check for demand subs

also remove test that intermittently fails with timing issues


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

Branch: refs/heads/master
Commit: 08aa5118ffcd8dfc4ec813d799a61ef1ee4421d1
Parents: 2e3a7f6
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Nov 16 07:44:33 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Nov 16 07:44:33 2017 -0500

--
 .../apache/activemq/network/ConduitBridge.java  |  3 ++-
 .../network/DemandForwardingBridgeSupport.java  |  3 ++-
 .../DurableFiveBrokerNetworkBridgeTest.java | 23 +---
 3 files changed, 5 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/08aa5118/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
index 70f45f7..a4b5072 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
@@ -83,7 +83,8 @@ public class ConduitBridge extends DemandForwardingBridge {
 } else {
 //Handle the demand generated by proxy network 
subscriptions
 //The broker path is case is normal
-if (isProxyNSConsumerBrokerPath(info)) {
+if (isProxyNSConsumerBrokerPath(info) &&
+info.getSubscriptionName() != null && 
info.getSubscriptionName().startsWith(DURABLE_SUB_PREFIX)) {
 final BrokerId[] path = info.getBrokerPath();
 addProxyNetworkSubscriptionBrokerPath(ds, path, 
info.getSubscriptionName());
 //This is the durable sync case on broker restart

http://git-wip-us.apache.org/repos/asf/activemq/blob/08aa5118/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index df493c3..dd7716f 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -1432,7 +1432,8 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 if (consumerInfo.isDurable()) {
 //Handle the demand generated by proxy network 
subscriptions
 //The broker path is case is normal
-if (isProxyNSConsumerBrokerPath(sub.getRemoteInfo())) {
+if (isProxyNSConsumerBrokerPath(sub.getRemoteInfo()) &&
+info.getSubscriptionName() != null && 
info.getSubscriptionName().startsWith(DURABLE_SUB_PREFIX)) {
 final BrokerId[] path = info.getBrokerPath();
 addProxyNetworkSubscriptionBrokerPath(sub, path, 
consumerInfo.getSubscriptionName());
 //This is the durable sync case on broker restart

http://git-wip-us.apache.org/repos/asf/activemq/blob/08aa5118/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
index 5bbd8b8..fe07ac3 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
@@ -63,30 +63,15 @@ public class DurableFiveBrokerNetworkBridgeTest extends 
JmsMultipleBrokersTestSu
 return connector;
 }
 
-public void testDurablePropagationBrokerRestartDuplex() throws Exception {
+public vo

[6/6] activemq git commit: (AMQ-6858) - add extra precautionary check for demand subs

[cshannon]

(AMQ-6858) - add extra precautionary check for demand subs

also remove test that intermittently fails with timing issues

(cherry picked from commit 08aa5118ffcd8dfc4ec813d799a61ef1ee4421d1)


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

Branch: refs/heads/activemq-5.15.x
Commit: 1cfc9ff9a6d0682bd8fccf278924d15a908ccb31
Parents: 3285be6
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Nov 16 07:44:33 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Nov 16 07:50:53 2017 -0500

--
 .../apache/activemq/network/ConduitBridge.java  |  3 ++-
 .../network/DemandForwardingBridgeSupport.java  |  3 ++-
 .../DurableFiveBrokerNetworkBridgeTest.java | 23 +---
 3 files changed, 5 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/1cfc9ff9/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
index 70f45f7..a4b5072 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
@@ -83,7 +83,8 @@ public class ConduitBridge extends DemandForwardingBridge {
 } else {
 //Handle the demand generated by proxy network 
subscriptions
 //The broker path is case is normal
-if (isProxyNSConsumerBrokerPath(info)) {
+if (isProxyNSConsumerBrokerPath(info) &&
+info.getSubscriptionName() != null && 
info.getSubscriptionName().startsWith(DURABLE_SUB_PREFIX)) {
 final BrokerId[] path = info.getBrokerPath();
 addProxyNetworkSubscriptionBrokerPath(ds, path, 
info.getSubscriptionName());
 //This is the durable sync case on broker restart

http://git-wip-us.apache.org/repos/asf/activemq/blob/1cfc9ff9/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index df493c3..dd7716f 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -1432,7 +1432,8 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 if (consumerInfo.isDurable()) {
 //Handle the demand generated by proxy network 
subscriptions
 //The broker path is case is normal
-if (isProxyNSConsumerBrokerPath(sub.getRemoteInfo())) {
+if (isProxyNSConsumerBrokerPath(sub.getRemoteInfo()) &&
+info.getSubscriptionName() != null && 
info.getSubscriptionName().startsWith(DURABLE_SUB_PREFIX)) {
 final BrokerId[] path = info.getBrokerPath();
 addProxyNetworkSubscriptionBrokerPath(sub, path, 
consumerInfo.getSubscriptionName());
 //This is the durable sync case on broker restart

http://git-wip-us.apache.org/repos/asf/activemq/blob/1cfc9ff9/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
index 5bbd8b8..fe07ac3 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
@@ -63,30 +63,15 @@ public class DurableFiveBrokerNetworkBridgeTest extends 
JmsMultipleBrokersTestSu
 return connector;
 }
 
-public void testDurablePropagationBrokerRestartDuplex() throws Exception {
+public void testDurabl

[4/6] activemq git commit: AMQ-6858 - handle resync of network proxy durables after restart

[cshannon]

AMQ-6858 - handle resync of network proxy durables after restart

We need to properly handle the re-addition of network proxy durables
after the brokers are restarted so removal is done properly

(cherry picked from commit 6013441a9a7c4a13f7412d6d72638de0f420e6a3)


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

Branch: refs/heads/activemq-5.15.x
Commit: 247243c9c120f5d1c526330813dcc2b8079f52c3
Parents: 39d6321
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed Nov 15 08:22:47 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Nov 16 07:50:40 2017 -0500

--
 .../apache/activemq/network/ConduitBridge.java  |  14 ++-
 .../network/DemandForwardingBridgeSupport.java  |  89 +-
 .../activemq/network/DemandSubscription.java|   6 -
 .../DurableFiveBrokerNetworkBridgeTest.java | 117 ++-
 4 files changed, 185 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/247243c9/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
index bc9d004..70f45f7 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
@@ -81,10 +81,16 @@ public class ConduitBridge extends DemandForwardingBridge {
 ds.addForcedDurableConsumer(info.getConsumerId());
 }
 } else {
-   if (isProxyNSConsumer(info)) {
-   final BrokerId[] path = info.getBrokerPath();
-   addProxyNetworkSubscription(ds, path, 
info.getSubscriptionName());
-   } else {
+//Handle the demand generated by proxy network 
subscriptions
+//The broker path is case is normal
+if (isProxyNSConsumerBrokerPath(info)) {
+final BrokerId[] path = info.getBrokerPath();
+addProxyNetworkSubscriptionBrokerPath(ds, path, 
info.getSubscriptionName());
+//This is the durable sync case on broker restart
+} else if (isProxyNSConsumerClientId(info.getClientId()) &&
+isProxyBridgeSubscription(info.getClientId(), 
info.getSubscriptionName())) {
+addProxyNetworkSubscriptionClientId(ds, 
info.getClientId(), info.getSubscriptionName());
+} else {
ds.getDurableRemoteSubs().add(new 
SubscriptionInfo(info.getClientId(), info.getSubscriptionName()));
}
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/247243c9/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 75084d1..df493c3 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -36,7 +36,6 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
 import javax.management.ObjectName;
@@ -672,31 +671,53 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 (info.getClientId() == null || 
info.getClientId().startsWith(configuration.getName()));
 }
 
-private boolean isProxyBridgeSubscription(SubscriptionInfo info) {
-if (info.getSubcriptionName() != null && info.getClientId() != null) {
-if (info.getSubscriptionName().startsWith(DURABLE_SUB_PREFIX)
-&& 
!info.getClientId().startsWith(configuration.getName())) {
+protected boolean isProxyBridgeSubscription(String clientId, String 
subName) {
+if 

[2/6] activemq git commit: AMQ-6858 - reworking durable subscription propagation fix

[cshannon]

AMQ-6858 - reworking durable subscription propagation fix

Significantly reworking previous fix so that the client id is properly
changed when tracking network proxy subscriptions. This makes it so
removal is done properly

(cherry picked from commit 41211c78d19b545a2352584d3598346aa3705be4)


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

Branch: refs/heads/activemq-5.15.x
Commit: 97fe20a5721a39b70f841f303024fa30352d7336
Parents: d5a987b
Author: Christopher L. Shannon <christopher.l.shan...@gmail.com>
Authored: Sun Nov 12 15:37:40 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Nov 16 07:50:19 2017 -0500

--
 .../apache/activemq/network/ConduitBridge.java  |   8 +-
 .../network/DemandForwardingBridgeSupport.java  |  86 ++-
 .../activemq/network/DemandSubscription.java|   8 +
 .../activemq/network/DurableConduitBridge.java  |   6 +-
 .../DurableFiveBrokerNetworkBridgeTest.java | 576 +++
 .../DurableThreeBrokerNetworkBridgeTest.java| 241 
 6 files changed, 659 insertions(+), 266 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/97fe20a5/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
index 6ced896..bc9d004 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.activemq.command.BrokerId;
 import org.apache.activemq.command.ConsumerId;
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.command.SubscriptionInfo;
@@ -80,7 +81,12 @@ public class ConduitBridge extends DemandForwardingBridge {
 ds.addForcedDurableConsumer(info.getConsumerId());
 }
 } else {
-ds.getDurableRemoteSubs().add(new 
SubscriptionInfo(info.getClientId(), info.getSubscriptionName()));
+   if (isProxyNSConsumer(info)) {
+   final BrokerId[] path = info.getBrokerPath();
+   addProxyNetworkSubscription(ds, path, 
info.getSubscriptionName());
+   } else {
+   ds.getDurableRemoteSubs().add(new 
SubscriptionInfo(info.getClientId(), info.getSubscriptionName()));
+   }
 }
 matched = true;
 // continue - we want interest to any existing 
DemandSubscriptions

http://git-wip-us.apache.org/repos/asf/activemq/blob/97fe20a5/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index efdfa5a..03e79e4 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -36,6 +36,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.management.ObjectName;
 
@@ -94,7 +95,6 @@ import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportDisposedIOException;
 import org.apache.activemq.transport.TransportFilter;
 import org.apache.activemq.transport.failover.FailoverTransport;
-import org.apache.activemq.transport.tcp.SslTransport;
 import org.apache.activemq.transport.tcp.TcpTransport;
 import org.apache.activemq.util.IdGenerator;
 import org.apache.activemq.util.IntrospectionSupport;
@@ -666,11 +666,52 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
  * @param info
  * @return
  */
-protected boolean isBridgeNS(ConsumerInfo info) {
+protected boolean isDirectBridgeConsumer(ConsumerInfo info) {
 return (info.getSubscriptionName() != null && 
info

[5/6] activemq git commit: (AMQ-6858) - test fix

[cshannon]

(AMQ-6858) - test fix

(cherry picked from commit 2e3a7f6114fae1ffb9c19ee4af2f4541fdfc238e)


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

Branch: refs/heads/activemq-5.15.x
Commit: 3285be60ede1ee6cf377d4d4eeca6fbff79d5dec
Parents: 247243c
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed Nov 15 09:21:44 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Nov 16 07:50:47 2017 -0500

--
 .../activemq/network/DurableFiveBrokerNetworkBridgeTest.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/3285be60/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
index 2d8dc03..5bbd8b8 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
@@ -74,8 +74,6 @@ public class DurableFiveBrokerNetworkBridgeTest extends 
JmsMultipleBrokersTestSu
 }
 
 protected void testDurablePropagationBrokerRestart() throws Exception {
-deletePersistentMessagesOnStartup = true;
-
 // Setup broker networks
 bridgeBrokers("Broker_A_A", "Broker_B_B");
 bridgeBrokers("Broker_B_B", "Broker_C_C");
@@ -665,6 +663,7 @@ public class DurableFiveBrokerNetworkBridgeTest extends 
JmsMultipleBrokersTestSu
 public void setUp() throws Exception {
 super.setAutoFail(true);
 super.setUp();
+deletePersistentMessagesOnStartup = true;
 String options = new String("?persistent=true=false");
 createBroker(new URI("broker:(tcp://localhost:61616)/Broker_A_A" + 
options));
 createBroker(new URI("broker:(tcp://localhost:61617)/Broker_B_B" + 
options));

[1/6] activemq git commit: AMQ-6858 - Fix several durable subscription bridge propagation issues

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 39cbdf706 -> 1cfc9ff9a


AMQ-6858 - Fix several durable subscription bridge propagation issues

Durable network proxy subs will now be properly created across multiple
bridges when 3 or more brokers are used.  Demand will be properly synced
and removed.

(cherry picked from commit 96ce14b278fef9e5f428f1c3c07ce5c09fd8f9a8)


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

Branch: refs/heads/activemq-5.15.x
Commit: d5a987b6a55233f9a83e108521746cf55d3eb32f
Parents: 39cbdf7
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon Nov 6 08:42:03 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Nov 16 07:50:12 2017 -0500

--
 .../apache/activemq/network/ConduitBridge.java  |  16 +-
 .../network/DemandForwardingBridgeSupport.java  |  49 +++-
 .../activemq/network/DurableConduitBridge.java  |  19 +-
 .../network/NetworkBridgeConfiguration.java |  13 +
 .../DurableThreeBrokerNetworkBridgeTest.java| 241 +++
 .../VerifyNetworkConsumersDisconnectTest.java   |  68 +-
 6 files changed, 384 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/d5a987b6/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
index 3c0b85b..6ced896 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
@@ -56,12 +56,16 @@ public class ConduitBridge extends DemandForwardingBridge {
 }
 
 protected boolean addToAlreadyInterestedConsumers(ConsumerInfo info, 
boolean isForcedDurable) {
-// search through existing subscriptions and see if we have a match
-if (info.isNetworkSubscription()) {
+//If a network subscription and a queue check if 
isConduitNetworkQueueSubscriptions is true
+//If true then we want to try and conduit
+//For topics we always want to conduit regardless of network 
subscription or not
+if (info.isNetworkSubscription() && info.getDestination().isQueue() &&
+!configuration.isConduitNetworkQueueSubscriptions()) {
 return false;
 }
 boolean matched = false;
 
+// search through existing subscriptions and see if we have a match
 for (DemandSubscription ds : subscriptionMapByLocalId.values()) {
 DestinationFilter filter = 
DestinationFilter.parseFilter(ds.getLocalInfo().getDestination());
 if (canConduit(ds) && filter.matches(info.getDestination())) {
@@ -86,9 +90,13 @@ public class ConduitBridge extends DemandForwardingBridge {
 }
 
 // we want to conduit statically included consumers which are local 
networkSubs
-// but we don't want to conduit remote network subs i.e. (proxy proxy) 
consumers
+// but we don't want to conduit remote network queue subs i.e. (proxy 
proxy) consumers
+// unless isConduitNetworkQueueSubscriptions is true
+// We always want to conduit topic subscriptions
 private boolean canConduit(DemandSubscription ds) {
-return ds.isStaticallyIncluded() || 
!ds.getRemoteInfo().isNetworkSubscription();
+return ds.isStaticallyIncluded() || 
ds.getRemoteInfo().getDestination().isTopic() ||
+!ds.getRemoteInfo().isNetworkSubscription() ||
+(ds.getRemoteInfo().getDestination().isQueue() && 
configuration.isConduitNetworkQueueSubscriptions());
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/activemq/blob/d5a987b6/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 879ab39..efdfa5a 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -661,6 +661,16 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge,

[3/6] activemq git commit: AMQ-6858 - Allow configuration of the client Id token in network bridge

[cshannon]

AMQ-6858 - Allow configuration of the client Id token in network bridge

The client id token that is used to separate parts of a generated local
client id in a network bridge should be configurable so bridge names and
broker names can contain underscores if desired

(cherry picked from commit 3ca439cadaa8c40f506aa1ef683b36624d216254)


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

Branch: refs/heads/activemq-5.15.x
Commit: 39d6321a4a2e9f929ba9cc451cafa8f244e3d716
Parents: 97fe20a
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Tue Nov 14 14:26:22 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Nov 16 07:50:31 2017 -0500

--
 .../network/DemandForwardingBridgeSupport.java  |  25 +-
 .../network/NetworkBridgeConfiguration.java |   9 +
 .../DurableFiveBrokerNetworkBridgeTest.java | 293 ++-
 3 files changed, 167 insertions(+), 160 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/39d6321a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 03e79e4..75084d1 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -37,6 +37,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 
 import javax.management.ObjectName;
 
@@ -492,7 +493,7 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 
 localConnectionInfo = new ConnectionInfo();
 localConnectionInfo.setConnectionId(new 
ConnectionId(idGenerator.generateId()));
-localClientId = configuration.getName() + "_" + 
remoteBrokerName + "_inbound_" + configuration.getBrokerName();
+localClientId = configuration.getName() + 
configuration.getClientIdToken() + remoteBrokerName + 
configuration.getClientIdToken() + "inbound" + configuration.getClientIdToken() 
+ configuration.getBrokerName();
 localConnectionInfo.setClientId(localClientId);
 
localConnectionInfo.setUserName(configuration.getUserName());
 
localConnectionInfo.setPassword(configuration.getPassword());
@@ -520,8 +521,8 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 
 ConnectionInfo duplexLocalConnectionInfo = new 
ConnectionInfo();
 duplexLocalConnectionInfo.setConnectionId(new 
ConnectionId(idGenerator.generateId()));
-
duplexLocalConnectionInfo.setClientId(configuration.getName() + "_" + 
remoteBrokerName + "_inbound_duplex_"
-+ configuration.getBrokerName());
+
duplexLocalConnectionInfo.setClientId(configuration.getName() + 
configuration.getClientIdToken() + remoteBrokerName + 
configuration.getClientIdToken() + "inbound" + configuration.getClientIdToken() 
+ "duplex"
++ configuration.getClientIdToken() + 
configuration.getBrokerName());
 
duplexLocalConnectionInfo.setUserName(configuration.getUserName());
 
duplexLocalConnectionInfo.setPassword(configuration.getPassword());
 
@@ -609,7 +610,7 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 }
 remoteConnectionInfo = new ConnectionInfo();
 remoteConnectionInfo.setConnectionId(new 
ConnectionId(idGenerator.generateId()));
-remoteConnectionInfo.setClientId(configuration.getName() + "_" 
+ configuration.getBrokerName() + "_outbound");
+remoteConnectionInfo.setClientId(configuration.getName() + 
configuration.getClientIdToken() + configuration.getBrokerName() + 
configuration.getClientIdToken() + "outbound");
 remoteConnectionInfo.setUserName(configuration.getUserName());

activemq git commit: AMQ-6858 - reworking durable subscription propagation fix

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master a0a23b99c -> 41211c78d


AMQ-6858 - reworking durable subscription propagation fix

Significantly reworking previous fix so that the client id is properly
changed when tracking network proxy subscriptions. This makes it so
removal is done properly


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

Branch: refs/heads/master
Commit: 41211c78d19b545a2352584d3598346aa3705be4
Parents: a0a23b9
Author: Christopher L. Shannon <christopher.l.shan...@gmail.com>
Authored: Sun Nov 12 15:37:40 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Mon Nov 13 11:07:43 2017 -0500

--
 .../apache/activemq/network/ConduitBridge.java  |   8 +-
 .../network/DemandForwardingBridgeSupport.java  |  86 ++-
 .../activemq/network/DemandSubscription.java|   8 +
 .../activemq/network/DurableConduitBridge.java  |   6 +-
 .../DurableFiveBrokerNetworkBridgeTest.java | 576 +++
 .../DurableThreeBrokerNetworkBridgeTest.java| 241 
 6 files changed, 659 insertions(+), 266 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/41211c78/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
index 6ced896..bc9d004 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.activemq.command.BrokerId;
 import org.apache.activemq.command.ConsumerId;
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.command.SubscriptionInfo;
@@ -80,7 +81,12 @@ public class ConduitBridge extends DemandForwardingBridge {
 ds.addForcedDurableConsumer(info.getConsumerId());
 }
 } else {
-ds.getDurableRemoteSubs().add(new 
SubscriptionInfo(info.getClientId(), info.getSubscriptionName()));
+   if (isProxyNSConsumer(info)) {
+   final BrokerId[] path = info.getBrokerPath();
+   addProxyNetworkSubscription(ds, path, 
info.getSubscriptionName());
+   } else {
+   ds.getDurableRemoteSubs().add(new 
SubscriptionInfo(info.getClientId(), info.getSubscriptionName()));
+   }
 }
 matched = true;
 // continue - we want interest to any existing 
DemandSubscriptions

http://git-wip-us.apache.org/repos/asf/activemq/blob/41211c78/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index efdfa5a..03e79e4 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -36,6 +36,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.management.ObjectName;
 
@@ -94,7 +95,6 @@ import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportDisposedIOException;
 import org.apache.activemq.transport.TransportFilter;
 import org.apache.activemq.transport.failover.FailoverTransport;
-import org.apache.activemq.transport.tcp.SslTransport;
 import org.apache.activemq.transport.tcp.TcpTransport;
 import org.apache.activemq.util.IdGenerator;
 import org.apache.activemq.util.IntrospectionSupport;
@@ -666,11 +666,52 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
  * @param info
  * @return
  */
-protected boolean isBridgeNS(ConsumerInfo info) {
+protected boolean isDirectBridgeConsumer(ConsumerInfo info) {
 return (info.getSubscriptionName() != null && 
i

activemq git commit: (AMQ-6858) - test fix

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 6013441a9 -> 2e3a7f611


(AMQ-6858) - test fix


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

Branch: refs/heads/master
Commit: 2e3a7f6114fae1ffb9c19ee4af2f4541fdfc238e
Parents: 6013441
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed Nov 15 09:21:44 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed Nov 15 09:21:44 2017 -0500

--
 .../activemq/network/DurableFiveBrokerNetworkBridgeTest.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/2e3a7f61/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
index 2d8dc03..5bbd8b8 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DurableFiveBrokerNetworkBridgeTest.java
@@ -74,8 +74,6 @@ public class DurableFiveBrokerNetworkBridgeTest extends 
JmsMultipleBrokersTestSu
 }
 
 protected void testDurablePropagationBrokerRestart() throws Exception {
-deletePersistentMessagesOnStartup = true;
-
 // Setup broker networks
 bridgeBrokers("Broker_A_A", "Broker_B_B");
 bridgeBrokers("Broker_B_B", "Broker_C_C");
@@ -665,6 +663,7 @@ public class DurableFiveBrokerNetworkBridgeTest extends 
JmsMultipleBrokersTestSu
 public void setUp() throws Exception {
 super.setAutoFail(true);
 super.setUp();
+deletePersistentMessagesOnStartup = true;
 String options = new String("?persistent=true=false");
 createBroker(new URI("broker:(tcp://localhost:61616)/Broker_A_A" + 
options));
 createBroker(new URI("broker:(tcp://localhost:61617)/Broker_B_B" + 
options));

activemq git commit: AMQ-6858 - handle resync of network proxy durables after restart

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 50243106c -> 6013441a9


AMQ-6858 - handle resync of network proxy durables after restart

We need to properly handle the re-addition of network proxy durables
after the brokers are restarted so removal is done properly


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

Branch: refs/heads/master
Commit: 6013441a9a7c4a13f7412d6d72638de0f420e6a3
Parents: 5024310
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed Nov 15 08:22:47 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed Nov 15 08:56:43 2017 -0500

--
 .../apache/activemq/network/ConduitBridge.java  |  14 ++-
 .../network/DemandForwardingBridgeSupport.java  |  89 +-
 .../activemq/network/DemandSubscription.java|   6 -
 .../DurableFiveBrokerNetworkBridgeTest.java | 117 ++-
 4 files changed, 185 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/6013441a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
index bc9d004..70f45f7 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
@@ -81,10 +81,16 @@ public class ConduitBridge extends DemandForwardingBridge {
 ds.addForcedDurableConsumer(info.getConsumerId());
 }
 } else {
-   if (isProxyNSConsumer(info)) {
-   final BrokerId[] path = info.getBrokerPath();
-   addProxyNetworkSubscription(ds, path, 
info.getSubscriptionName());
-   } else {
+//Handle the demand generated by proxy network 
subscriptions
+//The broker path is case is normal
+if (isProxyNSConsumerBrokerPath(info)) {
+final BrokerId[] path = info.getBrokerPath();
+addProxyNetworkSubscriptionBrokerPath(ds, path, 
info.getSubscriptionName());
+//This is the durable sync case on broker restart
+} else if (isProxyNSConsumerClientId(info.getClientId()) &&
+isProxyBridgeSubscription(info.getClientId(), 
info.getSubscriptionName())) {
+addProxyNetworkSubscriptionClientId(ds, 
info.getClientId(), info.getSubscriptionName());
+} else {
ds.getDurableRemoteSubs().add(new 
SubscriptionInfo(info.getClientId(), info.getSubscriptionName()));
}
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/6013441a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 75084d1..df493c3 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -36,7 +36,6 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
 import javax.management.ObjectName;
@@ -672,31 +671,53 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 (info.getClientId() == null || 
info.getClientId().startsWith(configuration.getName()));
 }
 
-private boolean isProxyBridgeSubscription(SubscriptionInfo info) {
-if (info.getSubcriptionName() != null && info.getClientId() != null) {
-if (info.getSubscriptionName().startsWith(DURABLE_SUB_PREFIX)
-&& 
!info.getClientId().startsWith(configuration.getName())) {
+protected boolean isProxyBridgeSubscription(String clientId, String 
subName) {
+

activemq git commit: AMQ-6858 - Fix several durable subscription bridge propagation issues

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 7dad09a9c -> 96ce14b27


AMQ-6858 - Fix several durable subscription bridge propagation issues

Durable network proxy subs will now be properly created across multiple
bridges when 3 or more brokers are used.  Demand will be properly synced
and removed.


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

Branch: refs/heads/master
Commit: 96ce14b278fef9e5f428f1c3c07ce5c09fd8f9a8
Parents: 7dad09a
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Mon Nov 6 08:42:03 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Nov 9 11:21:18 2017 -0500

--
 .../apache/activemq/network/ConduitBridge.java  |  16 +-
 .../network/DemandForwardingBridgeSupport.java  |  49 +++-
 .../activemq/network/DurableConduitBridge.java  |  19 +-
 .../network/NetworkBridgeConfiguration.java |  13 +
 .../DurableThreeBrokerNetworkBridgeTest.java| 241 +++
 .../VerifyNetworkConsumersDisconnectTest.java   |  68 +-
 6 files changed, 384 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/96ce14b2/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
index 3c0b85b..6ced896 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/ConduitBridge.java
@@ -56,12 +56,16 @@ public class ConduitBridge extends DemandForwardingBridge {
 }
 
 protected boolean addToAlreadyInterestedConsumers(ConsumerInfo info, 
boolean isForcedDurable) {
-// search through existing subscriptions and see if we have a match
-if (info.isNetworkSubscription()) {
+//If a network subscription and a queue check if 
isConduitNetworkQueueSubscriptions is true
+//If true then we want to try and conduit
+//For topics we always want to conduit regardless of network 
subscription or not
+if (info.isNetworkSubscription() && info.getDestination().isQueue() &&
+!configuration.isConduitNetworkQueueSubscriptions()) {
 return false;
 }
 boolean matched = false;
 
+// search through existing subscriptions and see if we have a match
 for (DemandSubscription ds : subscriptionMapByLocalId.values()) {
 DestinationFilter filter = 
DestinationFilter.parseFilter(ds.getLocalInfo().getDestination());
 if (canConduit(ds) && filter.matches(info.getDestination())) {
@@ -86,9 +90,13 @@ public class ConduitBridge extends DemandForwardingBridge {
 }
 
 // we want to conduit statically included consumers which are local 
networkSubs
-// but we don't want to conduit remote network subs i.e. (proxy proxy) 
consumers
+// but we don't want to conduit remote network queue subs i.e. (proxy 
proxy) consumers
+// unless isConduitNetworkQueueSubscriptions is true
+// We always want to conduit topic subscriptions
 private boolean canConduit(DemandSubscription ds) {
-return ds.isStaticallyIncluded() || 
!ds.getRemoteInfo().isNetworkSubscription();
+return ds.isStaticallyIncluded() || 
ds.getRemoteInfo().getDestination().isTopic() ||
+!ds.getRemoteInfo().isNetworkSubscription() ||
+(ds.getRemoteInfo().getDestination().isQueue() && 
configuration.isConduitNetworkQueueSubscriptions());
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/activemq/blob/96ce14b2/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 879ab39..efdfa5a 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -661,6 +661,16 @@ public abstract class DemandForwardingBridgeSupport 
implements NetworkBridge, Br
 }
 }
 
+/**
+ * Checks whether or not this consumer is a direct b

[1/2] activemq-artemis git commit: ARTEMIS-1544 Use the proper types when accessing ApplicationProperties

[cshannon]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master fdc71155c -> d9acc649a


ARTEMIS-1544 Use the proper types when accessing ApplicationProperties

Use Map to access the ApplicationProperties section
which is the spec defined type for that section.  This will prevent
breakage should proton-j be updated to reflect that in the definition of
that class.

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

Branch: refs/heads/master
Commit: 4c0466642105de0828a2d1d31f0d3c3c1f4697df
Parents: fdc7115
Author: Timothy Bish 
Authored: Thu Dec 7 13:30:53 2017 -0500
Committer: Timothy Bish 
Committed: Thu Dec 7 13:30:53 2017 -0500

--
 .../artemis/protocol/amqp/converter/AmqpCoreConverter.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4c046664/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
index 8d05b2c..fbaf0ef 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
@@ -247,8 +247,8 @@ public class AmqpCoreConverter {
 
   final ApplicationProperties ap = amqp.getApplicationProperties();
   if (ap != null) {
- for (Map.Entry entry : (Set>) ap.getValue().entrySet()) {
-setProperty(jms, entry.getKey().toString(), entry.getValue());
+ for (Map.Entry entry : (Set>) ap.getValue().entrySet()) {
+setProperty(jms, entry.getKey(), entry.getValue());
  }
   }
 

[2/2] activemq-artemis git commit: ARTEMIS-1544 - This closes #1693

[cshannon]

ARTEMIS-1544 - This closes #1693


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

Branch: refs/heads/master
Commit: d9acc649accfbbc223fc898de1f94b139a66a177
Parents: fdc7115 4c04666
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Thu Dec 7 16:01:52 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Thu Dec 7 16:01:52 2017 -0500

--
 .../artemis/protocol/amqp/converter/AmqpCoreConverter.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

activemq git commit: AMQ-6871 - By default only send generic platform details

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 9d98ee253 -> 5fa0bbd51


AMQ-6871 - By default only send generic platform details

The default behavior by the OpenWire client will be to send generic
platform details to the server with a new flag to send more specific
information.


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

Branch: refs/heads/master
Commit: 5fa0bbd5156f29d97dcf48fd9fdb6a0488a8df1a
Parents: 9d98ee2
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed Nov 29 12:43:20 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed Dec 6 08:41:51 2017 -0500

--
 .../activemq/ActiveMQConnectionMetaData.java|   1 +
 .../openwire/OpenWireFormatFactory.java |  17 +++-
 .../openwire/WireFormatInfoPropertiesTest.java  | 101 ++-
 3 files changed, 69 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/5fa0bbd5/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
index ff6c38f..38c9761 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
@@ -33,6 +33,7 @@ public final class ActiveMQConnectionMetaData implements 
ConnectionMetaData {
 public static final int PROVIDER_MAJOR_VERSION;
 public static final int PROVIDER_MINOR_VERSION;
 public static final String PROVIDER_NAME = "ActiveMQ";
+public static final String DEFAULT_PLATFORM_DETAILS = "Java";
 public static final String PLATFORM_DETAILS;
 
 public static final ActiveMQConnectionMetaData INSTANCE = new 
ActiveMQConnectionMetaData();

http://git-wip-us.apache.org/repos/asf/activemq/blob/5fa0bbd5/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
 
b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
index ba6d643..2614ad7 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
@@ -22,7 +22,7 @@ import org.apache.activemq.wireformat.WireFormat;
 import org.apache.activemq.wireformat.WireFormatFactory;
 
 /**
- * 
+ *
  */
 public class OpenWireFormatFactory implements WireFormatFactory {
 
@@ -44,8 +44,10 @@ public class OpenWireFormatFactory implements 
WireFormatFactory {
 private String host=null;
 private String providerName = ActiveMQConnectionMetaData.PROVIDER_NAME;
 private String providerVersion = 
ActiveMQConnectionMetaData.PROVIDER_VERSION;
-private String platformDetails = 
ActiveMQConnectionMetaData.PLATFORM_DETAILS;
+private String platformDetails = 
ActiveMQConnectionMetaData.DEFAULT_PLATFORM_DETAILS;
+private boolean includePlatformDetails = false;
 
+@Override
 public WireFormat createWireFormat() {
 WireFormatInfo info = new WireFormatInfo();
 info.setVersion(version);
@@ -65,6 +67,9 @@ public class OpenWireFormatFactory implements 
WireFormatFactory {
 }
 info.setProviderName(providerName);
 info.setProviderVersion(providerVersion);
+if (includePlatformDetails) {
+platformDetails = ActiveMQConnectionMetaData.PLATFORM_DETAILS;
+}
 info.setPlatformDetails(platformDetails);
 } catch (Exception e) {
 IllegalStateException ise = new IllegalStateException("Could not 
configure WireFormatInfo");
@@ -190,4 +195,12 @@ public class OpenWireFormatFactory implements 
WireFormatFactory {
 public void setPlatformDetails(String platformDetails) {
 this.platformDetails = platformDetails;
 }
+
+public boolean isIncludePlatformDetails() {
+return includePlatformDetails;
+}
+
+public void setIncludePlatformDetails(boolean includePlatformDetails) {
+this.includePlatformDetails = includePlatformDetails;
+}
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/5fa0bbd5/activemq-unit-tes

activemq git commit: AMQ-6871 - By default only send generic platform details

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.15.x 1cfc9ff9a -> d2e49be3a


AMQ-6871 - By default only send generic platform details

The default behavior by the OpenWire client will be to send generic
platform details to the server with a new flag to send more specific
information.

(cherry picked from commit 5fa0bbd5156f29d97dcf48fd9fdb6a0488a8df1a)


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

Branch: refs/heads/activemq-5.15.x
Commit: d2e49be3a8f21d862726c1f6bc9e1caa6ee8b581
Parents: 1cfc9ff
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed Nov 29 12:43:20 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed Dec 6 08:42:12 2017 -0500

--
 .../activemq/ActiveMQConnectionMetaData.java|   1 +
 .../openwire/OpenWireFormatFactory.java |  17 +++-
 .../openwire/WireFormatInfoPropertiesTest.java  | 101 ++-
 3 files changed, 69 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/d2e49be3/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
index ff6c38f..38c9761 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
@@ -33,6 +33,7 @@ public final class ActiveMQConnectionMetaData implements 
ConnectionMetaData {
 public static final int PROVIDER_MAJOR_VERSION;
 public static final int PROVIDER_MINOR_VERSION;
 public static final String PROVIDER_NAME = "ActiveMQ";
+public static final String DEFAULT_PLATFORM_DETAILS = "Java";
 public static final String PLATFORM_DETAILS;
 
 public static final ActiveMQConnectionMetaData INSTANCE = new 
ActiveMQConnectionMetaData();

http://git-wip-us.apache.org/repos/asf/activemq/blob/d2e49be3/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
 
b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
index ba6d643..2614ad7 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
@@ -22,7 +22,7 @@ import org.apache.activemq.wireformat.WireFormat;
 import org.apache.activemq.wireformat.WireFormatFactory;
 
 /**
- * 
+ *
  */
 public class OpenWireFormatFactory implements WireFormatFactory {
 
@@ -44,8 +44,10 @@ public class OpenWireFormatFactory implements 
WireFormatFactory {
 private String host=null;
 private String providerName = ActiveMQConnectionMetaData.PROVIDER_NAME;
 private String providerVersion = 
ActiveMQConnectionMetaData.PROVIDER_VERSION;
-private String platformDetails = 
ActiveMQConnectionMetaData.PLATFORM_DETAILS;
+private String platformDetails = 
ActiveMQConnectionMetaData.DEFAULT_PLATFORM_DETAILS;
+private boolean includePlatformDetails = false;
 
+@Override
 public WireFormat createWireFormat() {
 WireFormatInfo info = new WireFormatInfo();
 info.setVersion(version);
@@ -65,6 +67,9 @@ public class OpenWireFormatFactory implements 
WireFormatFactory {
 }
 info.setProviderName(providerName);
 info.setProviderVersion(providerVersion);
+if (includePlatformDetails) {
+platformDetails = ActiveMQConnectionMetaData.PLATFORM_DETAILS;
+}
 info.setPlatformDetails(platformDetails);
 } catch (Exception e) {
 IllegalStateException ise = new IllegalStateException("Could not 
configure WireFormatInfo");
@@ -190,4 +195,12 @@ public class OpenWireFormatFactory implements 
WireFormatFactory {
 public void setPlatformDetails(String platformDetails) {
 this.platformDetails = platformDetails;
 }
+
+public boolean isIncludePlatformDetails() {
+return includePlatformDetails;
+}
+
+public void setIncludePlatformDetails(boolean includePlatformDetails) {
+this.includePlatformDetails = includePlatformDetails;
+}
 }

ht

activemq git commit: AMQ-6871 - By default only send generic platform details

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 42e4a6cd9 -> 8ff18c5e2


AMQ-6871 - By default only send generic platform details

The default behavior by the OpenWire client will be to send generic
platform details to the server with a new flag to send more specific
information.

(cherry picked from commit 5fa0bbd5156f29d97dcf48fd9fdb6a0488a8df1a)


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

Branch: refs/heads/activemq-5.14.x
Commit: 8ff18c5e254bf43395f2e0d7e3a1092b33ec6462
Parents: 42e4a6c
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Authored: Wed Nov 29 12:43:20 2017 -0500
Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
Committed: Wed Dec 6 08:42:46 2017 -0500

--
 .../activemq/ActiveMQConnectionMetaData.java|   1 +
 .../openwire/OpenWireFormatFactory.java |  17 +++-
 .../openwire/WireFormatInfoPropertiesTest.java  | 101 ++-
 3 files changed, 69 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/8ff18c5e/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
index ff6c38f..38c9761 100755
--- 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java
@@ -33,6 +33,7 @@ public final class ActiveMQConnectionMetaData implements 
ConnectionMetaData {
 public static final int PROVIDER_MAJOR_VERSION;
 public static final int PROVIDER_MINOR_VERSION;
 public static final String PROVIDER_NAME = "ActiveMQ";
+public static final String DEFAULT_PLATFORM_DETAILS = "Java";
 public static final String PLATFORM_DETAILS;
 
 public static final ActiveMQConnectionMetaData INSTANCE = new 
ActiveMQConnectionMetaData();

http://git-wip-us.apache.org/repos/asf/activemq/blob/8ff18c5e/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
 
b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
index ba6d643..2614ad7 100755
--- 
a/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
@@ -22,7 +22,7 @@ import org.apache.activemq.wireformat.WireFormat;
 import org.apache.activemq.wireformat.WireFormatFactory;
 
 /**
- * 
+ *
  */
 public class OpenWireFormatFactory implements WireFormatFactory {
 
@@ -44,8 +44,10 @@ public class OpenWireFormatFactory implements 
WireFormatFactory {
 private String host=null;
 private String providerName = ActiveMQConnectionMetaData.PROVIDER_NAME;
 private String providerVersion = 
ActiveMQConnectionMetaData.PROVIDER_VERSION;
-private String platformDetails = 
ActiveMQConnectionMetaData.PLATFORM_DETAILS;
+private String platformDetails = 
ActiveMQConnectionMetaData.DEFAULT_PLATFORM_DETAILS;
+private boolean includePlatformDetails = false;
 
+@Override
 public WireFormat createWireFormat() {
 WireFormatInfo info = new WireFormatInfo();
 info.setVersion(version);
@@ -65,6 +67,9 @@ public class OpenWireFormatFactory implements 
WireFormatFactory {
 }
 info.setProviderName(providerName);
 info.setProviderVersion(providerVersion);
+if (includePlatformDetails) {
+platformDetails = ActiveMQConnectionMetaData.PLATFORM_DETAILS;
+}
 info.setPlatformDetails(platformDetails);
 } catch (Exception e) {
 IllegalStateException ise = new IllegalStateException("Could not 
configure WireFormatInfo");
@@ -190,4 +195,12 @@ public class OpenWireFormatFactory implements 
WireFormatFactory {
 public void setPlatformDetails(String platformDetails) {
 this.platformDetails = platformDetails;
 }
+
+public boolean isIncludePlatformDetails() {
+return includePlatformDetails;
+}
+
+public void setIncludePlatformDetails(boolean includePlatformDetails) {
+this.includePlatformDetails = includePlatformDetails;
+}
 }

ht

svn commit: r1019917 - in /websites/production/activemq/content/maven: ./ 5.15.2/ 5.15.2/apidocs/ 5.15.2/apidocs/org/ 5.15.2/apidocs/org/apache/ 5.15.2/apidocs/org/apache/activemq/ 5.15.2/apidocs/org/

[cshannon]

Author: cshannon
Date: Sat Oct 21 11:57:53 2017
New Revision: 1019917

Log:
Adding 5.15.2 javadocs


[This commit notification would consist of 3319 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r1019916 [2/5] - /websites/production/activemq/content/schema/core/

[cshannon]

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html
 Sat Oct 21 11:18:54 2017
@@ -0,0 +1,3162 @@
+
+
+
+Schema for namespace: http://activemq.apache.org/schema/core
+
+
+
+
+
+
+
+Root Element
+
+  ElementDescriptionClass
+  brokerAn ActiveMQ Message Broker. It 
consists of a number of transport
+connectors, network connectors and a bunch of properties which can be used to
+configure the broker as its lazily 
created.org.apache.activemq.xbean.XBeanBrokerService
+
+
+Element Summary
+
+  ElementDescriptionClass
+  abortSlowAckConsumerStrategyAbort
 slow consumers when they reach the configured threshold of slowness,
+
+default is that a consumer that has not Ack'd a message for 30 seconds is 
slow.org.apache.activemq.broker.region.policy.AbortSlowAckConsumerStrategy
+  abortSlowConsumerStrategyAbort 
slow consumers when they reach the configured threshold of slowness, default is 
slow for 30 
secondsorg.apache.activemq.broker.region.policy.AbortSlowConsumerStrategy
+  authenticationUserA 
helper object used to configure simple authentication 
pluginorg.apache.activemq.security.AuthenticationUser
+  authorizationEntryRepresents an entry 
in a {@link DefaultAuthorizationMap} for assigning
+different operations (read, write, admin) of user roles to a specific
+destination or a hierarchical wildcard area of 
destinations.org.apache.activemq.security.XBeanAuthorizationEntry
+  authorizationMaporg.apache.activemq.security.XBeanAuthorizationMap
+  authorizationPluginAn 
authorization plugin where each operation on a destination is checked
+against an 
authorizationMaporg.apache.activemq.security.AuthorizationPlugin
+  axionJDBCAdapterAxion 
specific Adapter.
+
+Axion does not seem to support ALTER statements or sub-selects.  This means:
+- We cannot auto upgrade the schema was we roll out new versions of ActiveMQ
+- We cannot delete durable sub messages that have be acknowledged by all 
consumers.org.apache.activemq.store.jdbc.adapter.AxionJDBCAdapter
+  blobJDBCAdapterThis 
JDBCAdapter inserts and extracts BLOB data using the getBlob()/setBlob()
+operations. This is a little more involved since to insert a blob you have
+to:
+
+1: insert empty blob. 2: select the blob 3: finally update the blob with data
+value.
+
+The databases/JDBC drivers that use this adapter are:
+
+
+org.apache.activemq.store.jdbc.adapter.BlobJDBCAdapter
+  brokerAn ActiveMQ Message Broker. It 
consists of a number of transport
+connectors, network connectors and a bunch of properties which can be used to
+configure the broker as its lazily 
created.org.apache.activemq.xbean.XBeanBrokerService
+  brokerServiceManages the 
life-cycle of an ActiveMQ Broker. A BrokerService consists of a
+number of transport connectors, network connectors and a bunch of properties
+which can be used to configure the broker as its lazily 
created.org.apache.activemq.broker.BrokerService
+  bytesJDBCAdapterThis 
JDBCAdapter inserts and extracts BLOB data using the
+setBytes()/getBytes() operations. The databases/JDBC drivers that use this
+adapter 
are:org.apache.activemq.store.jdbc.adapter.BytesJDBCAdapter
+  cachedLDAPAuthorizationMapA 
{@link DefaultAuthorizationMap} implementation which uses LDAP to initialize 
and update authorization
+policy.org.apache.activemq.security.CachedLDAPAuthorizationMap
+  cachedMessageGroupMapFactoryA 
factory to create instances of {@link 
org.apache.activemq.broker.region.group.CachedMessageGroupMap} when 
implementing the
+http://activemq.apache.org/message-groups.html;>Message Groups 
functionality.org.apache.activemq.broker.region.group.CachedMessageGroupMapFactory
+  camelEndpointLoaderA 
helper bean which populates a {@link CamelContext} with ActiveMQ Queue 
endpointsorg.apache.activemq.camel.component.CamelEndpointLoader
+  camelRoutesBrokerPluginA 
CamelRoutesBrokerPlugin
+
+load camel routes dynamically from a routes.xml file located in same directory 
as 
ActiveMQ.xmlorg.apache.activemq.camel.camelplugin.CamelRoutesBrokerPlugin
+  compositeDemandForwardingBridgeA
 demand forwarding bridge which works with multicast style transports where
+a single Transport could be communicating with multiple remote 
brokersorg.apache.activemq.network.CompositeDemandForwardingBridge
+  compositeQueueRepresents a 
virtual queue which forwards to a number of other 
destinations.org.apache.activemq.broker.region.virtual.CompositeQueue
+  compositeTopicRepresents a 
virtual topic which forwards to a number of other 
destinations.org.apache.activemq.broker.region.virtual.CompositeTopic
+  conditionalNetworkBridgeFilterFactoryimplement
 conditional behavior for queue consumers, allows replaying back to
+origin if no consumers are present on 

svn commit: r1019916 [3/5] - /websites/production/activemq/content/schema/core/

[cshannon]

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc
==
Binary file - no diff available.

Propchange: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc
--
svn:mime-type = application/pgp-signature

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc.md5
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc.md5
 Sat Oct 21 11:18:54 2017
@@ -0,0 +1,17 @@
+
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2-schema.html.asc.md5
 not found in local storage of repository Releases 
[id=releases]
+
+
+https://repository.apache.org/favicon.png;>
+
+
+https://repository.apache.org/static/css/Sonatype-content.css?2.13.0-01; 
type="text/css" media="screen" title="no title" charset="utf-8">
+  
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2-schema.html.asc.md5
 not found in local storage of repository Releases 
[id=releases]
+Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2-schema.html.asc.md5
 not found in local storage of repository Releases [id=releases]
+  
+

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc.sha1
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc.sha1
 Sat Oct 21 11:18:54 2017
@@ -0,0 +1,17 @@
+
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2-schema.html.asc.sha1
 not found in local storage of repository Releases 
[id=releases]
+
+
+https://repository.apache.org/favicon.png;>
+
+
+https://repository.apache.org/static/css/Sonatype-content.css?2.13.0-01; 
type="text/css" media="screen" title="no title" charset="utf-8">
+  
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2-schema.html.asc.sha1
 not found in local storage of repository Releases 
[id=releases]
+Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2-schema.html.asc.sha1
 not found in local storage of repository Releases [id=releases]
+  
+

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.md5
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.md5
 Sat Oct 21 11:18:54 2017
@@ -0,0 +1 @@
+759fd80bdd02d9d7c5cd99c010ab3930
\ No newline at end of file

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.sha1
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.sha1
 Sat Oct 21 11:18:54 2017
@@ -0,0 +1 @@
+99bd0b382706cbea405a552718642f94c8b7f502
\ No newline at end of file

svn commit: r1019916 [1/5] - /websites/production/activemq/content/schema/core/

[cshannon]

Author: cshannon
Date: Sat Oct 21 11:18:54 2017
New Revision: 1019916

Log:
adding 5.15.2 schema

Added:

websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html

websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc
   (with props)

websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc.md5

websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.asc.sha1

websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.md5

websites/production/activemq/content/schema/core/activemq-core-5.15.2-schema.html.sha1
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd

websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc   
(with props)

websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc.md5

websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc.sha1

websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.md5

websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.sha1
websites/production/activemq/content/schema/core/activemq-core.xsd   (with 
props)

svn commit: r1019916 [5/5] - /websites/production/activemq/content/schema/core/

[cshannon]

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc
==
Binary file - no diff available.

Propchange: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc
--
svn:mime-type = application/pgp-signature

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc.md5
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc.md5
 Sat Oct 21 11:18:54 2017
@@ -0,0 +1,17 @@
+
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2.xsd.asc.md5 
not found in local storage of repository Releases 
[id=releases]
+
+
+https://repository.apache.org/favicon.png;>
+
+
+https://repository.apache.org/static/css/Sonatype-content.css?2.13.0-01; 
type="text/css" media="screen" title="no title" charset="utf-8">
+  
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2.xsd.asc.md5 
not found in local storage of repository Releases [id=releases]
+Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2.xsd.asc.md5 
not found in local storage of repository Releases [id=releases]
+  
+

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc.sha1
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.asc.sha1
 Sat Oct 21 11:18:54 2017
@@ -0,0 +1,17 @@
+
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2.xsd.asc.sha1 
not found in local storage of repository Releases 
[id=releases]
+
+
+https://repository.apache.org/favicon.png;>
+
+
+https://repository.apache.org/static/css/Sonatype-content.css?2.13.0-01; 
type="text/css" media="screen" title="no title" charset="utf-8">
+  
+  
+404 - Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2.xsd.asc.sha1 
not found in local storage of repository Releases [id=releases]
+Path 
/org/apache/activemq/activemq-spring/5.15.2/activemq-spring-5.15.2.xsd.asc.sha1 
not found in local storage of repository Releases [id=releases]
+  
+

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.md5 
(added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.md5 
Sat Oct 21 11:18:54 2017
@@ -0,0 +1 @@
+bbf6e2c4de0eb5194d10a672758b5597
\ No newline at end of file

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.sha1 
(added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.15.2.xsd.sha1 
Sat Oct 21 11:18:54 2017
@@ -0,0 +1 @@
+9a13f4ba8bcbcd56bfb98b6d4dc995d680aa19e7
\ No newline at end of file

Added: websites/production/activemq/content/schema/core/activemq-core.xsd
==
--- websites/production/activemq/content/schema/core/activemq-core.xsd (added)
+++ websites/production/activemq/content/schema/core/activemq-core.xsd Sat Oct 
21 11:18:54 2017
@@ -0,0 +1 @@
+link activemq-core-5.15.2.xsd
\ No newline at end of file

Propchange: websites/production/activemq/content/schema/core/activemq-core.xsd
--
svn:special = *

svn commit: r22604 - /dev/activemq/activemq/5.15.2/

[cshannon]

Author: cshannon
Date: Sat Oct 21 11:15:55 2017
New Revision: 22604

Log:
removed staging 5.15.2

Removed:
dev/activemq/activemq/5.15.2/