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

2016-01-18 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java8 #588

2016-01-18 Thread Apache Jenkins Server 
See

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

2016-01-18 Thread Apache Jenkins Server 
See

[1/2] activemq-artemis git commit: Fix URL to project page

2016-01-18 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master fc8590556 -> ffa79f6e2


Fix URL to project page


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

Branch: refs/heads/master
Commit: e9821a05f89d834d01a4597d710890e053003ffb
Parents: fc85905
Author: Alexey Pakseykin 
Authored: Mon Jan 18 23:06:35 2016 +0800
Committer: Alexey Pakseykin 
Committed: Mon Jan 18 23:06:35 2016 +0800

--
 docs/user-manual/en/project-info.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e9821a05/docs/user-manual/en/project-info.md
--
diff --git a/docs/user-manual/en/project-info.md 
b/docs/user-manual/en/project-info.md
index a2adb8d..2d7ea4b 100644
--- a/docs/user-manual/en/project-info.md
+++ b/docs/user-manual/en/project-info.md
@@ -1,6 +1,6 @@
 # Project Information
 
-The official Apache ActiveMQ Artemis project page is 
.
+The official Apache ActiveMQ Artemis project page is 
.
 
 ## Software Download

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

2016-01-18 Thread clebertsuconic 
This closes #323


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

Branch: refs/heads/master
Commit: ffa79f6e2fbb1779eeb1d8a4a0c2f56028670058
Parents: fc85905 e9821a0
Author: Clebert Suconic 
Authored: Mon Jan 18 10:26:33 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 18 10:26:33 2016 -0500

--
 docs/user-manual/en/project-info.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

2016-01-18 Thread cshannon 
Repository: activemq
Updated Branches:
  refs/heads/master a3fa0da6e -> 1ae29382e


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

Fixing DynamicallyIncludedDestinationsDuplexNetworkTest


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

Branch: refs/heads/master
Commit: 1ae29382e12dd9704d78f12b7948b442005ce086
Parents: a3fa0da
Author: Christopher L. Shannon (cshannon) 
Authored: Mon Jan 18 15:27:11 2016 +
Committer: Christopher L. Shannon (cshannon) 
Committed: Mon Jan 18 15:27:11 2016 +

--
 ...callyIncludedDestinationsDuplexNetworkTest.java | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/1ae29382/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
index 3dd8be6..a647abe 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
@@ -19,6 +19,7 @@ package org.apache.activemq.network;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -30,6 +31,7 @@ import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnection;
 import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.util.Wait;
 import org.junit.Test;
 
 /**
@@ -114,4 +116,19 @@ public class 
DynamicallyIncludedDestinationsDuplexNetworkTest extends SimpleNetw
 TransportConnection duplexBridgeConnectionFromRemote = 
transportConnections.get(0);
 return duplexBridgeConnectionFromRemote;
 }
+
+@Override
+protected void assertNetworkBridgeStatistics(final long expectedLocalSent, 
final long expectedRemoteSent) throws Exception {
+
+final NetworkBridge localBridge = 
localBroker.getNetworkConnectors().get(0).activeBridges().iterator().next();
+
+assertTrue(Wait.waitFor(new Wait.Condition() {
+@Override
+public boolean isSatisified() throws Exception {
+return expectedLocalSent == 
localBridge.getNetworkBridgeStatistics().getDequeues().getCount() &&
+expectedRemoteSent == 
localBridge.getNetworkBridgeStatistics().getReceivedCount().getCount();
+}
+}));
+
+}
 }

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

2016-01-18 Thread cshannon 
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x d5101d46a -> 6abb5b9be


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

Fixing DynamicallyIncludedDestinationsDuplexNetworkTest

(cherry picked from commit 1ae29382e12dd9704d78f12b7948b442005ce086)


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

Branch: refs/heads/activemq-5.13.x
Commit: 6abb5b9bee0269bd4e8d16ca0b74770a67ee3ee8
Parents: d5101d4
Author: Christopher L. Shannon (cshannon) 
Authored: Mon Jan 18 15:27:11 2016 +
Committer: Christopher L. Shannon (cshannon) 
Committed: Mon Jan 18 15:29:34 2016 +

--
 ...callyIncludedDestinationsDuplexNetworkTest.java | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/6abb5b9b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
index 3dd8be6..a647abe 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DynamicallyIncludedDestinationsDuplexNetworkTest.java
@@ -19,6 +19,7 @@ package org.apache.activemq.network;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Field;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -30,6 +31,7 @@ import org.apache.activemq.advisory.AdvisorySupport;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.TransportConnection;
 import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.util.Wait;
 import org.junit.Test;
 
 /**
@@ -114,4 +116,19 @@ public class 
DynamicallyIncludedDestinationsDuplexNetworkTest extends SimpleNetw
 TransportConnection duplexBridgeConnectionFromRemote = 
transportConnections.get(0);
 return duplexBridgeConnectionFromRemote;
 }
+
+@Override
+protected void assertNetworkBridgeStatistics(final long expectedLocalSent, 
final long expectedRemoteSent) throws Exception {
+
+final NetworkBridge localBridge = 
localBroker.getNetworkConnectors().get(0).activeBridges().iterator().next();
+
+assertTrue(Wait.waitFor(new Wait.Condition() {
+@Override
+public boolean isSatisified() throws Exception {
+return expectedLocalSent == 
localBridge.getNetworkBridgeStatistics().getDequeues().getCount() &&
+expectedRemoteSent == 
localBridge.getNetworkBridgeStatistics().getReceivedCount().getCount();
+}
+}));
+
+}
 }

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6130 - java beans @Transient annotation

2016-01-18 Thread dejanb 
Repository: activemq
Updated Branches:
  refs/heads/master df868fe4a -> a3fa0da6e


https://issues.apache.org/jira/browse/AMQ-6130 - java beans @Transient 
annotation


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

Branch: refs/heads/master
Commit: a3fa0da6ec67d8b052b52e55b77e41007e787809
Parents: df868fe
Author: Dejan Bosanac 
Authored: Mon Jan 18 09:35:45 2016 +0100
Committer: Dejan Bosanac 
Committed: Mon Jan 18 09:38:09 2016 +0100

--
 .../src/main/java/org/apache/activemq/command/Message.java| 2 ++
 .../org/apache/activemq/command/ActiveMQTextMessageTest.java  | 7 +++
 2 files changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/a3fa0da6/activemq-client/src/main/java/org/apache/activemq/command/Message.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/command/Message.java 
b/activemq-client/src/main/java/org/apache/activemq/command/Message.java
index 4c57feb..b2640b3 100755
--- a/activemq-client/src/main/java/org/apache/activemq/command/Message.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/Message.java
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.command;
 
+import java.beans.Transient;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -628,6 +629,7 @@ public abstract class Message extends BaseCommand 
implements MarshallAware, Mess
 }
 
 @Override
+@Transient
public MessageDestination getRegionDestination() {
 return regionDestination;
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/a3fa0da6/activemq-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
index 28fc307..174e20b 100755
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
@@ -16,8 +16,10 @@
  */
 package org.apache.activemq.command;
 
+import java.beans.Transient;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.lang.reflect.Method;
 
 import javax.jms.JMSException;
 import javax.jms.MessageNotReadableException;
@@ -148,6 +150,11 @@ public class ActiveMQTextMessageTest extends TestCase {
setContent(nullMessage, null);
assertTrue(nullMessage.toString().contains("text = null"));
 }
+
+public void testTransient() throws Exception {
+Method method = 
ActiveMQTextMessage.class.getMethod("getRegionDestination", null);
+assertTrue(method.isAnnotationPresent(Transient.class));
+}
 
 protected void setContent(Message message, String text) throws Exception {
 ByteArrayOutputStream baos = new ByteArrayOutputStream();

buildbot success in ASF Buildbot on activemq-site-production

2016-01-18 Thread buildbot 
The Buildbot has detected a restored build on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4862

Buildbot URL: http://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: r977984 [1/5] - /websites/production/activemq/content/schema/core/

2016-01-18 Thread cshannon 
Author: cshannon
Date: Mon Jan 18 17:02:33 2016
New Revision: 977984

Log:
Adding activemq 5.12.2 schema

Added:

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

websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.asc

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

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

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

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

websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.asc

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

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

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

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

buildbot failure in ASF Buildbot on activemq-site-production

2016-01-18 Thread buildbot 
The Buildbot has detected a new failure on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4863

Buildbot URL: http://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

Jenkins build is still unstable: ActiveMQ-Java7 #920

2016-01-18 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java7 » ActiveMQ :: Unit Tests #920

2016-01-18 Thread Apache Jenkins Server 
See

activemq-artemis git commit: Fixes ARTEMIS-348: Error Message: bin/artemis: line 109: [: too many arguments

2016-01-18 Thread chirino 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master ffa79f6e2 -> 8c0aa41db


Fixes ARTEMIS-348: Error Message: bin/artemis: line 109: [: too many arguments 


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

Branch: refs/heads/master
Commit: 8c0aa41db09988acfcfe6ee0aac7bb2debd4df6e
Parents: ffa79f6
Author: Hiram Chirino 
Authored: Mon Jan 18 10:51:30 2016 -0500
Committer: Hiram Chirino 
Committed: Mon Jan 18 10:51:49 2016 -0500

--
 .../resources/org/apache/activemq/artemis/cli/commands/bin/artemis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8c0aa41d/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index 133f69a..2c717fd 100755
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -106,7 +106,7 @@ if $cygwin ; then
 fi
 
 # Empty JAVA_ARGS unless the command is 'run' or 'data'. See 
https://issues.apache.org/jira/browse/ARTEMIS-318.
-if [ $1 != "run" -a $1 != "data" ]; then
+if [ "$1" != "run" -a "$1" != "data" ]; then
   JAVA_ARGS=""
 fi

activemq-artemis git commit: Cleaner fix for: ARTEMIS-318 Can't stop broker when remote JMX enabled

2016-01-18 Thread chirino 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 8c0aa41db -> 044e8e115


Cleaner fix for: ARTEMIS-318 Can't stop broker when remote JMX enabled

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

Branch: refs/heads/master
Commit: 044e8e115924a4840fe48c0cd28d09ba8e492a94
Parents: 8c0aa41
Author: Hiram Chirino 
Authored: Mon Jan 18 11:31:55 2016 -0500
Committer: Hiram Chirino 
Committed: Mon Jan 18 11:31:55 2016 -0500

--
 .../org/apache/activemq/artemis/cli/commands/bin/artemis  | 5 -
 .../apache/activemq/artemis/cli/commands/etc/artemis.profile  | 7 ++-
 .../activemq/artemis/cli/commands/etc/artemis.profile.cmd | 4 
 3 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/044e8e11/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index 2c717fd..a81cf19 100755
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -105,11 +105,6 @@ if $cygwin ; then
   CLASSPATH=`cygpath --windows "$CLASSPATH"`
 fi
 
-# Empty JAVA_ARGS unless the command is 'run' or 'data'. See 
https://issues.apache.org/jira/browse/ARTEMIS-318.
-if [ "$1" != "run" -a "$1" != "data" ]; then
-  JAVA_ARGS=""
-fi
-
 exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \
 -classpath "$CLASSPATH" \
 -Dartemis.home="$ARTEMIS_HOME" \

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/044e8e11/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index f734691..d071c9f 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -22,10 +22,15 @@ ARTEMIS_INSTANCE='${artemis.instance}'
 #ARTEMIS_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 
-Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 
-Dactivemq.remoting.hornetq.port=5446"
 
 
-
 # Java Opts
 JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods 
-Xms512M -Xmx1024M -Xbootclasspath/a:$ARTEMIS_HOME/lib/${logmanager} 
-Djava.security.auth.login.config=$ARTEMIS_INSTANCE/etc/login.config 
${java-opts} -Dartemis.instance=$ARTEMIS_INSTANCE"
 
+#
+# There might be options that you only want to enable on specifc commands, 
like setting a JMX port
+# See https://issues.apache.org/jira/browse/ARTEMIS-318
+#if [ "$1" == "run" ]; then
+#  JAVA_ARGS="$JAVA_ARGS -Dcom.sun.management.jmxremote=true 
-Dcom.sun.management.jmxremote.port=1099 
-Dcom.sun.management.jmxremote.ssl=false 
-Dcom.sun.management.jmxremote.authenticate=false"
+#fi
 
 # Debug args: Uncomment to enable debug
 
#DEBUG_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/044e8e11/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index a60d470..604011c 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -24,5 +24,9 @@ rem set 
ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.
 rem Java Opts
 set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts 
-XX:+UseFastAccessorMethods -Xms512M -Xmx1024M 
-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} 
-Djava.security.auth.login.config=%ARTEMIS_INSTANCE%\etc\login.config 
${java-opts} -Dartemis.instance=%ARTEMIS_INSTANCE%
 
+rem There might be options that you

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

2016-01-18 Thread cshannon 
Added: 
websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.asc
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.asc
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.asc
 Mon Jan 18 17:02:33 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABCgAGBQJWi+dsAAoJEIen91pqi6X8WNIP/j36Oo42GshnpcCV2duhPioI
+i0740bn2dj9F0zHwRSnrBtRgwQ8aY/p5ZMWQVCIj8uaEM6bHXPDQ2V3TwwxMdfhw
+MQEQ0MV7FkLE1VCRfoSN96itdBrgDFnRLAOqZceJWcWzodxDoE8T6iQmY8UJKdo9
+NkSHgW3ZtWua/ROsZeSLNHBGsAeBQS8KvHQ93Liy7/Xsa0nCcXRgh5n014fj+1Pq
+5KTQgQE4X8n9CSrjK0CdBbXQx9Pm3D+MFQZPXZ1QoO6zmZQxs8vMtJ6/3NIPgQcS
+FpfJpHg7kiib1IqtckIslG+gUC4JNnpNmIG9MhuRJ79DWEpIsqRrM7Jiy4gxPJeu
+51qWqwtiJY/xXWUGXTUY7ElS5Eba1wt0gSlOLtnnOjeAQ8/242YRVDutJhOa3zwI
+t2QEklxSxL0gwc5hZOxQEJL0oxuVWhEkusdxn0Eba0B4en/vcMqTVwtVUtsLF2w1
+h2myRGiw+VHuszL8xHHUoU4N5xuZeWS2vBf2oS9EIUHhl0OFSMn5s3M0hw2AtHgq
+ItUU87CR9wBqroEpHEgorxvbgSPsEnZWTZEBgcNWkez3QZ57HCx+UO+ksIiWAO6e
+BHd0osW/166HNSOGU+TPmpyzBrEiImqBgCnPjm13Nv5torYC2kI3NnMktEaxiOEy
+K7z5xw0bkvncNpphG3Sw
+=bYJB
+-END PGP SIGNATURE-

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

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

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.md5
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.md5
 Mon Jan 18 17:02:33 2016
@@ -0,0 +1 @@
+c279a5bd15a095a1332abbf5cb485813
\ No newline at end of file

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.sha1
 (added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.12.2-schema.html.sha1
 Mon Jan 18 17:02:33 2016
@@ -0,0 +1 @@
+3d76cfe335918660a97756ef41556bcf7eb89324
\ No newline at end of file

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

2016-01-18 Thread cshannon 
Added: websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd
==
--- websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd 
(added)
+++ websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd 
Mon Jan 18 17:02:33 2016
@@ -0,0 +1,10314 @@
+
+
+
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+
+
+  
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+

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

2016-01-18 Thread cshannon 

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

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

2016-01-18 Thread cshannon 
Added: 
websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.asc
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.asc 
(added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.asc 
Mon Jan 18 17:02:33 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABCgAGBQJWi+dnAAoJEIen91pqi6X86PUP/ikR36DDNaVdr4/Vwt2Afcap
+MDZnbXLrqOeJIE1aFgTDMx3tgou7r5wVNz8ZC+n5MU43jgu2YXEq1tVArXIKVQGe
+mtaGabyAr4LspENwrFg0bvq8ghLAaIiCD3a5KY95ZOywir+JCPREd4jr62fqVITn
+0q5c1APY1ldET7g3whrE3vhcsJMdcmHqGrG3aACrkmnAcO3V8EOY9OMHTPL7y4O6
+uNDxld2pEocLIsErfKRj/HyWeiKM8piFjOGF04NJI9Uox9ZJMBoWJK1TEFdPhai3
+DQqgCdueffRiNVystyQlset98kjytra1Jg/ppwQXjiGPoepzbMdtKaGI4JikyHwU
+2S5JchsmwlG/pxS9ELSZQpy4O1N1ZGYQYU5zHc9x04XBbM5U2Tf5d1v9uEEWLPzu
+6TODcEfHz75VN2Cwo/XFPoePjsn2Yv0WQy+V02JY8IJTrw8WlkfyUaCSzpL1EnV9
+V5KpFZDd1d1NB4wj8pSmIa+UsY3WjGHUj4/bdsVavc6CdBuN8Oj4D/UFXPl2N9ww
+d04+/Wi4WeP7rrLDFCvaJOGAYT5RrnFJcNUQ5IhWvhBFXXReNQcafL4NyikeTPI7
+xL/xX9Lz5gJE0tEAo4gbmBZlCTcKH+iRfvWboQMLuimg1BSvdYDGch01xw7P/LYJ
+ufdlh7z3N5VHT4ykQsTC
+=TzGf
+-END PGP SIGNATURE-

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

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

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.md5
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.md5 
(added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.md5 
Mon Jan 18 17:02:33 2016
@@ -0,0 +1 @@
+786a6e0e2c8e45e5cad442f8eb8bc4ac
\ No newline at end of file

Added: 
websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.sha1
==
--- 
websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.sha1 
(added)
+++ 
websites/production/activemq/content/schema/core/activemq-core-5.12.2.xsd.sha1 
Mon Jan 18 17:02:33 2016
@@ -0,0 +1 @@
+fc981dc0ad691af1a36da511b1ff2823299820b9
\ No newline at end of file

svn commit: r11944 - /release/activemq/test

2016-01-18 Thread cshannon 
Author: cshannon
Date: Mon Jan 18 17:05:08 2016
New Revision: 11944

Log:
removing test file

Removed:
release/activemq/test

svn commit: r11943 - /release/activemq/test

2016-01-18 Thread cshannon 
Author: cshannon
Date: Mon Jan 18 17:04:46 2016
New Revision: 11943

Log:
test commit

Added:
release/activemq/test

Added: release/activemq/test
==
(empty)

activemq git commit: Initial Version of activemq-junit

2016-01-18 Thread cshannon 
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x 6abb5b9be -> 57b65dc8e


Initial Version of activemq-junit

Added configure method to EmbeddedActiveMQBroker

Added support for XBean configuration

(cherry picked from commit da3b1380234c5d1745094f883778f19e58fe9cee)


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

Branch: refs/heads/activemq-5.13.x
Commit: 57b65dc8efc4e2bf713a432d3da3cb72cdeb
Parents: 6abb5b9
Author: Quinn Stevenson 
Authored: Wed Dec 23 13:29:06 2015 -0700
Committer: Christopher L. Shannon (cshannon) 
Committed: Mon Jan 18 15:31:01 2016 +

--
 activemq-tooling/activemq-junit/pom.xml |  70 
 .../activemq/junit/EmbeddedActiveMQBroker.java  | 404 +++
 .../junit/EmbeddedActiveMQBrokerConfigTest.java | 110 +
 .../junit/EmbeddedActiveMQBrokerRuleTest.java   |  43 ++
 ...mbeddedActiveMQBrokerXbeanUriConfigTest.java | 108 +
 .../MultipleEmbeddedActiveMQBrokerRuleTest.java |  60 +++
 .../src/test/resources/activemq-simple.xml  |  28 ++
 activemq-tooling/pom.xml|   1 +
 8 files changed, 824 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/57b65dc8/activemq-tooling/activemq-junit/pom.xml
--
diff --git a/activemq-tooling/activemq-junit/pom.xml 
b/activemq-tooling/activemq-junit/pom.xml
new file mode 100644
index 000..33f8366
--- /dev/null
+++ b/activemq-tooling/activemq-junit/pom.xml
@@ -0,0 +1,70 @@
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+  4.0.0
+
+  
+org.apache.activemq.tooling
+activemq-tooling
+5.14-SNAPSHOT
+  
+
+  activemq-junit
+  ActiveMQ :: JUnit Rule
+
+  JUnit Rule for Embedded ActiveMQ Brokers
+
+  
+
+  org.apache.activemq
+  activemq-broker
+  ${project.version}
+  provided
+
+
+  org.springframework
+  spring-context
+  provided
+
+
+  org.apache.activemq
+  activemq-spring
+  ${project.version}
+  provided
+
+
+  org.apache.activemq
+  activemq-pool
+  ${project.version}
+  provided
+
+
+  junit
+  junit
+  provided
+
+
+
+  org.slf4j
+  slf4j-simple
+  ${slf4j-version}
+  test
+
+  
+
+

http://git-wip-us.apache.org/repos/asf/activemq/blob/57b65dc8/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/EmbeddedActiveMQBroker.java
--
diff --git 
a/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/EmbeddedActiveMQBroker.java
 
b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/EmbeddedActiveMQBroker.java
new file mode 100644
index 000..3e328e8
--- /dev/null
+++ 
b/activemq-tooling/activemq-junit/src/main/java/org/apache/activemq/junit/EmbeddedActiveMQBroker.java
@@ -0,0 +1,404 @@
+/*
+ * 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.junit;
+
+import java.net.URI;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerPlugin;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.broker.region.Queue;
+import org.apache.activemq.broker.region.Topic;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.plugin.StatisticsBrokerPlugin;
+import org.apache.activemq.pool.PooledConnectionFactory;
+import

buildbot success in ASF Buildbot on activemq-site-production

2016-01-18 Thread buildbot 
The Buildbot has detected a restored build on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4870

Buildbot URL: http://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

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

2016-01-18 Thread Apache Jenkins Server 
See

buildbot failure in ASF Buildbot on activemq-site-production

2016-01-18 Thread buildbot 
The Buildbot has detected a new failure on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4871

Buildbot URL: http://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

buildbot failure in ASF Buildbot on activemq-site-production

2016-01-18 Thread buildbot 
The Buildbot has detected a new failure on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4874

Buildbot URL: http://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: r978020 - in /websites/production/activemq/content: cache/main.pageCache cross-language-clients.html

2016-01-18 Thread buildbot 
Author: buildbot
Date: Tue Jan 19 04:22:41 2016
New Revision: 978020

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/cross-language-clients.html

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

Modified: websites/production/activemq/content/cross-language-clients.html
==
--- websites/production/activemq/content/cross-language-clients.html (original)
+++ websites/production/activemq/content/cross-language-clients.html Tue Jan 19 
04:22:41 2016
@@ -72,7 +72,7 @@
   
 
 
-Apache ActiveMQ is a message broker 
written in Java together with a full JMS client, however it supports protocols 
likeOpenWireandSTOMPthat can be used by applications 
in other languages.Client 
Librarieshttp://activemq.apache.org/nms/;>.NEThttp://docs.codehaus.org/display/STOMP/C; 
style="line-height: 1.42857;" rel="nofollow">C(defunct)http://activemq.apache.org/cms/;>C++https://github.com/igb/Erlang-STOMP-Client; 
style="line-height: 1.42857;" rel="nofollow">ErlangGohttps://github.com/toschoo/mom/; rel="nofollow">Haskellhttps://code.google.com/p/hxstomp/; 
rel="nofollow">Haxe (defunct)https://github.com/fribeiro1/jekpro-activemq-library; style="line-height: 
1.42857;" rel="nofollow">Jekejeke Prologhttps://github.com/fribeiro1/ActiveMQ-Extension; 
style="line-height: 1.42857;" rel="nofollow">NetLogohttp://search.cpan.org/~lcons/Net-STOMP-Client/; style="line-height: 
1.42857;" rel="nofollow">Perl 5https://github.com/hww3/pike_modules-public_protocols_stomp; 
style="line-height: 1.42857;" rel="nofollow">Pikehttps://github.com/jasonrbriggs/stomp.py/; 
rel="nofollow">Pythonhttps://github.com/tonyg/racket-stomp; style="line-height: 1.42857;" 
rel="nofollow">Rackethttps://github.com/kookster/activemessaging; rel="nofollow">Ruby on 
Railshttps://github.com/siemens/tstomp; style="line-height: 1.42857;" 
rel="nofollow">Tcl/TkProtocolsThe following protocols 
may be used for interoperability:AMQPMQTTOpenWireRESTSTOMPWebSocketSamplesLanguageVariantVMInterfaceProtocolCodeAwkGawkNoneSocketsSTOMPhttps://simplesassim.wordpress.com/2014/03/06/how-to-send-a-message-to-an-apache-activemq-queue-with-gawk/;
 rel="nofollow">Send to Queuehref="https://simplesassim.wordpress.com/2014/03/06/how-to-send-a-message-to-an-apache-activemq-topic-with-gawk/;
 > rel="nofollow">Send to Topicclass="external-link" 
 >href="https://simplesassim.wordpress.com/2014/03/06/how-to-receive-a-message-from-an-apache-activemq-queue-with-gawk/;
 > rel="nofollow">Receive from Queueclass="external-link" 
 >href="https://simplesassim.wordpress.com/2014/03/06/how-to-receive-a-message-from-an-apache-activemq-topic-with-gawk/;
 > rel="nofollow">Receive from Topicrowspan="1" class="confluenceTd">Cclass="confluenceTd">Noneclass="confluenceTd">Noneclass="confluenceTd">Client Libraryrowspan="1" class="confluenceTd">STOMPclass="confluenceTd">https://simplesassim.wordpress.com/2014/02/23/how-to-send-a-message-to-an-apache-activemq-queue-with-c/;
 rel="nofollow">Send to Queuehttps://simplesassim.wordpress.com/2014/02/23/how-to-send-a-message-to-an-apache-activemq-topic-with-c/;
 rel="nofollow">Send to Topichttps://simplesassim.wordpress.com/2014/02/23/how-to-receive-a-message-from-an-apache-activemq-queue-with-c/;
 rel="nofollow">Receive from Queuehttps://simplesassim.wordpress.com/2014/02/23/how-to-receive-a-message-from-an-apache-activemq-topic-with-c/;
 rel="nofollow">Receive from TopicCOBOLGNU COBOLNoneSocketsSTOMPhttps://simplesassim.wordpress.com/2014/04/15/how-to-send-a-message-to-an-apache-activemq-queue-with-gnu-cobol/;
 rel="nofollow">Send to Queuehttps://simplesassim.wordpress.com/2014/04/15/how-to-send-a-message-to-an-apache-activemq-topic-with-gnu-cobol/;
 rel="nofollow">Send to Topichttps://simplesassim.wordpress.com/2014/04/17/how-to-receive-a-message-from-an-apache-activemq-queue-with-gnu-cobol/;
 rel="nofollow">Receive from Queuehttps://simplesassim.wordpress.com/2014/04/17/how-to-receive-a-message-from-an-apache-activemq-topic-with-gnu-cobol/;
 rel="nofollow">Receive from TopicCOBOLVisual COBOLJVMClient LibraryOpenWirehttps://simplesassim.wordpress.com/2013/11/12/how-to-send-a-message-to-an-apache-activemq-queue-with-visual-cobol/;
 rel="nofollow">Send to Queuehttps://simplesassim.wordpress.com/2013/11/12/how-to-send-a-message-to-an-apache-activemq-topic-with-visual-cobol/;
 rel="nofollow">Send to Topichttps://simplesassim.wordpress.com/2013/11/13/how-to-receive-a-message-from-an-apache-activemq-queue-with-visual-cobol/;
 rel="nofollow">Receive from Queuehttps://simplesassim.wordpress.com/2013/11/13/how-to-receive-a-message-from-an-apache-activemq-topic-with-visual-cobol/;
 rel="nofollow">Receive from TopicCeylonNoneJVMClient

buildbot success in ASF Buildbot on activemq-site-production

2016-01-18 Thread buildbot 
The Buildbot has detected a restored build on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4873

Buildbot URL: http://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

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

2016-01-18 Thread Apache Jenkins Server 
See

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

2016-01-18 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java8 #589

2016-01-18 Thread Apache Jenkins Server 
See

buildbot success in ASF Buildbot on activemq-site-production

2016-01-18 Thread buildbot 
The Buildbot has detected a restored build on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4866

Buildbot URL: http://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

buildbot failure in ASF Buildbot on activemq-site-production

2016-01-18 Thread buildbot 
The Buildbot has detected a new failure on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4867

Buildbot URL: http://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

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

2016-01-18 Thread tabish 
Repository: activemq
Updated Branches:
  refs/heads/master 1ae29382e -> 193f6be68


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

Fix check for durable sub with no pending messages during checkpoint
cleanup.  

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

Branch: refs/heads/master
Commit: 193f6be6878502f3db8563465872a1afd86b7c54
Parents: 1ae2938
Author: Timothy Bish 
Authored: Mon Jan 18 17:43:18 2016 -0500
Committer: Timothy Bish 
Committed: Mon Jan 18 17:43:18 2016 -0500

--
 .../activemq/store/kahadb/MessageDatabase.java  |   7 +-
 .../org/apache/activemq/bugs/AMQ6131Test.java   | 290 +++
 2 files changed, 295 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/193f6be6/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 5c0801b..0f23356 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -853,7 +853,8 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 missingPredicates.add(new 
BTreeVisitor.BetweenVisitor(new Location(id, 
dataFile.getLength()), new Location(id + 1, 0)));
 Sequence seq = dataFile.getCorruptedBlocks().getHead();
 while (seq != null) {
-BTreeVisitor.BetweenVisitor visitor = new 
BTreeVisitor.BetweenVisitor(new Location(id, (int) 
seq.getFirst()), new Location(id, (int) seq.getLast() + 1));
+BTreeVisitor.BetweenVisitor visitor =
+new BTreeVisitor.BetweenVisitor(new 
Location(id, (int) seq.getFirst()), new Location(id, (int) seq.getLast() + 1));
 missingPredicates.add(visitor);
 knownCorruption.add(visitor);
 seq = seq.getNext();
@@ -1707,7 +1708,9 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 
 // When pending is size one that is the next 
message Id meaning there
 // are no pending messages currently.
-if (pendingAcks == null || pendingAcks.size() <= 
1) {
+if (pendingAcks == null || pendingAcks.isEmpty() ||
+(pendingAcks.size() == 1 && 
pendingAcks.getTail().range() == 1)) {
+
 if (LOG.isTraceEnabled()) {
 LOG.trace("Found candidate for rewrite: {} 
from file {}", entry.getKey(), dataFileId);
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/193f6be6/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java
new file mode 100644
index 000..2abd33f
--- /dev/null
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java
@@ -0,0 +1,290 @@
+/*
+ * 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.bugs;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static

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

2016-01-18 Thread tabish 
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x 57b65dc8e -> 7d3a71a4d


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

Fix check for durable sub with no pending messages during checkpoint
cleanup.
(cherry picked from commit 193f6be6878502f3db8563465872a1afd86b7c54)


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

Branch: refs/heads/activemq-5.13.x
Commit: 7d3a71a4dff336b6f660d7f51661829b325e034b
Parents: 57b65dc
Author: Timothy Bish 
Authored: Mon Jan 18 17:43:18 2016 -0500
Committer: Timothy Bish 
Committed: Mon Jan 18 17:45:05 2016 -0500

--
 .../activemq/store/kahadb/MessageDatabase.java  |   7 +-
 .../org/apache/activemq/bugs/AMQ6131Test.java   | 290 +++
 2 files changed, 295 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/7d3a71a4/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 5c0801b..0f23356 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -853,7 +853,8 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 missingPredicates.add(new 
BTreeVisitor.BetweenVisitor(new Location(id, 
dataFile.getLength()), new Location(id + 1, 0)));
 Sequence seq = dataFile.getCorruptedBlocks().getHead();
 while (seq != null) {
-BTreeVisitor.BetweenVisitor visitor = new 
BTreeVisitor.BetweenVisitor(new Location(id, (int) 
seq.getFirst()), new Location(id, (int) seq.getLast() + 1));
+BTreeVisitor.BetweenVisitor visitor =
+new BTreeVisitor.BetweenVisitor(new 
Location(id, (int) seq.getFirst()), new Location(id, (int) seq.getLast() + 1));
 missingPredicates.add(visitor);
 knownCorruption.add(visitor);
 seq = seq.getNext();
@@ -1707,7 +1708,9 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 
 // When pending is size one that is the next 
message Id meaning there
 // are no pending messages currently.
-if (pendingAcks == null || pendingAcks.size() <= 
1) {
+if (pendingAcks == null || pendingAcks.isEmpty() ||
+(pendingAcks.size() == 1 && 
pendingAcks.getTail().range() == 1)) {
+
 if (LOG.isTraceEnabled()) {
 LOG.trace("Found candidate for rewrite: {} 
from file {}", entry.getKey(), dataFileId);
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/7d3a71a4/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java
new file mode 100644
index 000..2abd33f
--- /dev/null
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6131Test.java
@@ -0,0 +1,290 @@
+/*
+ * 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.bugs;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;