date:20171025

This closes #1614


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

Branch: refs/heads/master
Commit: f7e0e3d09fa4eb465202d6ee4f0ddfcba21875e2
Parents: 448ff08 c93a250
Author: Clebert Suconic 
Authored: Wed Oct 25 17:44:28 2017 -0400
Committer: Clebert Suconic 
Committed: Wed Oct 25 17:44:28 2017 -0400

--
 .../jms/client/DefaultConnectionProperties.java | 38 +
 .../jms/example/HttpTransportExample.java   |  2 +-
 .../amqp/JMSMessageConsumerTest.java|  3 +
 .../artemis/jms/tests/SecurityTest.java | 87 +++-
 4 files changed, 110 insertions(+), 20 deletions(-)
--

[1/4] activemq-artemis git commit: NO-JIRA fix timing issue in test

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 448ff08bf -> f7e0e3d09


NO-JIRA fix timing issue in test


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

Branch: refs/heads/master
Commit: ac73f38d3d74789a6e369416edf982b31553f696
Parents: c2f0c15
Author: Justin Bertram 
Authored: Wed Oct 25 10:12:29 2017 -0500
Committer: Justin Bertram 
Committed: Wed Oct 25 12:45:48 2017 -0500

--
 .../artemis/tests/integration/amqp/JMSMessageConsumerTest.java| 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ac73f38d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java
index 5d6ee47..b290d09 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageConsumerTest.java
@@ -444,6 +444,9 @@ public class JMSMessageConsumerTest extends 
JMSClientTestSupport {
  message1.setText("filtered");
  producer.send(message1, DeliveryMode.PERSISTENT, 
Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
 
+ // short delay to prevent the timestamps from being the same
+ Thread.sleep(2);
+
  TextMessage message2 = session.createTextMessage();
  message2.setText("expected");
  producer.send(message2, DeliveryMode.PERSISTENT, 
Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);

[3/4] activemq-artemis git commit: ARTEMIS-1473 fix default user/pass system props

ARTEMIS-1473 fix default user/pass system props


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

Branch: refs/heads/master
Commit: c93a25063519f9cc55fb3f614af66fcdcfe7e4a1
Parents: ac73f38
Author: Justin Bertram 
Authored: Wed Oct 25 12:45:17 2017 -0500
Committer: Justin Bertram 
Committed: Wed Oct 25 14:56:09 2017 -0500

--
 .../jms/client/DefaultConnectionProperties.java | 38 +
 .../artemis/jms/tests/SecurityTest.java | 87 +++-
 2 files changed, 106 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c93a2506/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
index 328ab71..aba1c8b 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/DefaultConnectionProperties.java
@@ -34,12 +34,19 @@ import java.security.PrivilegedAction;
  */
 public class DefaultConnectionProperties {
 
-   public static final String DEFAULT_BROKER_HOST;
-   public static final int DEFAULT_BROKER_PORT;
-   public static final String DEFAULT_BROKER_BIND_URL;
-   public static final String DEFAULT_BROKER_URL;
-   public static final String DEFAULT_USER;
-   public static final String DEFAULT_PASSWORD;
+   public static final String AMQ_HOST = "AMQ_HOST";
+   public static final String AMQ_PORT = "AMQ_PORT";
+   public static final String AMQ_USER = "AMQ_USER";
+   public static final String AMQ_PASSWORD = "AMQ_PASSWORD";
+   public static final String BROKER_BIND_URL = "BROKER_BIND_URL";
+   public static final String PREFIX = "org.apache.activemq.";
+
+   public static String DEFAULT_BROKER_HOST;
+   public static int DEFAULT_BROKER_PORT;
+   public static String DEFAULT_BROKER_BIND_URL;
+   public static String DEFAULT_BROKER_URL;
+   public static String DEFAULT_USER;
+   public static String DEFAULT_PASSWORD;
 
static String getProperty(final String defaultValue, final String... 
propertyNames) {
   return AccessController.doPrivileged(new PrivilegedAction() {
@@ -57,21 +64,20 @@ public class DefaultConnectionProperties {
}
 
static {
-  String host = getProperty("localhost", "AMQ_HOST", 
"org.apache.activemq.AMQ_HOST");
-  String port = getProperty("61616", "AMQ_PORT", 
"org.apache.activemq.AMQ_PORT");
+  initialize();
+   }
+
+   public static void initialize() {
+  String host = getProperty("localhost", AMQ_HOST, PREFIX + AMQ_HOST);
+  String port = getProperty("61616", AMQ_PORT, PREFIX + AMQ_PORT);
   DEFAULT_BROKER_HOST = host;
   DEFAULT_BROKER_PORT = Integer.parseInt(port);
-  String url = getProperty("tcp://" + host + ":" + port, 
"org.apache.activemq.BROKER_BIND_URL", "BROKER_BIND_URL");
-  DEFAULT_USER = getProperty(null, "AMQ_USER", 
"org.apache.activemq.AMQ_USER");
-  DEFAULT_PASSWORD = getProperty(null, "AMQ_PASSWORD", 
"org.apache.activemq.AMQ_PASSWORD");
-
-  if (DEFAULT_USER != null && DEFAULT_PASSWORD != null) {
- url += "?user=" + DEFAULT_USER + "=" + DEFAULT_PASSWORD;
-  }
+  String url = getProperty("tcp://" + host + ":" + port, PREFIX + 
BROKER_BIND_URL, BROKER_BIND_URL);
+  DEFAULT_USER = getProperty(null, AMQ_USER, PREFIX + AMQ_USER);
+  DEFAULT_PASSWORD = getProperty(null, AMQ_PASSWORD, PREFIX + 
AMQ_PASSWORD);
 
   DEFAULT_BROKER_BIND_URL = url;
   // TODO: improve this once we implement failover:// as ActiveMQ5 does
   DEFAULT_BROKER_URL = DEFAULT_BROKER_BIND_URL;
}
-
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c93a2506/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SecurityTest.java
--
diff --git 
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SecurityTest.java
 
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SecurityTest.java
index 3d281df..d7137ae 100644
--- 
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SecurityTest.java
+++ 
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SecurityTest.java
@@ -22,7 +22,12 @@ import

[2/4] activemq-artemis git commit: NO-JIRA fix parameter name in HTTP example

NO-JIRA fix parameter name in HTTP example


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

Branch: refs/heads/master
Commit: c2f0c152cc27f5e356dee03a82d46b76ec4aad82
Parents: 448ff08
Author: Justin Bertram 
Authored: Wed Oct 25 09:08:51 2017 -0500
Committer: Justin Bertram 
Committed: Wed Oct 25 12:45:48 2017 -0500

--
 .../apache/activemq/artemis/jms/example/HttpTransportExample.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c2f0c152/examples/features/standard/http-transport/src/main/java/org/apache/activemq/artemis/jms/example/HttpTransportExample.java
--
diff --git 
a/examples/features/standard/http-transport/src/main/java/org/apache/activemq/artemis/jms/example/HttpTransportExample.java
 
b/examples/features/standard/http-transport/src/main/java/org/apache/activemq/artemis/jms/example/HttpTransportExample.java
index 0dded7a..bb189d3 100644
--- 
a/examples/features/standard/http-transport/src/main/java/org/apache/activemq/artemis/jms/example/HttpTransportExample.java
+++ 
b/examples/features/standard/http-transport/src/main/java/org/apache/activemq/artemis/jms/example/HttpTransportExample.java
@@ -39,7 +39,7 @@ public class HttpTransportExample {
  Queue queue = ActiveMQJMSClient.createQueue("exampleQueue");
 
  // Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = new 
ActiveMQConnectionFactory("tcp://localhost:8080?http-enabled=true");
+ ConnectionFactory cf = new 
ActiveMQConnectionFactory("tcp://localhost:8080?httpEnabled=true");
 
  // Step 4.Create a JMS Connection
  connection = cf.createConnection();

buildbot success in on activemq-site-production

The Buildbot has detected a restored build on builder activemq-site-production 
while building . Full details are available at:
https://ci.apache.org/builders/activemq-site-production/builds/20374

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

svn commit: r1020040 - in /websites/production/activemq/content: cache/main.pageCache per-destination-policies.html

Author: buildbot
Date: Wed Oct 25 19:23:57 2017
New Revision: 1020040

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/per-destination-policies.html

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

Modified: websites/production/activemq/content/per-destination-policies.html
==
--- websites/production/activemq/content/per-destination-policies.html 
(original)
+++ websites/production/activemq/content/per-destination-policies.html Wed Oct 
25 19:23:57 2017
@@ -80,7 +80,7 @@
   
 
 
-Multiple different policies can be 
applied per destination (queue or topic), or using wildcard notation to apply 
to a hierarchy of queues or topics, making it possible, therefore, to configure 
how different regions of the JMS destination space are handled.The 
following properties can be applied to either topics and/or queues:Common PropertyDefaultDescriptionadvisoryForConsumedfalseSend an advisory message when a 
message is consumed by a client.advisoryForDeliveryfalseSend an advisory message when a 
message is sent to a client.advisoryForFastProducersfalseSend an advisory message if a 
producer is deemed fast.advisoryForSlowConsumersfalseSend an advisory message if a 
consumer is deemed slow.advisoryWhenFullfalseSend an advisory message when a limit 
(memory, store, temp disk) is full.enableAudittrueWhentrue the broker 
will track duplicate messages. Duplicates can happen for non-persistent 
messages during failover.gcInactiveDestinationsfalseGarbage collect inactive 
destinations.inactiveTimoutBeforeGC5000The timeout (in ms) after which a destination is 
considered inactive.includeBodyForAdvisoryfalseIncludes the body of the 
original message that triggered the advisory as part of 
thedataStructure field in the advisory 
message (where applicable). Normally the message body is 
cleared.maxBrowsePageSize400The maximum number of messages to page in 
from the store at one time for a browser.maxDestinations-1(v5.12) 
If0 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.maxPageSize200The 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.memoryLimitn/aThe memory limit (in bytes) of 
the destination's cursor.This memory limit is subordinate to the system 
level memory limit, as specified by thesystemUsage/memoryUsage
 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'scursorMemoryHighWaterMark 
will be applied against it and not 
thesystemUsage/memoryUsage
 memory limit.minimumMessageSize1
 024For 
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.prioritizedMessagesfalsePersist message priority 
information.producerFlowControltrueIf 
true the broker will throttle (flow-control) the 
producer. Throttling is achieved either by withholding the producer's ACK or by 
raising ajavax.jms.Resour
 ceAllocationException (that's propagated back to the client) 
when local resources, e.g., memory and/or storage, have been 
exhausted.Iffalse 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.slowConsumerStrategynullSets the strategy for handling 
slow consumers. See https://github.com/apache/activemq/blob/master/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java;
 rel="nofollow">AbortSlowConsumerStrategy.s
 toreUsageHighWaterMark100The percentage (%) threshold of 
thesystemUsage/storeUsage 
store limit which when exceeded causes a send to block.useCachetrueIftrue 
persistent messages are cached for fast retrieval from 
store.usePrefetchExtensiontrueThe prefetch extension is used when amessage is 
deliv
 ered but not ACK'ed, such that the broker can dispatchanother 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 prefetchvalue.sendFailIfNoSpace false(v5.16.0) If 
true, will cause a send to fail with 
ajavax.jms.ResourceAllocationException when 
the destination has reached is resource limits (memory or

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: Karaf Integration Tests #1081

See

Jenkins build is still unstable: ActiveMQ-Java8 #1081

See

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

See

Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: STOMP Protocol #1081

See

Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: MQTT Protocol #1081

See

buildbot failure in on activemq-site-production

The Buildbot has detected a new failure on builder activemq-site-production 
while building . Full details are available at:
https://ci.apache.org/builders/activemq-site-production/builds/20373

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

svn commit: r1020039 - in /websites/production/activemq/content: cache/main.pageCache per-destination-policies.html

Author: buildbot
Date: Wed Oct 25 17:24:18 2017
New Revision: 1020039

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/per-destination-policies.html

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

Modified: websites/production/activemq/content/per-destination-policies.html
==
--- websites/production/activemq/content/per-destination-policies.html 
(original)
+++ websites/production/activemq/content/per-destination-policies.html Wed Oct 
25 17:24:18 2017
@@ -32,6 +32,15 @@

svn commit: r1020038 - in /websites/production/activemq/content: cache/main.pageCache per-destination-policies.html virtual-destinations.html

Author: buildbot
Date: Wed Oct 25 16:24:29 2017
New Revision: 1020038

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/per-destination-policies.html
websites/production/activemq/content/virtual-destinations.html

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

Modified: websites/production/activemq/content/per-destination-policies.html
==
--- websites/production/activemq/content/per-destination-policies.html 
(original)
+++ websites/production/activemq/content/per-destination-policies.html Wed Oct 
25 16:24:29 2017
@@ -71,7 +71,7 @@
   
 
 
-We support a number of different 
policies which can be attached to individual destinations (queues, topics) or 
to wildcards of queue/topic hierarchies. This makes it easy to configure how 
different regions of the JMS destination space are handled.The 
properties you can set on a Destination are as follows:Common PropertyDefault ValueDescriptionadvisoryForConsumedfalseSend an advisory message when a 
message is consumed by a client.advisoryForDeliveryfalseSend an advisory message when a message is 
sent to a client.advisoryForFastProducersfalseSend an advisory message if a 
producer is deemed fast.advisoryForSlowConsumersfalseSend an advisory message if a 
consumer is deemed slow.advisoryWhenFullfalseSend an advisory message when a limit (memory, store, 
temp disk) is full.enableAudittrueWhentrue the broker 
will track duplicate messages. Duplicates can happen for non-persistent 
messages during failover.gcInactiveDestinationsfalseGarbage collect inactive 
destinations.inactiveTimoutBeforeGC
 5000The timeout (in ms) after which a destination is 
considered inactive.includeBodyForAdvisoryfalseIncludes the body of the 
original message that triggered the advisory as part of 
thedataStructure field in the advisory 
message (where applicable). Normally the message body is 
cleared.maxBrowsePageSize400The maximum number of messages to page in 
from the store at one time for a browser.maxDestinations-1(v5.12) If0 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.maxPageSize200The 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.memoryLimitn/aThe memory limit (in bytes) of the 
destination's cursor.This memory limit is subordinate to the system 
level memory limit, as specified by thesystemUsage/memoryUsage
 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'scursorMemoryHighWaterMark 
will be applied against it and not 
thesystemUsage/memoryUsage
 memory limit.minimumMessageSize1024<
 /td>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.prioritizedMessagesfalsePersist message priority 
information.producerFlowControltrueIf 
true the broker will throttle (flow-control) the 
producer. Throttling is achieved either by withholding the producer's ACK or by 
raising ajavax.jms.ResourceAllocationExc
 eption (that's propagated back to the client) when local 
resources e.g., memory and/or storage, have been 
exhausted.Iffalse 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.slowConsumerStrategynullSets the strategy for handling 
slow consumers. See https://github.com/apache/activemq/blob/master/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java;
 rel="nofollow">AbortSlowConsumerStrategy.storeUsageHighWat
 erMark100The percentage (%) threshold of 
thesystemUsage/storeUsage 
store limit which when exceeded causes a send to block.useCachetrueIftrue 
persistent messages are cached for fast retrieval from 
store.usePrefetchExtensiontrueThe prefetch extension is used when amessage is 
delivered but not ACK
 'ed, such that the broker can dispatchanother 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 
prefetchvalue.sendFailIfNoSpace 
false(v5.16.0) If true, will 
cause a send to fail with a javax.jms.ResourceAllocationException when the 
destination

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

This closes #1608


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

Branch: refs/heads/master
Commit: 448ff08bf81197329e002fb7a2138c6945afd3e6
Parents: ec97797 06dab31
Author: Clebert Suconic 
Authored: Wed Oct 25 11:44:52 2017 -0400
Committer: Clebert Suconic 
Committed: Wed Oct 25 11:44:52 2017 -0400

--
 .../core/server/impl/ServerSessionImpl.java |  8 +--
 .../largemessage/ServerLargeMessageTest.java| 74 +++-
 2 files changed, 77 insertions(+), 5 deletions(-)
--

[CONF] Apache ActiveMQ > Per Destination Policies

Title: Message Title



 
 
 
 
 
 
 

Gary Tully edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Per Destination Policies 
 
 
  
 
 
 
 
 
 
 ...  The following are examples of different policies that can be customized on a per destination basis:  
 
 Dispatch Policies  
 
 
  An example from the demos https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=blob;f=assembly/src/release/examples/conf/activemq-demo.xml;hb=HEAD:     
 
 
  
 
 
   
< 
bean 
  
class 
= 
"org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" 
/> 
 
 
  
 
 
   
< 
broker 
  
persistent 
= 
"false" 
  
brokerName 
= 
"${brokername}" 
  
xmlns 
= 
"http://activemq.apache.org/schema/core" 
> 
 
 
 
 
 
 
 
< 
destinationPolicy 
> 
 
 
   
< 
policyMap 
> 
 
 
 
< 
policyEntries 
> 
 
 
   
< 
policyEntry 
  
topic="FOO.>"> 
 
 
 
< 
dispatchPolicy 
> 
 
 
   
< 
roundRobinDispatchPolicy 
  
/> 
 
 
 
 
dispatchPolicy 
> 
 
 
 
< 
subscriptionRecoveryPolicy 
> 
 
 
   
< 
lastImageSubscriptionRecoveryPolicy 
  
/> 
 
 
 
 
subscriptionRecoveryPolicy 
> 
 
 
   
 
policyEntry 
> 
 
 
   
  
 
 
   
< 
policyEntry 
  
topic="ORDERS.>"> 
 
 
 
< 
dispatchPolicy 
> 
 
 
   
< 
strictOrderDispatchPolicy 
  
/> 
 
 
 
 
dispatchPolicy 
> 
 
 
  
 
 
 
 
 
 
 
< 
subscriptionRecoveryPolicy 
> 
 
 
   
< 
timedSubscriptionRecoveryPolicy 
  
recoverDuration 
= 
"6" 
  
/> 
 
 
 
 
subscriptionRecoveryPolicy 
> 
 
 
   
 
policyEntry 
> 
 
 
 
  
 
 
   
< 
policyEntry 
  
topic="PRICES.>"> 
 
 
 
 
 
 
 
< 
pendingMessageLimitStrategy 
> 
 
 
   
< 
constantPendingMessageLimitStrategy 
  
limit 
= 
"10" 
/> 
 
 
 
 
pendingMessageLimitStrategy 
> 
 
 
  
 
 
 
 
 
 
 
< 
subscriptionRecoveryPolicy 
> 
 
 
   
< 
timedSubscriptionRecoveryPolicy 
  
recoverDuration 
= 
"1" 
  
/> 
 
 
 
 
subscriptionRecoveryPolicy 
> 
 
 
 
  
 
 
   
 
policyEntry 
> 
 
 
   
< 
policyEntry 
  
tempTopic 
= 
"true" 
  
advisoryForConsumed 
= 
"true" 
  
/> 
 
 
   
< 
policyEntry 
  
tempQueue 
= 
"true" 
  
advisoryForConsumed 
= 
"true" 
  
/> 
 
 
 
 
policyEntries 
> 
 
 
   
 
policyMap 
> 
 
 
 
 
destinationPolicy 
> 
 
 
   
 
broker 
> 
 
 
 
beans 
> 
  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

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

[CONF] Apache ActiveMQ > Virtual Destinations

Title: Message Title

Gary Tully edited a page

Virtual Destinations

...

... Note that making a topic virtual does add a small CPU overhead when sending messages to the topic but it is fairly small.

Option
Default
Description

selectorAware
false
only messages that match one of the existing subscribers are actually dispatched. Using this option prevents the build up of unmatched messages when selectors are used by exclusive consumers

local
false
when true, don't fan out messages that were received over a network

concurrentSend
false
when true, use an executor to fanout such that sends occur in parallel. This allows the journal to batch writes which will reduce disk io (5.12)

transactedSend
false
when true, use a transaction for fanout sends such that there is a single disk sync. A local broker transaction will be created if there is no client transaction (5.13)

dropOnResourceLimit
false
when true, ignore any ResourceAllocationException thrown during fanout (see: sendFailIfNoSpace policy entry) (5.16)

Composite Destinations Composite Destinations allow for one-to-many relationships on individual destinations; the main use case is for composite queues. For example when a message is sent to queue A you may want to forward it also to queues B and C and topic D. Composite destinations are then a mapping from a virtual destination to a collection of other physical destinations. In this case the mapping is broker side and the client is unaware of the mapping between the destinations. This is different from client side Composite Destinations where the client uses a URL notation to specify the actual physical destinations that a message must be sent to. ...

... By default, subscribers cannot consume messages directly from a composite queue or topic - it is a logical construct only. Given the configuration above, subscribers can only consume messages from FOO and BAR; but not MY.QUEUE. ... ... Messages sent to IncomingOrders will all be copied and forwarded to Notifications, before being placed on the physical IncomingOrders queue for consumption by subscribers. ...... Avoiding Duplicate Message in a Network of Brokers ...

...

View page
•

Stop watching space
•

Manage notifications

This message was sent by Atlassian Confluence 5.8.17

[1/2] activemq-artemis git commit: ARTEMIS-1479 Fix set validated user in large messages

Repository: activemq-artemis
Updated Branches:
  refs/heads/master ec9779786 -> 448ff08bf


ARTEMIS-1479 Fix set validated user in large messages


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

Branch: refs/heads/master
Commit: 06dab31fd0c139d662a3a5973b9a06fe711e0faf
Parents: ec97797
Author: Chris Burlinchon 
Authored: Tue Oct 24 17:11:19 2017 +0100
Committer: Clebert Suconic 
Committed: Wed Oct 25 11:44:14 2017 -0400

--
 .../core/server/impl/ServerSessionImpl.java |  8 +--
 .../largemessage/ServerLargeMessageTest.java| 74 +++-
 2 files changed, 77 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/06dab31f/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 679312c..48acdf1 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -1357,10 +1357,6 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
  message.setMessageID(id);
   }
 
-  if (server.getConfiguration().isPopulateValidatedUser() && validatedUser 
!= null) {
- message.setValidatedUserID(validatedUser);
-  }
-
   SimpleString address = message.getAddressSimpleString();
 
   if (defaultAddress == null && address != null) {
@@ -1700,6 +1696,10 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
  throw e;
   }
 
+  if (server.getConfiguration().isPopulateValidatedUser() && validatedUser 
!= null) {
+ msg.setValidatedUserID(validatedUser);
+  }
+
   if (tx == null || autoCommitSends) {
   } else {
  routingContext.setTransaction(tx);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/06dab31f/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
index a13c5fe..e325273 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
@@ -16,7 +16,13 @@
  */
 package org.apache.activemq.artemis.tests.integration.largemessage;
 
+import java.lang.management.ManagementFactory;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ClientConsumer;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
@@ -26,10 +32,15 @@ import 
org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 import org.apache.activemq.artemis.api.core.client.ServerLocator;
 import 
org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
 import 
org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageImpl;
+import org.apache.activemq.artemis.core.security.Role;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import 
org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
+import org.apache.activemq.artemis.tests.integration.security.SecurityTest;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 public class ServerLargeMessageTest extends ActiveMQTestBase {
@@ -40,6 +51,29 @@ public class ServerLargeMessageTest extends ActiveMQTestBase 
{
 
// Static

[CONF] Apache ActiveMQ > Virtual Destinations

Title: Message Title

Gary Tully edited a page

Virtual Destinations

... You can configure this to use whatever naming convention you wish. The following example shows how to make all topics virtual topics. The example below is using the name > to indicate 'match all topics'. You could use this wildcard to apply different virtual topic policies in different hierarchies. ...

... Note that making a topic virtual does add a small CPU overhead when sending messages to the topic but it is fairly small. ... The following example shows how to set up a element in the XML configuration so that when a message is sent to MY.QUEUE then it is really forwarded to the physical queue FOO and the topic BAR. ...

... By default, subscribers cannot consume messages directly from a composite queue or topic - it is a logical construct only. Given the configuration above, subscribers can only consume messages from FOO and BAR; but not MY.QUEUE. This behaviour can be altered to implement use cases such as watching a queue by sending the same messages to a notification topic (wire tapping), by setting the optionally set forwardOnly attribute to false. ...

... Messages sent to IncomingOrders will all be copied and forwarded to Notifications, before being placed on the physical IncomingOrders queue for consumption by subscribers. ... The following example shows how a message sent to the virtual destination MY.QUEUE will be forwarded to FOO and BAR if the selectors match ...

... Avoiding Duplicate Message in a Network of Brokers ... Here is an example of how to do that: ...

...

View page
•

Stop watching space
•

Manage notifications

This message was sent by Atlassian Confluence 5.8.17

svn commit: r1020037 - in /websites/production/activemq/content: cache/main.pageCache per-destination-policies.html

Author: buildbot
Date: Wed Oct 25 15:24:14 2017
New Revision: 1020037

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/per-destination-policies.html

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

Modified: websites/production/activemq/content/per-destination-policies.html
==
--- websites/production/activemq/content/per-destination-policies.html 
(original)
+++ websites/production/activemq/content/per-destination-policies.html Wed Oct 
25 15:24:14 2017
@@ -71,58 +71,7 @@
   
 
 
-We support a number of different 
policies which can be attached to individual destinations (queues, topics) or 
to wildcards of queue/topic hierarchies. This makes it easy to configure how 
different regions of the JMS destination space are handled.The 
properties you can set on a Destination are as follows:Common PropertyDefault ValueDescriptionadvisoryForConsumedfalseSend an advisory message when a 
message is consumed by a client.advisoryForDeliveryfalseSend an advisory message when a message is 
sent to a client.advisoryForFastProducersfalseSend an advisory message if a 
producer is deemed fast.advisoryForSlowConsumersfalseSend an advisory message if a 
consumer is deemed slow.advisoryWhenFullfalseSend an advisory message when a limit (memory, store, 
temp disk) is full.enableAudittrueWhentrue the broker 
will track duplicate messages. Duplicates can happen for non-persistent 
messages during failover.gcInactiveDestinationsfalseGarbage collect inactive 
destinations.inactiveTimoutBeforeGC
 5000The timeout (in ms) after which a destination is 
considered inactive.includeBodyForAdvisoryfalseIncludes the body of the 
original message that triggered the advisory as part of 
thedataStructure field in the advisory 
message (where applicable). Normally the message body is 
cleared.maxBrowsePageSize400The maximum number of messages to page in 
from the store at one time for a browser.maxDestinations-1(v5.12) If0 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.maxPageSize200The 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.memoryLimitn/aThe memory limit (in bytes) of the 
destination's cursor.This memory limit is subordinate to the system 
level memory limit, as specified by thesystemUsage/memoryUsage
 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'scursorMemoryHighWaterMark 
will be applied against it and not 
thesystemUsage/memoryUsage
 memory limit.minimumMessageSize1024<
 /td>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.prioritizedMessagesfalsePersist message priority 
information.producerFlowControltrueIf 
true the broker will throttle (flow-control) the 
producer. Throttling is achieved either by withholding the producer's ACK or by 
raising ajavax.jms.ResourceAllocationExc
 eption (that's propagated back to the client) when local 
resources e.g., memory and/or storage, have been 
exhausted.Iffalse 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.slowConsumerStrategynullSets the strategy for handling 
slow consumers. See https://github.com/apache/activemq/blob/master/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java;
 rel="nofollow">AbortSlowConsumerStrategy.storeUsageHighWat
 erMark100The percentage (%) threshold of 
thesystemUsage/storeUsage 
store limit which when exceeded causes a send to block.useCachetrueIftrue 
persistent messages are cached for fast retrieval from 
store.usePrefetchExtensiontrueThe prefetch extension is used when amessage is 
delivered but not ACK
 'ed, such that the broker can dispatchanother 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 
prefetchvalue.Additional 
properties for a QueueQueue Only PropertyDefault ValueDescriptionallConsumersExclusiveByDefaultfalseWhentrue all 
consumers will be exclusive. See 
 ActiveMQ Exclusive

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

This closes #1612


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

Branch: refs/heads/master
Commit: ec9779786f554dfbd977d5b875aaa3905fb9ff56
Parents: 6407580 76b1f9c
Author: Justin Bertram 
Authored: Wed Oct 25 10:22:15 2017 -0500
Committer: Justin Bertram 
Committed: Wed Oct 25 10:22:15 2017 -0500

--
 .../activemq/artemis/api/core/SimpleString.java |  3 ++
 .../artemis/utils/SimpleStringTest.java | 41 
 2 files changed, 44 insertions(+)
--

[1/2] activemq-artemis git commit: ARTEMIS-1482 Catch malformed SimpleString

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 6407580b6 -> ec9779786


ARTEMIS-1482 Catch malformed SimpleString


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

Branch: refs/heads/master
Commit: 76b1f9cf8faa4797122ac71273b507bf146e1c06
Parents: 6407580
Author: Martyn Taylor 
Authored: Wed Oct 25 14:12:44 2017 +0100
Committer: Justin Bertram 
Committed: Wed Oct 25 10:22:01 2017 -0500

--
 .../activemq/artemis/api/core/SimpleString.java |  3 ++
 .../artemis/utils/SimpleStringTest.java | 41 
 2 files changed, 44 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/76b1f9cf/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
--
diff --git 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
index e8530e6..79909c7 100644
--- 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
+++ 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
@@ -146,6 +146,9 @@ public final class SimpleString implements CharSequence, 
Serializable, Comparabl
 
public static SimpleString readSimpleString(ByteBuf buffer) {
   int len = buffer.readInt();
+  if (len > buffer.readableBytes()) {
+ throw new IndexOutOfBoundsException();
+  }
   byte[] data = new byte[len];
   buffer.readBytes(data);
   return new SimpleString(data);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/76b1f9cf/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleStringTest.java
--
diff --git 
a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleStringTest.java
 
b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleStringTest.java
new file mode 100644
index 000..0498cab
--- /dev/null
+++ 
b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleStringTest.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.utils;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class SimpleStringTest {
+
+   @Test
+   public void testOutOfBoundsThrownOnMalformedString() {
+  ByteBuf byteBuffer = ByteBufAllocator.DEFAULT.buffer(5);
+  byteBuffer.writeInt(100);
+
+  Exception e = null;
+  try {
+ SimpleString.readSimpleString(byteBuffer);
+  } catch (IndexOutOfBoundsException iob) {
+ e = iob;
+  }
+  assertTrue(e instanceof IndexOutOfBoundsException);
+   }
+}

[CONF] Apache ActiveMQ > Per Destination Policies

Title: Message Title

Gary Tully edited a page

Per Destination Policies

...

Common Property
Default Value
Description

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.

advisoryForFastProducers
false
Send an advisory message if a producer is deemed fast.

advisoryForSlowConsumers
false
Send an advisory message if a consumer is deemed slow.

advisoryWhenFull
false
Send an advisory message when a limit (memory, store, temp disk) is full.

enableAudit
true
When true the broker will track duplicate messages. Duplicates can happen for non-persistent messages during failover.

gcInactiveDestinations
false
Garbage collect inactive destinations.

inactiveTimoutBeforeGC
5000
The timeout (in ms) after which a destination is considered inactive.

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.

maxBrowsePageSize
400
The maximum number of messages to page in from the store at one time for a browser.

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.

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.

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.

prioritizedMessages
false
Persist message priority information.

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.

slowConsumerStrategy
null
Sets the strategy for handling slow consumers. See AbortSlowConsumerStrategy.

storeUsageHighWaterMark
100
The percentage (%) threshold of the / store limit which when exceeded causes a send to block.

useCache
true
If true persistent messages are cached for fast retrieval from store.

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.

sendFailIfNoSpace
false
(v5.16.0) If true, will cause a send to fail with a javax.jms.ResourceAllocationException when the destination has reached is resource limits (memory or storage)

sendFailIfNoSpaceAfterTimeout
0
(v5.16.0) if > 0, will cause a send to fail with a javax.jms.ResourceAllocationException when the destination resource limits (memory or storage) remain exhausted for the configured duration in milliseconds

Additional properties for a Queue ... The following are examples of different policies that can be customized on a per destination basis:

Dispatch Policies
Here is an example of this in use: ...

View page
•

Stop watching space
•

Manage notifications

This message was sent by Atlassian Confluence 5.8.17

svn commit: r1020034 - in /websites/production/activemq/content: cache/main.pageCache producer-flow-control.html

Author: buildbot
Date: Wed Oct 25 14:24:23 2017
New Revision: 1020034

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/producer-flow-control.html

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

Modified: websites/production/activemq/content/producer-flow-control.html
==
--- websites/production/activemq/content/producer-flow-control.html (original)
+++ websites/production/activemq/content/producer-flow-control.html Wed Oct 25 
14:24:23 2017
@@ -37,6 +37,7 @@



+

[1/2] activemq-artemis git commit: ARTEMIS-1420 prevent potential NPE

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 75c88410f -> 6407580b6


ARTEMIS-1420 prevent potential NPE


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

Branch: refs/heads/master
Commit: de1165df6ea92a2b4f41c4546558167b78308b0c
Parents: 75c8841
Author: Justin Bertram 
Authored: Wed Oct 25 08:59:01 2017 -0500
Committer: Justin Bertram 
Committed: Wed Oct 25 09:00:10 2017 -0500

--
 .../org/apache/activemq/artemis/core/protocol/ProtocolHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/de1165df/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
index 39d07e0..0ba3ae7 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
@@ -154,7 +154,7 @@ public class ProtocolHandler {
 return;
  }
 
- if (handshakeTimeout > 0) {
+ if (handshakeTimeout > 0 && timeoutFuture != null) {
 timeoutFuture.cancel(true);
 timeoutFuture = null;
  }

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

This closes #1613


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

Branch: refs/heads/master
Commit: 6407580b6694b10797513ac2ea780d24a25888c0
Parents: 75c8841 de1165d
Author: Clebert Suconic 
Authored: Wed Oct 25 10:02:13 2017 -0400
Committer: Clebert Suconic 
Committed: Wed Oct 25 10:02:13 2017 -0400

--
 .../org/apache/activemq/artemis/core/protocol/ProtocolHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[CONF] Apache ActiveMQ > Producer Flow Control

Title: Message Title



 
 
 
 
 
 
 

Gary Tully edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Producer Flow Control 
 
 
  
 
 
 
 
 
 
 ... The timeout is defined in milliseconds so the example above waits for three seconds before failing the send() operation with an exception to the client-side. The advantage of this property is that it will block for the configured amount of time instead of failing immediately or blocking indefinitely. This property offers not only an improvement on the broker-side, but also an improvement for the client so it can catch the exception, wait a bit and retry the send() operation.  Starting in version 5.16.0 the sendFailIfNoSpace and sendFailIfNoSpaceAfterTimeout can be configured on a per destination basis via destination policies.  Disabling Flow Control A common requirement is to disable flow control so that message dispatching continues until all available disk is used up by pending messages (whether persistent or non persistent messaging is configured). To do this enable Message Cursors. ...  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

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

activemq git commit: [AMQ-6849] provide a virtualTopic dropOnResourceLimit attribute, default to false.

2017-10-25 Thread gtully

Repository: activemq
Updated Branches:
  refs/heads/master be6f4b69c -> 6da08b245


[AMQ-6849] provide a virtualTopic dropOnResourceLimit attribute, default to 
false.

Enabling will allow dispatch to continue even when end to some consumer queues
fail due to resource constraints.
The existing systemUsage sendFailIfNoSpace and sendFailIfNoSpaceAfterTimeout are
promoted to destination policy options allowing selective destinations to fail a
send with an exception. The global system usage options are still in place.
When dropOnResourceLimit=true dispatch will continue in the event that any
subscription queue throws a resource limit exception on send failure.


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

Branch: refs/heads/master
Commit: 6da08b245e8b5c728d2fb0795ad922ccc99baf41
Parents: be6f4b6
Author: gtully 
Authored: Wed Oct 25 14:44:16 2017 +0100
Committer: gtully 
Committed: Wed Oct 25 14:53:20 2017 +0100

--
 .../apache/activemq/broker/region/Queue.java|  17 +-
 .../broker/region/policy/PolicyEntry.java   |  30 +++-
 .../broker/region/virtual/VirtualTopic.java |   9 +
 .../region/virtual/VirtualTopicInterceptor.java |  16 +-
 .../store/memory/MemoryTransactionStore.java|  14 +-
 .../store/kahadb/KahaDBTransactionStore.java|  14 +-
 .../VirtualTopicFlowControlDiscardTest.java | 175 +++
 7 files changed, 261 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/6da08b24/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..3501ca4 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
@@ -608,6 +608,7 @@ public class Queue extends BaseDestination implements Task, 
UsageListener, Index
 }
 }
 
+private volatile ResourceAllocationException sendMemAllocationException = 
null;
 @Override
 public void send(final ProducerBrokerExchange producerExchange, final 
Message message) throws Exception {
 final ConnectionContext context = 
producerExchange.getConnectionContext();
@@ -641,10 +642,18 @@ public class Queue extends BaseDestination implements 
Task, UsageListener, Index
 
 }
 if (!context.isNetworkConnection() && 
systemUsage.isSendFailIfNoSpace()) {
-throw new ResourceAllocationException("Usage Manager 
Memory Limit reached. Stopping producer ("
-+ message.getProducerId() + ") to prevent flooding 
"
-+ getActiveMQDestination().getQualifiedName() + "."
-+ " See 
http://activemq.apache.org/producer-flow-control.html for more info");
+ResourceAllocationException resourceAllocationException = 
sendMemAllocationException;
+if (resourceAllocationException == null) {
+synchronized (this) {
+resourceAllocationException = 
sendMemAllocationException;
+if (resourceAllocationException == null) {
+sendMemAllocationException = 
resourceAllocationException = new ResourceAllocationException("Usage Manager 
Memory Limit reached on "
++ 
getActiveMQDestination().getQualifiedName() + "."
++ " See 
http://activemq.apache.org/producer-flow-control.html for more info");
+}
+}
+}
+throw resourceAllocationException;
 }
 
 // We can avoid blocking due to low usage if the producer is

http://git-wip-us.apache.org/repos/asf/activemq/blob/6da08b24/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
index 5b7ff0e..8071e57 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
+++

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

This closes #1611


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

Branch: refs/heads/master
Commit: 75c88410f073f501635c1b3a77a92cb70592e1b7
Parents: 5032b1c 52513ad
Author: Justin Bertram 
Authored: Wed Oct 25 07:31:33 2017 -0500
Committer: Justin Bertram 
Committed: Wed Oct 25 07:31:33 2017 -0500

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

[1/2] activemq-artemis git commit: ARTEMIS-1481 - Update to hawtio 1.5.5

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 5032b1ca9 -> 75c88410f


ARTEMIS-1481 - Update to hawtio 1.5.5



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

Branch: refs/heads/master
Commit: 52513ad7dc245e7cc210901061c05bb385de196e
Parents: 5032b1c
Author: Michael AndrÃ© Pearce 
Authored: Wed Oct 25 09:38:58 2017 +0100
Committer: Michael AndrÃ© Pearce 
Committed: Wed Oct 25 09:38:58 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/52513ad7/artemis-hawtio/pom.xml
--
diff --git a/artemis-hawtio/pom.xml b/artemis-hawtio/pom.xml
index 677f9b2..2985f93 100644
--- a/artemis-hawtio/pom.xml
+++ b/artemis-hawtio/pom.xml
@@ -38,7 +38,7 @@
 1.8
 1.8
 
-1.5.4
+1.5.5
 3.2.0
 4.11
 1.2.17

activemq git commit: [no jira] calm this test a bit due to oom in ci builds

2017-10-25 Thread gtully

Repository: activemq
Updated Branches:
  refs/heads/master 489cdc624 -> be6f4b69c


[no jira] calm this test a bit due to oom in ci builds


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

Branch: refs/heads/master
Commit: be6f4b69c12b8f52ce59d5c97150f10da0cd264d
Parents: 489cdc6
Author: gtully 
Authored: Wed Oct 25 13:08:00 2017 +0100
Committer: gtully 
Committed: Wed Oct 25 13:08:00 2017 +0100

--
 .../java/org/apache/activemq/bugs/DuplicateFromStoreTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/be6f4b69/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DuplicateFromStoreTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DuplicateFromStoreTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DuplicateFromStoreTest.java
index 4f4004c..5854fc7 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DuplicateFromStoreTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/DuplicateFromStoreTest.java
@@ -58,7 +58,7 @@ public class DuplicateFromStoreTest {
 protected final static int NUM_PRODUCERS = 100;
 protected final static int NUM_CONSUMERS = 20;
 
-protected final static int NUM_MSGS = 4;
+protected final static int NUM_MSGS = 2;
 protected final static int CONSUMER_SLEEP = 0;
 protected final static int PRODUCER_SLEEP = 10;
 
@@ -85,6 +85,7 @@ public class DuplicateFromStoreTest {
 policy.setMemoryLimit(10 * 1024 * 1024); // 10 MB
 policy.setExpireMessagesPeriod(0);
 policy.setEnableAudit(false); // allow any duplicates from the store 
to bubble up to the q impl
+policy.setQueuePrefetch(100);
 PolicyMap policies = new PolicyMap();
 policies.put(dest, policy);
 broker.setDestinationPolicy(policies);

svn commit: r1020018 - in /websites/production/activemq/content: activemq-5151-release.html activemq-5152-release.html cache/main.pageCache