activemq git commit: address npe in intermittent failure in ci

2016-08-30 Thread gtully
Repository: activemq
Updated Branches:
  refs/heads/master de4f4e406 -> bf5b1fcfc


address npe in intermittent failure in ci


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

Branch: refs/heads/master
Commit: bf5b1fcfce6b8f5ee216ddeabc39039b04a78fb7
Parents: de4f4e4
Author: gtully 
Authored: Tue Aug 30 15:39:49 2016 +0100
Committer: gtully 
Committed: Tue Aug 30 15:39:49 2016 +0100

--
 .../activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java   | 5 +
 .../org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java | 2 ++
 2 files changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/bf5b1fcf/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java
index fb04803..f2b176d 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java
@@ -117,7 +117,7 @@ public class DbRestartJDBCQueueMasterSlaveTest extends 
JDBCQueueMasterSlaveTest
 ActiveMQMessage mqMessage = (ActiveMQMessage) message;
 MessageId id = mqMessage.getMessageId();
 dbConnection = sharedDs.getConnection();
-PreparedStatement s = 
dbConnection.prepareStatement(((JDBCPersistenceAdapter) 
connectedToBroker().getPersistenceAdapter()).getStatements().getFindMessageStatement());
+PreparedStatement s = 
dbConnection.prepareStatement(findStatement);
 s.setString(1, id.getProducerId().toString());
 s.setLong(2, id.getProducerSequenceId());
 ResultSet rs = s.executeQuery();
@@ -143,7 +143,4 @@ public class DbRestartJDBCQueueMasterSlaveTest extends 
JDBCQueueMasterSlaveTest
 }
 }
 
-private BrokerService connectedToBroker() {
-return 
((ActiveMQConnection)receiveConnection).getBrokerInfo().getBrokerName().equals("master")
 ? master : slave.get();
-}
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/bf5b1fcf/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
index 0547b7c..1d987bf 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java
@@ -38,11 +38,13 @@ public class JDBCQueueMasterSlaveTest extends 
QueueMasterSlaveTestSupport {
 protected SyncCreateDataSource sharedDs;
 protected String MASTER_URL = "tcp://localhost:62001";
 protected String SLAVE_URL  = "tcp://localhost:62002";
+protected String findStatement;
 
 protected void setUp() throws Exception {
 // startup db
 sharedDs = new SyncCreateDataSource((EmbeddedDataSource) 
DataSourceServiceSupport.createDataSource(IOHelper.getDefaultDataDirectory()));
 super.setUp();
+findStatement = ((JDBCPersistenceAdapter) 
master.getPersistenceAdapter()).getStatements().getFindMessageStatement();
 }
 
 protected void tearDown() throws Exception {



activemq git commit: https://issues.apache.org/jira/browse/AMQ-6408

2016-08-30 Thread tabish
Repository: activemq
Updated Branches:
  refs/heads/master bf5b1fcfc -> 1595912bb


https://issues.apache.org/jira/browse/AMQ-6408

Update to latest proton-j 0.14.0

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

Branch: refs/heads/master
Commit: 1595912bbf3225c8d1a92cf9a0d54746756c6c12
Parents: bf5b1fc
Author: Timothy Bish 
Authored: Tue Aug 30 11:00:27 2016 -0400
Committer: Timothy Bish 
Committed: Tue Aug 30 11:00:53 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/activemq/blob/1595912b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 25610bd..ca92b3f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
 1.1.2
 1.4.0
 3.4.6
-0.13.1
+0.14.0
 0.10.0
 4.0.40.Final
 1.3



activemq git commit: https://issues.apache.org/jira/browse/AMQ-6408

2016-08-30 Thread tabish
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x a99edb817 -> 8e994366b


https://issues.apache.org/jira/browse/AMQ-6408

Update to latest proton-j 0.14.0
(cherry picked from commit 1595912bbf3225c8d1a92cf9a0d54746756c6c12)


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

Branch: refs/heads/activemq-5.14.x
Commit: 8e994366b3c5e7540296d80a12ae2569010743cb
Parents: a99edb8
Author: Timothy Bish 
Authored: Tue Aug 30 11:00:27 2016 -0400
Committer: Timothy Bish 
Committed: Tue Aug 30 11:02:10 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/activemq/blob/8e994366/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 26399c8..61db725 100755
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
 1.1.2
 1.4.0
 3.4.6
-0.13.1
+0.14.0
 0.10.0
 4.0.40.Final
 1.3



activemq git commit: https://issues.apache.org/jira/browse/AMQ-6409

2016-08-30 Thread tabish
Repository: activemq
Updated Branches:
  refs/heads/master 1595912bb -> a4cd4dc67


https://issues.apache.org/jira/browse/AMQ-6409

Update Netty to 4.0.41.Final

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

Branch: refs/heads/master
Commit: a4cd4dc674be0dbe8ed98c4098e98dc449d76d95
Parents: 1595912
Author: Timothy Bish 
Authored: Tue Aug 30 11:04:43 2016 -0400
Committer: Timothy Bish 
Committed: Tue Aug 30 11:04:43 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/activemq/blob/a4cd4dc6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ca92b3f..fe58e7f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
 3.4.6
 0.14.0
 0.10.0
-4.0.40.Final
+4.0.41.Final
 1.3
 1.0
 9.5.1-5



activemq git commit: https://issues.apache.org/jira/browse/AMQ-6409

2016-08-30 Thread tabish
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 8e994366b -> 26f665b82


https://issues.apache.org/jira/browse/AMQ-6409

Update Netty to 4.0.41.Final
(cherry picked from commit a4cd4dc674be0dbe8ed98c4098e98dc449d76d95)


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

Branch: refs/heads/activemq-5.14.x
Commit: 26f665b8223bd60a6278b67b90ce4c803b3e8b7c
Parents: 8e99436
Author: Timothy Bish 
Authored: Tue Aug 30 11:04:43 2016 -0400
Committer: Timothy Bish 
Committed: Tue Aug 30 11:05:11 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/activemq/blob/26f665b8/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 61db725..1ee9e2c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
 3.4.6
 0.14.0
 0.10.0
-4.0.40.Final
+4.0.41.Final
 1.3
 1.0
 9.5.1-5



Jenkins build is still unstable: ActiveMQ-Java7-All-UnitTests #515

2016-08-30 Thread Apache Jenkins Server
See 



activemq-artemis git commit: small tweak on rebase script

2016-08-30 Thread clebertsuconic
Repository: activemq-artemis
Updated Branches:
  refs/heads/master e3af370c2 -> 6bb156cbd


small tweak on rebase script


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

Branch: refs/heads/master
Commit: 6bb156cbdec5f4e0dfc3d99a6401c388b72420f0
Parents: e3af370
Author: Clebert Suconic 
Authored: Tue Aug 30 10:44:10 2016 -0400
Committer: Clebert Suconic 
Committed: Tue Aug 30 10:49:11 2016 -0400

--
 scripts/rebase-donation.sh | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6bb156cb/scripts/rebase-donation.sh
--
diff --git a/scripts/rebase-donation.sh b/scripts/rebase-donation.sh
index 6cb4a10..1cec299 100755
--- a/scripts/rebase-donation.sh
+++ b/scripts/rebase-donation.sh
@@ -18,10 +18,15 @@
 
 # more information about this script at 
https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/history.md
 
-git remote add hornetq https://github.com/hornetq/hornetq.git
-git fetch hornetq
-git checkout hornetq/apache-donation -B donation
-git checkout apache/master -B master-donation
+git remote add -f temp-hornetq https://github.com/hornetq/hornetq.git
+git remote add -f temp-upstream https://github.com/apache/activemq-artemis.git
+
+set -e
+git fetch temp-hornetq
+git fetch temp-upstream
+git checkout temp-hornetq/apache-donation -B donation
+git checkout temp-upstream/master -B master-donation
 git rebase donation
-git remote rm hornetq
+git remote rm temp-hornetq
+git remote rm temp-upstream
 git branch -D donation



svn commit: r996281 - in /websites/production/activemq/content: cache/main.pageCache what-is-the-prefetch-limit-for.html

2016-08-30 Thread buildbot
Author: buildbot
Date: Tue Aug 30 15:22:28 2016
New Revision: 996281

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/what-is-the-prefetch-limit-for.html

Modified: websites/production/activemq/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: 
websites/production/activemq/content/what-is-the-prefetch-limit-for.html
==
--- websites/production/activemq/content/what-is-the-prefetch-limit-for.html 
(original)
+++ websites/production/activemq/content/what-is-the-prefetch-limit-for.html 
Tue Aug 30 15:22:28 2016
@@ -43,7 +43,7 @@

 
 
-Apache ActiveMQ ™ -- What is the prefetch limit for
+Apache ActiveMQ ™ -- What is the Prefetch Limit For?
 
 
 
@@ -70,7 +70,7 @@
 
 
   
-Community > FAQ > Using Apache ActiveMQ > What is the prefetch limit for
+Community > FAQ > Using Apache ActiveMQ > What is the Prefetch Limit For?
   
   
 Download | http://activemq.apache.org/maven/apidocs/index.html";>JavaDocs More... | Source | Forums | Support
@@ -81,56 +81,17 @@
   
 
 
-One of the aims of ActiveMQ is to be 
a high performance message bus. This means using a SEDA architecture to perform as much work as possible 
asynchronously. To be able to achieve high performance it is important to 
stream messages to consumers as fast as possible so that the consumer always 
has a buffer of messages, in RAM, ready to process - rather than have them 
explicitly pull messages from the server which adds significant latency per 
message.
-
-There is a danger however that this aggressive pushing of messages to the 
consumers could flood a consumer as typically its much faster to deliver 
messages to the consumer than it often is to actually process them.
-
-So ActiveMQ uses a prefetch limit on how many messages can 
be streamed to a consumer at any point in time. Once the prefetch limit is 
reached, no more messages are dispatched to the consumer until the consumer 
starts sending back acknowledgements of messages (to indicate that the message 
has been processed). The actual prefetch limit value can be specified on a per 
consumer basis.
-
-Its a good idea to have large values of the prefetch limit if you want high 
performance and if you have high message volumes. If you have very few messages 
and each message takes a very long time to process you might want to set the 
prefetch value to 1 so that a consumer is given one message at a time. 
Specifying a prefetch limit of zero means the consumer will poll for more 
messages, one at a time, instead of the message being pushed to the 
consumer.
-
-Specifying the 
PrefetchPolicy
-
-You can specify an instance of the http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQPrefetchPolicy.html";>ActiveMQPrefetchPolicy
 on an http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnectionFactory.html";>ActiveMQConnectionFactory
 or http://activemq.apache.org/maven/activemq-core/apidocs/org/apache/activemq/ActiveMQConnection.html";>ActiveMQConnection.
 This allows you to configure all the individual prefetch values; as each 
different quality of service has a different value. e.g.
-
-persistent queues   (default value: 1000)non-persistent 
queues  (default value: 1000)persistent topics  (default value: 
100)non-persistent topics  (default value: Short.MAX_VALUE 
-1)
-
-
-It can also be configured on the connection URI used when establishing a 
connection the broker:
-
-To change the prefetch size for all consumer types you would use a 
connection URI similar to:
-
-
-tcp://localhost:61616?jms.prefetchPolicy.all=50
+One of the aims of ActiveMQ is to be 
a high performance message bus. This means using a SEDA architecture to perform as much work as possible 
asynchronously. To be able to achieve high performance it is important to 
stream messages to consumers as fast as possible so that the consumer always 
has a buffer of messages, in RAM, ready to process - rather than have them 
explicitly pull messages from the server which adds significant latency per 
message.There is a danger however that this aggressive pushing of 
messages to the consumers could flood a consumer as typically its much faster 
to deliver messages to the consumer than it often is to actually process 
them.Consumers th
 at are unable to cache prefetched messages dispatched to them by the broker 
must set the prefetch to 1. An example of such a consumer would be a client 
implemented in a dynamic scripting language like, say, Ruby connecting via 
STOMP.ActiveMQ uses the prefetch limit to 
govern how many messages can be streamed to a consumer at any point in time. 
Once the prefetch limit is reached, no mo

svn commit: r996286 - in /websites/production/activemq/content: cache/main.pageCache consumer-dispatch-async.html destination-options.html what-is-the-prefetch-limit-for.html

2016-08-30 Thread buildbot
Author: buildbot
Date: Tue Aug 30 16:22:09 2016
New Revision: 996286

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/consumer-dispatch-async.html
websites/production/activemq/content/destination-options.html
websites/production/activemq/content/what-is-the-prefetch-limit-for.html

Modified: websites/production/activemq/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/activemq/content/consumer-dispatch-async.html
==
--- websites/production/activemq/content/consumer-dispatch-async.html (original)
+++ websites/production/activemq/content/consumer-dispatch-async.html Tue Aug 
30 16:22:09 2016
@@ -82,15 +82,15 @@
   
 
 
-OverviewIn AMQ4, the choice of a 
broker performing synchronous or asynchronous dispatch to a consumer has become 
more configurable. It is now configured as a default value on the connection URI, 
Connection and ConnectionFactory together with being customizable on a per 
consumer basis via the Destination Options instead previously just 
being a transport server setting.This makes more sense since you want to 
do async message delivery to slower consumers, but do sync message delivery to 
faster consumers (to avoid the synchronization and context switching costs of 
adding another seda queue). The downside to using sync message delivery is that 
the producer is more likely to block if there is a slow consumer that he is 
dispatching messages to.The default setting is dispatchAsync=
 true which is the best setting for high performance. If you want to deal 
better with slow consumers you will want to enable this setting. If you want 
better thoughput and the chances of having a slow consumer are low, you may 
want to change this to false.Configuring
 Async Dispatch at the ConnectionFactory Level
+OverviewFrom ActiveMQ v4: the 
choice of a broker performing synchronous or asynchronous dispatch to a 
consumer has become more configurable. It is now configured as a default value 
on the connection URI, 
Connection and ConnectionFactory as well as with being customizable on a 
per consumer basis via the Destination Options instead previously just 
being a transport server setting.This makes more sense since you want to 
do asynchronous message delivery to slower consumers, but synchronous message 
delivery for faster consumers (to avoid the synchronization and context 
switching costs of adding another SEDA queue). The downside to using 
synchronous message delivery is that the producer is more likely to block if 
there is a slow consumer that he is dispatching messages to.The def
 ault setting is dispatchAsync=true which is 
the best setting for high performance. If you want to deal better with slow 
consumers you will want to enable this setting. If you want better throughput 
and the chances of having a slow consumer are low, you may want to change this 
to dispatchAsync=false.Configuring
 Async Dispatch at the ConnectionFactory Level
 ((ActiveMQConnectionFactory)connectionFactory).setDispatchAsync(false);
 
-Configuring
 Dispatch Async at the Connection LevelConfiguring the dispatchAsync 
setting at this level overrides the settings at the connection factory 
level.Configuring
 Dispatch Async at the Consumer Level using the Destination 
URIConfiguring the dispatchAsync using Destination Options overrides the settings 
at the connection and connection factory level.
+Configuring
 Dispatch Async at the Connection LevelConfiguring 
the dispatchAsync setting at this level 
overrides the settings at the connection factory level.Configuring
 Dispatch Async at the Consumer Level using the Destination 
URIConfiguring the dispatchAsync 
using Destination Options 
overrides the settings at the connection and connection factory level.
 queue = new 
ActiveMQQueue("TEST.QUEUE?consumer.dispatchAsync=false");
 consumer = session.createConsumer(queue);
 
-Disabling
 Async Dispatch on Broker's Transport ConnectorIt is possible to 
disable async dispatch on a specific transport connector via the 
disableAsyncDispatch property. Once disabled for this transport, it cannot be 
enabled by individual clients.
-
+Disabling
 Async Dispatch on Broker's Transport ConnectorIt is possible to 
disable async dispatch on a specific transport connector via 
the disableAsyncDispatch property. Once 
disabled for this transport, it cannot be enabled by individual 
clients.
+
 
    
 

Modified: websites/production/activemq/content/destination-options.html

svn commit: r996289 - in /websites/production/activemq/content: activemq-inactivitymonitor.html cache/main.pageCache configuring-wire-formats.html

2016-08-30 Thread buildbot
Author: buildbot
Date: Tue Aug 30 17:22:20 2016
New Revision: 996289

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/activemq-inactivitymonitor.html
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/configuring-wire-formats.html

Modified: websites/production/activemq/content/activemq-inactivitymonitor.html
==
--- websites/production/activemq/content/activemq-inactivitymonitor.html 
(original)
+++ websites/production/activemq/content/activemq-inactivitymonitor.html Tue 
Aug 30 17:22:20 2016
@@ -32,6 +32,15 @@
 
 

svn commit: r996294 [2/2] - in /websites/production/activemq/content: activemq-connection-uris.html cache/main.pageCache configuring-transports.html configuring-version-5-transports.html connection-co

2016-08-30 Thread buildbot
Modified: 
websites/production/activemq/content/configuring-version-5-transports.html
==
--- websites/production/activemq/content/configuring-version-5-transports.html 
(original)
+++ websites/production/activemq/content/configuring-version-5-transports.html 
Tue Aug 30 18:22:16 2016
@@ -82,7 +82,7 @@
   
 
 
-Transport 
configuration optionsOne of the first kinds of URI you are likely to 
use is a transport URI to connect to a broker using a kind of transport. 
Generally TCP or VM are the first transports you'll use.Be careful about whitespaceAll of the following URI 
configurations are based on the java.net.URI class which does not allow 
whitespace to be used. So if you are using failover: or 
static: URIs, do not put any whitespace around the 
, symbol.The AUTO 
TransportStarting with 5.13.0 ActiveMQ has
  support for automatic wire protocol detection over TCP, SSL, NIO, and NIO 
SSL.  OpenWire, STOMP, AMQP, and MQTT are supported.  For details see 
the AUTO Transport Reference.The VM TransportThe 
VM transport allows clients to connect to each other inside the VM without the 
overhead of the network communication. The connection used is not that of a 
socket connection but instead uses direct method invocations to enable a high 
performance embedded messaging system.The first client to use the VM 
connection will boot an embedded broker. Subsequent connections will attach 
that the same broker. Once all VM connections to the broker have been closed, 
the embedded broker will automatically shutdown.For more information see 
the VM Transport 
ReferenceThe AM
 QP TransportAs of 5.8.0 ActiveMQ has support for AMQP. For details see 
the AMQP Transport Reference.The MQTT 
TransportStarting with 5.6.0 ActiveMQ also supports http://mqtt.org/"; rel="nofollow">MQTT. Its a 
light weight publish/subscribe messaging transport. See the MQTT Transport Reference for details.The TCP TransportThe 
TCP transport allows clients to connect a remote ActiveMQ using a a TCP 
socket.For more information see the TCP Transport ReferenceThe NIO 
TransportSame as the TCP transport, except that the http://en.wikipedia.org/wiki/New_I/O"; rel="
 nofollow">New I/O (NIO) package is used, which may provide better 
performance. The Java NIO package should not be confused with IBM's http://java.sys-con.com/read/46658.htm"; rel="nofollow">AIO4J  
package.To switch from TCP to NIO, simply change the scheme portion of 
the URI. Here's an example as defined within a broker's XML configuration 
file.
+Transport 
configuration optionsOne of the first kinds of URI you are likely to 
use is a transport URI to connect to a broker using a kind of transport. 
Generally TCP or VM are the first transports you'll use.Be careful about whitespaceAll of the following URI 
configurations are based on the java.net.URI class which does not allow 
whitespace to be used. So if you are using 
failover: 
or static: URIs, do not put any whitespace 
around the ',' symbol.The AUTO Tran
 sportStarting with 5.13.0 ActiveMQ has support for automatic wire 
protocol detection over TCP, SSL, NIO, and NIO SSL.  OpenWire, STOMP, 
AMQP, and MQTT are supported.  For details see the AUTO Transport Reference.The VM TransportThe 
VM transport allows clients to connect to each other inside the VM without the 
overhead of the network communication. The connection used is not that of a 
socket connection but instead uses direct method invocations to enable a high 
performance embedded messaging system.The first client to use the VM 
connection will boot an embedded broker. Subsequent connections will attach 
that the same broker. Once all VM connections to the broker have been closed, 
the embedded broker will automatically shutdown.For more information see 
the VM Transport 
ReferenceThe AMQP TransportAs of 5.8.0 
ActiveMQ has support for AMQP. For details see the AMQP Transport Reference.The MQTT 
TransportStarting with 5.6.0 ActiveMQ also supports http://mqtt.org/"; rel="nofollow">MQTT. Its a 
light weight publish/subscribe messaging transport. See the MQTT Transport Reference for details.The TCP TransportThe 
TCP transport allows clients to connect a remote ActiveMQ using a a TCP 
socket.For more information see the TCP Transport ReferenceThe NIO 
TransportSame as the TCP transport, except that the http://en.wikipedia.org/wiki/New_I/O"; rel="nofollow">New I/O (NIO) 
package is used, which may provide better performance. The Java NIO package 
should not be confused with IBM's http://java.sys-con.com/read/46658.htm"; rel="nofollow">AIO4J  
package.To switch from TCP to NIO, simply change the scheme portion of 
the URI. Here's an example as defined within a broker's XML configuration 
file.
 
   ...
   
@@ -91,7 +91,7 @@
   ...
 
 
-Trying to use nio transport url on the client side will 
instantiate the regular TCP transport.For more information see 

svn commit: r996294 [1/2] - in /websites/production/activemq/content: activemq-connection-uris.html cache/main.pageCache configuring-transports.html configuring-version-5-transports.html connection-co

2016-08-30 Thread buildbot
Author: buildbot
Date: Tue Aug 30 18:22:16 2016
New Revision: 996294

Log:
Production update by buildbot for activemq

Added:
websites/production/activemq/content/activemq-connection-uris.html
Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/configuring-transports.html
websites/production/activemq/content/configuring-version-5-transports.html
websites/production/activemq/content/connection-configuration-uri.html
websites/production/activemq/content/using-activemq.html

Added: websites/production/activemq/content/activemq-connection-uris.html
==
--- websites/production/activemq/content/activemq-connection-uris.html (added)
+++ websites/production/activemq/content/activemq-connection-uris.html Tue Aug 
30 18:22:16 2016
@@ -0,0 +1,175 @@
+http://www.w3.org/TR/html4/loose.dtd";>
+
+
+
+http://activemq.apache.org/styles/site.css"; rel="stylesheet" 
type="text/css"/>
+http://activemq.apache.org/styles/type-settings.css"; 
rel="stylesheet" type="text/css"/>
+http://activemq.apache.org/styles/prototype.js"; 
type="text/javascript">
+http://activemq.apache.org/styles/rico.js"; 
type="text/javascript">
+http://activemq.apache.org/styles/site.js"; 
type="text/javascript">
+
+  .maincontent { overflow:hidden; }
+
+
+
+   
+   
+   
+   
+   
+ 
+   
+SyntaxHighlighter.defaults['toolbar'] = false; 
+SyntaxHighlighter.all(); 
+   
+
+
+Apache ActiveMQ ™ -- ActiveMQ Connection URIs
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+
+
+
+   
+   
+http://activemq.apache.org"; 
title="The most popular and powerful open source Message Broker">ActiveMQ 
™
+http://www.apache.org"; title="The 
Apache Software Foundation">ASF
+   
+
+
+
+  
+Using ActiveMQ > Configuring Transports > ActiveMQ Connection URIs
+  
+  
+Download | http://activemq.apache.org/maven/apidocs/index.html";>JavaDocs More... | Source | Forums | Support
+  
+
+
+  
+  
+
+
+Transport 
configuration optionsOne of the first kinds of URI you are likely to 
use is a transport URI to connect to a broker using a kind of transport. 
Generally TCP or VM are the first transports you'll use.Be careful about whitespaceAll of the following URI 
configurations are based on the java.net.URI class which does not allow 
whitespace to be used. So if you are using 
failover: 
or static: URIs, do not put any whitespace 
around the ',' symbol.The AUTO TransportS
 tarting with 5.13.0 ActiveMQ has support for automatic wire protocol detection 
over TCP, SSL, NIO, and NIO SSL.  OpenWire, STOMP, AMQP, and MQTT are 
supported.  For details see the AUTO 
Transport Reference.The 
VM TransportThe VM transport allows clients to connect to each other 
inside the VM without the overhead of the network communication. The connection 
used is not that of a socket connection but instead uses direct method 
invocations to enable a high performance embedded messaging system.The 
first client to use the VM connection will boot an embedded broker. Subsequent 
connections will attach that the same broker. Once all VM connections to the 
broker have been closed, the embedded broker will automatically 
shutdown.For more information see the VM Transport ReferenceThe AMQP TransportAs of 5.8.0 ActiveMQ has support for 
AMQP. For details see the AMQP Transport 
Reference.The MQTT 
TransportStarting with 5.6.0 ActiveMQ also supports http://mqtt.org/"; rel="nofollow">MQTT. Its a 
light weight publish/subscribe messaging transport. See the MQTT Transport Reference for details.The TCP TransportThe TCP 
transport allows clients to connect a remote ActiveMQ using a a TCP 
socket.For more information see the TCP Transport ReferenceThe NIO TransportSame as 
the TCP transport, except that the http://en.wikipedia.org/wiki/New_I/O"; rel="nof
 ollow">New I/O (NIO) package is used, which may provide better 
performance. The Java NIO package should not be confused with IBM's http://java.sys-con.com/read/46658.htm"; rel="nofollow">AIO4J  
package.To switch from TCP to NIO, simply change the scheme portion of 
the URI. Here's an example as defined within a broker's XML configuration 
file.
+
+  ...
+  
+  
+  
+  ...
+
+
+Trying to use nio transport url on the client side will 
instantiate the regular TCP transport. For more information see the NIO Transport 
ReferenceThe SSL 
TransportThis allows you to talk over TCP using SSL. For more 
information see the SSL 
Transport ReferenceThe NIO SSL TransportAvailabilityAvailable since 
5.6Implementing SSL transport over NIO. This allows you to 
connect 

[CONF] Apache ActiveMQ > Per Destination Policies

2016-08-30 Thread Matt Pavlovich (Confluence)
Title: Message Title



 
 
 
 
 
 
 

Matt Pavlovich edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
Change comment: fix 'advisory' spelling 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Per Destination Policies 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 
 Common Property  
 Default Value  
 Description  
 
 
  producerFlowControl   
  true   
 If true the broker will throttle (flow-control) the producer. Throttling is achieved either by withholding the producer's ACK or by raising a javax.jms.ResourceAllocationException (that's propagated back to the client) when local resources e.g., memory and/or storage, have been exhausted. If false excess messages will be written to the message store to prevent memory exhaustion. However, when the message store reaches capacity the producer will be throttled until resources are freed.  
 
 
  enableAudit   
  true   
 When true the broker will track duplicate messages. Duplicates can happen for non-persistent messages during failover.  
 
 
  useCache   
  true   
 If true persistent messages are cached for fast retrieval from store.  
 
 
  maxPageSize   
  200   
 The maximum number of messages to page in from the store at one time. Increase this value to improve performance for queue destination's that contain grouped messages that are consumed by multiple concurrent consumers.  
 
 
  maxBrowsePageSize   
  400   
 The maximum number of messages to page in from the store at one time for a browser.  
 
 
  memoryLimit   
  n/a   
 The memory limit (in bytes) of the destination's cursor. This memory limit is subordinate to the system level memory limit, as specified by the / attribute. There is no default for this value; it simply acts as a child to the overall broker memory until the broker memory is exhausted.  Note: when this limit is specified the destination's cursorMemoryHighWaterMark will be applied against it and not the /> memory limit.  
 
 
  minimumMessageSize   
  1024   
 For non-serialized messages (embedded broker) - the assumed size of the message used for memory usage calculation. Serialized messages use the serialized size as the basis for the memory calculation.  
 
 
  cursorMemoryHighWaterMark   
  70   
 The percentage (%) threshold applied either to the / or the destination's memoryLimit (when defined) which when exceeded will cause the destination's cursor to either block or write to disk.  
 
 
  storeUsageHighWaterMark   
  100   
 The percentage (%) threshold of the / store limit which when exceeded causes a send to block.  
 
 
  prioritizedMessages   
  false   
 Persist message priority information.  
 
 
  advisoryForConsumed   
  false   
 Send an advisory message when a message is consumed by a client.  
 
 
  advisoryForDelivery   
  false   
 Send an advisory message when a message is sent to a client.  
 
 
  advisoryForSlowConsumers   
  false   
 Send an advisory message if a consumer is deemed slow.  
 
 
  advsioryForFastProducersadvisoryForFastProducers   
  false   
 Send an advisory message if a producer is deemed fast.  
 
 
  advisoryWhenFull   
  false   
 Send an advisory message when a limit (memory, store, temp disk) is full.  
 
 
  includeBodyForAdvisory   
  false   
 Includes the body of the original message that triggered the advisory as part of the dataStructure field in the advisory message (where applicable). Normally the message body is cleared.  
 
 
  gcInactiveDestinations   
  false   
 Garbage collect inactive destinations.  
 
 
  inactiveTimoutBeforeGC   
  5000   
 The timeout (in ms) after which a destination is considered inactive.  
 
 
  usePrefetchExtension 
  true   
 The prefetch extension is used when a message is delivered but not ACK'ed, such that the broker can dispatch another message, e.g., prefetch == 0, the idea being that there will always be prefetch number of messages pending. It also allows a transaction batch to exceed the prefetch value.  
 
 
  slowConsumerStrategy   
  null   
 Sets the strategy for handling slow consumers. See abortSlowConsumerStrategy.   
 
 
  maxDestinations   
  -1   
 (v5.12) If 0 or greater, sets the maximum number of destinations that can be created. This parameter is intended to limit the number of hierarchical destinations that can be created under a wildcard destination.  
 
 
 
 ...  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

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




Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: Generic JMS Pool #808

2016-08-30 Thread Apache Jenkins Server
See 




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

2016-08-30 Thread Apache Jenkins Server
See 




Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: RA #808

2016-08-30 Thread Apache Jenkins Server
See 




Jenkins build is still unstable: ActiveMQ-Java8 #808

2016-08-30 Thread Apache Jenkins Server
See 



activemq git commit: https://issues.apache.org/jira/browse/AMQ-6410

2016-08-30 Thread tabish
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 26f665b82 -> f15c0e8e0


https://issues.apache.org/jira/browse/AMQ-6410

Advertise that the connection supported delayed message delivery.
(cherry picked from commit 4a1f2f7ca73fc3cf8d650a4d1b884bc6a0750e59)


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

Branch: refs/heads/activemq-5.14.x
Commit: f15c0e8e0aad5f20cf47307da24fc40493626fc6
Parents: 26f665b
Author: Timothy Bish 
Authored: Tue Aug 30 15:00:23 2016 -0400
Committer: Timothy Bish 
Committed: Tue Aug 30 15:02:03 2016 -0400

--
 .../java/org/apache/activemq/transport/amqp/AmqpSupport.java| 1 +
 .../apache/activemq/transport/amqp/protocol/AmqpConnection.java | 3 ++-
 .../activemq/transport/amqp/interop/AmqpConnectionsTest.java| 5 +
 3 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/f15c0e8e/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
--
diff --git 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
index cf86f01..9087cf1 100644
--- 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
+++ 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
@@ -51,6 +51,7 @@ public class AmqpSupport {
 
 // Symbols used to announce connection information to remote peer.
 public static final Symbol ANONYMOUS_RELAY = 
Symbol.valueOf("ANONYMOUS-RELAY");
+public static final Symbol DELAYED_DELIVERY = 
Symbol.valueOf("DELAYED_DELIVERY");
 public static final Symbol QUEUE_PREFIX = Symbol.valueOf("queue-prefix");
 public static final Symbol TOPIC_PREFIX = Symbol.valueOf("topic-prefix");
 public static final Symbol CONNECTION_OPEN_FAILED = 
Symbol.valueOf("amqp:connection-establishment-failed");

http://git-wip-us.apache.org/repos/asf/activemq/blob/f15c0e8e/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
--
diff --git 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
index aa9b577..929fa24 100644
--- 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
+++ 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
@@ -19,6 +19,7 @@ package org.apache.activemq.transport.amqp.protocol;
 import static org.apache.activemq.transport.amqp.AmqpSupport.ANONYMOUS_RELAY;
 import static 
org.apache.activemq.transport.amqp.AmqpSupport.CONNECTION_OPEN_FAILED;
 import static org.apache.activemq.transport.amqp.AmqpSupport.CONTAINER_ID;
+import static org.apache.activemq.transport.amqp.AmqpSupport.DELAYED_DELIVERY;
 import static org.apache.activemq.transport.amqp.AmqpSupport.INVALID_FIELD;
 import static org.apache.activemq.transport.amqp.AmqpSupport.PLATFORM;
 import static org.apache.activemq.transport.amqp.AmqpSupport.PRODUCT;
@@ -186,7 +187,7 @@ public class AmqpConnection implements 
AmqpProtocolConverter {
  * @return the capabilities that are offered to new clients on connect.
  */
 protected Symbol[] getConnectionCapabilitiesOffered() {
-return new Symbol[]{ ANONYMOUS_RELAY };
+return new Symbol[]{ ANONYMOUS_RELAY, DELAYED_DELIVERY };
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq/blob/f15c0e8e/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
--
diff --git 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
index 2d154e6..414902f 100644
--- 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
+++ 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
@@ -52,6 +52,7 @@ public class AmqpConnectionsTest extends 
AmqpClientTestSupport {
 private static final Symbol QUEUE_PREFIX = Symbol.valueOf("queue-prefix");
 private static final Symbol TOPIC_PREFIX = Symbol.valueOf("topic-prefix");
 private static final Symbol ANONYMOUS_RELAY = 
Symbol.valueOf("ANONYMOUS-RELAY");
+

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6410

2016-08-30 Thread tabish
Repository: activemq
Updated Branches:
  refs/heads/master a4cd4dc67 -> 4a1f2f7ca


https://issues.apache.org/jira/browse/AMQ-6410

Advertise that the connection supported delayed message delivery. 

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

Branch: refs/heads/master
Commit: 4a1f2f7ca73fc3cf8d650a4d1b884bc6a0750e59
Parents: a4cd4dc
Author: Timothy Bish 
Authored: Tue Aug 30 15:00:23 2016 -0400
Committer: Timothy Bish 
Committed: Tue Aug 30 15:00:23 2016 -0400

--
 .../java/org/apache/activemq/transport/amqp/AmqpSupport.java| 1 +
 .../apache/activemq/transport/amqp/protocol/AmqpConnection.java | 3 ++-
 .../activemq/transport/amqp/interop/AmqpConnectionsTest.java| 5 +
 3 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/4a1f2f7c/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
--
diff --git 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
index cf86f01..9087cf1 100644
--- 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
+++ 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpSupport.java
@@ -51,6 +51,7 @@ public class AmqpSupport {
 
 // Symbols used to announce connection information to remote peer.
 public static final Symbol ANONYMOUS_RELAY = 
Symbol.valueOf("ANONYMOUS-RELAY");
+public static final Symbol DELAYED_DELIVERY = 
Symbol.valueOf("DELAYED_DELIVERY");
 public static final Symbol QUEUE_PREFIX = Symbol.valueOf("queue-prefix");
 public static final Symbol TOPIC_PREFIX = Symbol.valueOf("topic-prefix");
 public static final Symbol CONNECTION_OPEN_FAILED = 
Symbol.valueOf("amqp:connection-establishment-failed");

http://git-wip-us.apache.org/repos/asf/activemq/blob/4a1f2f7c/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
--
diff --git 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
index aa9b577..929fa24 100644
--- 
a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
+++ 
b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/protocol/AmqpConnection.java
@@ -19,6 +19,7 @@ package org.apache.activemq.transport.amqp.protocol;
 import static org.apache.activemq.transport.amqp.AmqpSupport.ANONYMOUS_RELAY;
 import static 
org.apache.activemq.transport.amqp.AmqpSupport.CONNECTION_OPEN_FAILED;
 import static org.apache.activemq.transport.amqp.AmqpSupport.CONTAINER_ID;
+import static org.apache.activemq.transport.amqp.AmqpSupport.DELAYED_DELIVERY;
 import static org.apache.activemq.transport.amqp.AmqpSupport.INVALID_FIELD;
 import static org.apache.activemq.transport.amqp.AmqpSupport.PLATFORM;
 import static org.apache.activemq.transport.amqp.AmqpSupport.PRODUCT;
@@ -186,7 +187,7 @@ public class AmqpConnection implements 
AmqpProtocolConverter {
  * @return the capabilities that are offered to new clients on connect.
  */
 protected Symbol[] getConnectionCapabilitiesOffered() {
-return new Symbol[]{ ANONYMOUS_RELAY };
+return new Symbol[]{ ANONYMOUS_RELAY, DELAYED_DELIVERY };
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/activemq/blob/4a1f2f7c/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
--
diff --git 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
index 2d154e6..414902f 100644
--- 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
+++ 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/interop/AmqpConnectionsTest.java
@@ -52,6 +52,7 @@ public class AmqpConnectionsTest extends 
AmqpClientTestSupport {
 private static final Symbol QUEUE_PREFIX = Symbol.valueOf("queue-prefix");
 private static final Symbol TOPIC_PREFIX = Symbol.valueOf("topic-prefix");
 private static final Symbol ANONYMOUS_RELAY = 
Symbol.valueOf("ANONYMOUS-RELAY");
+private static final Symbol DELAYED_DELIVERY = 
Symbol.valueOf("DELAYED_DELIVERY");
 
 

svn commit: r996304 [1/2] - in /websites/production/activemq/content: activemq-connection-uris.html cache/main.pageCache configuring-transports.html configuring-version-5-transports.html per-destinati

2016-08-30 Thread buildbot
Author: buildbot
Date: Tue Aug 30 19:22:14 2016
New Revision: 996304

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/activemq-connection-uris.html
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/configuring-transports.html
websites/production/activemq/content/configuring-version-5-transports.html
websites/production/activemq/content/per-destination-policies.html

Modified: websites/production/activemq/content/activemq-connection-uris.html
==
--- websites/production/activemq/content/activemq-connection-uris.html 
(original)
+++ websites/production/activemq/content/activemq-connection-uris.html Tue Aug 
30 19:22:14 2016
@@ -36,6 +36,7 @@



+   

  

@@ -100,15 +101,16 @@
   ...
 </broker>
 
-