Jenkins build is unstable: ActiveMQ-Java7-All-UnitTests #227

2015-09-11 Thread Apache Jenkins Server 
See

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

2015-09-11 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: StartUp/Stop Plugin #473

2015-09-11 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java8 #473

2015-09-11 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: Karaf Integration Tests #473

2015-09-11 Thread Apache Jenkins Server 
See

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

2015-09-11 Thread Apache Jenkins Server 
See

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

2015-09-11 Thread martyntaylor 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master c512f12a3 -> 6408fd035


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6408fd03/examples/features/standard/topic/pom.xml
--
diff --git a/examples/features/standard/topic/pom.xml 
b/examples/features/standard/topic/pom.xml
index 878d2c7..769e096 100644
--- a/examples/features/standard/topic/pom.xml
+++ b/examples/features/standard/topic/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.0
+  1.1.1-SNAPSHOT

 
topic

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6408fd03/examples/features/standard/transactional/pom.xml
--
diff --git a/examples/features/standard/transactional/pom.xml 
b/examples/features/standard/transactional/pom.xml
index 19c2a55..180fcc9 100644
--- a/examples/features/standard/transactional/pom.xml
+++ b/examples/features/standard/transactional/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.0
+  1.1.1-SNAPSHOT

 
transactional

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6408fd03/examples/features/standard/xa-heuristic/pom.xml
--
diff --git a/examples/features/standard/xa-heuristic/pom.xml 
b/examples/features/standard/xa-heuristic/pom.xml
index 8dc2c21..5f8b58a 100644
--- a/examples/features/standard/xa-heuristic/pom.xml
+++ b/examples/features/standard/xa-heuristic/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.0
+  1.1.1-SNAPSHOT

 
xa-heuristic

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6408fd03/examples/features/standard/xa-receive/pom.xml
--
diff --git a/examples/features/standard/xa-receive/pom.xml 
b/examples/features/standard/xa-receive/pom.xml
index 7b81458..288b665 100644
--- a/examples/features/standard/xa-receive/pom.xml
+++ b/examples/features/standard/xa-receive/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.0
+  1.1.1-SNAPSHOT

 
xa-receive

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6408fd03/examples/features/standard/xa-send/pom.xml
--
diff --git a/examples/features/standard/xa-send/pom.xml 
b/examples/features/standard/xa-send/pom.xml
index 7aa1d00..f0917b1 100644
--- a/examples/features/standard/xa-send/pom.xml
+++ b/examples/features/standard/xa-send/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.0
+  1.1.1-SNAPSHOT

 
xa-send

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6408fd03/examples/features/sub-modules/aerogear/pom.xml
--
diff --git a/examples/features/sub-modules/aerogear/pom.xml 
b/examples/features/sub-modules/aerogear/pom.xml
index 5acc36c..f217664 100644
--- a/examples/features/sub-modules/aerogear/pom.xml
+++ b/examples/features/sub-modules/aerogear/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.modules
   broker-modules
-  1.1.0
+  1.1.1-SNAPSHOT

 


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6408fd03/examples/features/sub-modules/artemis-ra-rar/pom.xml
--
diff --git a/examples/features/sub-modules/artemis-ra-rar/pom.xml 
b/examples/features/sub-modules/artemis-ra-rar/pom.xml
index ac4bfb8..9ba2d8c 100644
--- a/examples/features/sub-modules/artemis-ra-rar/pom.xml
+++ b/examples/features/sub-modules/artemis-ra-rar/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.modules
   broker-modules
-  1.1.0
+  1.1.1-SNAPSHOT

 
artemis-rar

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6408fd03/examples/features/sub-modules/pom.xml
--
diff --git a/examples/features/sub-modules/pom.xml 
b/examples/features/sub-modules/pom.xml
index 522fc8a..0e841db 100644
--- a/examples/features/sub-modules/pom.xml
+++ b/examples/features/sub-modules/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.clustered
   broker-features
-  1.1.0
+  1.1.1-SNAPSHOT

 
org.apache.activemq.examples.modules

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6408fd03/examples/features/sub-modules/vertx/pom.xml
--

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

2015-09-11 Thread martyntaylor 
[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/master
Commit: 6408fd03572628c42568d72aca75866120a04659
Parents: c512f12
Author: Martyn Taylor 
Authored: Fri Sep 11 19:01:57 2015 +0100
Committer: Martyn Taylor 
Committed: Fri Sep 11 19:01:57 2015 +0100

--
 artemis-boot/pom.xml | 2 +-
 artemis-cli/pom.xml  | 2 +-
 artemis-commons/pom.xml  | 2 +-
 artemis-core-client/pom.xml  | 2 +-
 artemis-distribution/pom.xml | 2 +-
 artemis-dto/pom.xml  | 2 +-
 artemis-jms-client/pom.xml   | 2 +-
 artemis-jms-server/pom.xml   | 2 +-
 artemis-journal/pom.xml  | 2 +-
 artemis-maven-plugin/pom.xml | 2 +-
 artemis-native/pom.xml   | 2 +-
 artemis-protocols/artemis-amqp-protocol/pom.xml  | 2 +-
 artemis-protocols/artemis-hornetq-protocol/pom.xml   | 2 +-
 artemis-protocols/artemis-mqtt-protocol/pom.xml  | 2 +-
 artemis-protocols/artemis-openwire-protocol/pom.xml  | 2 +-
 artemis-protocols/artemis-proton-plug/pom.xml| 2 +-
 artemis-protocols/artemis-stomp-protocol/pom.xml | 2 +-
 artemis-protocols/pom.xml| 2 +-
 artemis-ra/pom.xml   | 2 +-
 artemis-rest/pom.xml | 2 +-
 artemis-selector/pom.xml | 2 +-
 artemis-server/pom.xml   | 2 +-
 artemis-service-extensions/pom.xml   | 2 +-
 artemis-web/pom.xml  | 2 +-
 artemis-website/pom.xml  | 2 +-
 examples/features/clustered/client-side-load-balancing/pom.xml   | 2 +-
 .../features/clustered/clustered-durable-subscription/pom.xml| 2 +-
 examples/features/clustered/clustered-grouping/pom.xml   | 2 +-
 examples/features/clustered/clustered-jgroups/pom.xml| 2 +-
 examples/features/clustered/clustered-queue/pom.xml  | 2 +-
 examples/features/clustered/clustered-static-discovery/pom.xml   | 2 +-
 examples/features/clustered/clustered-static-oneway/pom.xml  | 2 +-
 examples/features/clustered/clustered-topic/pom.xml  | 2 +-
 examples/features/clustered/pom.xml  | 2 +-
 examples/features/clustered/queue-message-redistribution/pom.xml | 2 +-
 examples/features/clustered/symmetric-cluster/pom.xml| 2 +-
 examples/features/ha/application-layer-failover/pom.xml  | 2 +-
 examples/features/ha/client-side-failoverlistener/pom.xml| 2 +-
 examples/features/ha/colocated-failover-scale-down/pom.xml   | 2 +-
 examples/features/ha/colocated-failover/pom.xml  | 2 +-
 examples/features/ha/ha-policy-autobackup/pom.xml| 2 +-
 examples/features/ha/multiple-failover-failback/pom.xml  | 2 +-
 examples/features/ha/multiple-failover/pom.xml   | 2 +-
 examples/features/ha/non-transaction-failover/pom.xml| 2 +-
 examples/features/ha/pom.xml | 2 +-
 examples/features/ha/replicated-failback-static/pom.xml  | 2 +-
 examples/features/ha/replicated-failback/pom.xml | 2 +-
 examples/features/ha/replicated-multiple-failover/pom.xml| 2 +-
 examples/features/ha/replicated-transaction-failover/pom.xml | 2 +-
 examples/features/ha/scale-down/pom.xml  | 2 +-
 examples/features/ha/stop-server-failover/pom.xml| 2 +-
 examples/features/ha/transaction-failover/pom.xml| 2 +-
 examples/features/perf/perf/pom.xml  | 2 +-
 examples/features/perf/pom.xml   | 2 +-
 examples/features/perf/soak/pom.xml  | 2 +-
 examples/features/pom.xml| 2 +-
 examples/features/standard/bridge/pom.xml| 2 +-
 examples/features/standard/browser/pom.xml   | 2 +-
 examples/features/standard/client-kickoff/pom.xml| 2 +-
 examples/features/standard/c

[1/2] activemq-artemis git commit: [maven-release-plugin] prepare release 1.1.0

2015-09-11 Thread martyntaylor 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 1add10abf -> c512f12a3


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c512f12a/examples/features/standard/topic/pom.xml
--
diff --git a/examples/features/standard/topic/pom.xml 
b/examples/features/standard/topic/pom.xml
index 769e096..878d2c7 100644
--- a/examples/features/standard/topic/pom.xml
+++ b/examples/features/standard/topic/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.1-SNAPSHOT
+  1.1.0

 
topic

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c512f12a/examples/features/standard/transactional/pom.xml
--
diff --git a/examples/features/standard/transactional/pom.xml 
b/examples/features/standard/transactional/pom.xml
index 180fcc9..19c2a55 100644
--- a/examples/features/standard/transactional/pom.xml
+++ b/examples/features/standard/transactional/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.1-SNAPSHOT
+  1.1.0

 
transactional

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c512f12a/examples/features/standard/xa-heuristic/pom.xml
--
diff --git a/examples/features/standard/xa-heuristic/pom.xml 
b/examples/features/standard/xa-heuristic/pom.xml
index 5f8b58a..8dc2c21 100644
--- a/examples/features/standard/xa-heuristic/pom.xml
+++ b/examples/features/standard/xa-heuristic/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.1-SNAPSHOT
+  1.1.0

 
xa-heuristic

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c512f12a/examples/features/standard/xa-receive/pom.xml
--
diff --git a/examples/features/standard/xa-receive/pom.xml 
b/examples/features/standard/xa-receive/pom.xml
index 288b665..7b81458 100644
--- a/examples/features/standard/xa-receive/pom.xml
+++ b/examples/features/standard/xa-receive/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.1-SNAPSHOT
+  1.1.0

 
xa-receive

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c512f12a/examples/features/standard/xa-send/pom.xml
--
diff --git a/examples/features/standard/xa-send/pom.xml 
b/examples/features/standard/xa-send/pom.xml
index f0917b1..7aa1d00 100644
--- a/examples/features/standard/xa-send/pom.xml
+++ b/examples/features/standard/xa-send/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.broker
   jms-examples
-  1.1.1-SNAPSHOT
+  1.1.0

 
xa-send

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c512f12a/examples/features/sub-modules/aerogear/pom.xml
--
diff --git a/examples/features/sub-modules/aerogear/pom.xml 
b/examples/features/sub-modules/aerogear/pom.xml
index f217664..5acc36c 100644
--- a/examples/features/sub-modules/aerogear/pom.xml
+++ b/examples/features/sub-modules/aerogear/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.modules
   broker-modules
-  1.1.1-SNAPSHOT
+  1.1.0

 


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c512f12a/examples/features/sub-modules/artemis-ra-rar/pom.xml
--
diff --git a/examples/features/sub-modules/artemis-ra-rar/pom.xml 
b/examples/features/sub-modules/artemis-ra-rar/pom.xml
index 9ba2d8c..ac4bfb8 100644
--- a/examples/features/sub-modules/artemis-ra-rar/pom.xml
+++ b/examples/features/sub-modules/artemis-ra-rar/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.modules
   broker-modules
-  1.1.1-SNAPSHOT
+  1.1.0

 
artemis-rar

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c512f12a/examples/features/sub-modules/pom.xml
--
diff --git a/examples/features/sub-modules/pom.xml 
b/examples/features/sub-modules/pom.xml
index 0e841db..522fc8a 100644
--- a/examples/features/sub-modules/pom.xml
+++ b/examples/features/sub-modules/pom.xml
@@ -24,7 +24,7 @@ under the License.

   org.apache.activemq.examples.clustered
   broker-features
-  1.1.1-SNAPSHOT
+  1.1.0

 
org.apache.activemq.examples.modules

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c512f12a/examples/features/sub-modules/vertx/pom.xml
--

Git Push Summary

2015-09-11 Thread martyntaylor 
Repository: activemq-artemis
Updated Tags:  refs/tags/1.1.0 [created] dcdd7ee04

[2/2] activemq-artemis git commit: [maven-release-plugin] prepare release 1.1.0

2015-09-11 Thread martyntaylor 
[maven-release-plugin] prepare release 1.1.0


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

Branch: refs/heads/master
Commit: c512f12a346d1f7b503db29bb6b2681c38886c45
Parents: 1add10a
Author: Martyn Taylor 
Authored: Fri Sep 11 19:01:19 2015 +0100
Committer: Martyn Taylor 
Committed: Fri Sep 11 19:01:19 2015 +0100

--
 artemis-boot/pom.xml | 2 +-
 artemis-cli/pom.xml  | 2 +-
 artemis-commons/pom.xml  | 2 +-
 artemis-core-client/pom.xml  | 2 +-
 artemis-distribution/pom.xml | 2 +-
 artemis-dto/pom.xml  | 2 +-
 artemis-jms-client/pom.xml   | 2 +-
 artemis-jms-server/pom.xml   | 2 +-
 artemis-journal/pom.xml  | 2 +-
 artemis-maven-plugin/pom.xml | 2 +-
 artemis-native/pom.xml   | 2 +-
 artemis-protocols/artemis-amqp-protocol/pom.xml  | 2 +-
 artemis-protocols/artemis-hornetq-protocol/pom.xml   | 2 +-
 artemis-protocols/artemis-mqtt-protocol/pom.xml  | 2 +-
 artemis-protocols/artemis-openwire-protocol/pom.xml  | 2 +-
 artemis-protocols/artemis-proton-plug/pom.xml| 2 +-
 artemis-protocols/artemis-stomp-protocol/pom.xml | 2 +-
 artemis-protocols/pom.xml| 2 +-
 artemis-ra/pom.xml   | 2 +-
 artemis-rest/pom.xml | 2 +-
 artemis-selector/pom.xml | 2 +-
 artemis-server/pom.xml   | 2 +-
 artemis-service-extensions/pom.xml   | 2 +-
 artemis-web/pom.xml  | 2 +-
 artemis-website/pom.xml  | 2 +-
 examples/features/clustered/client-side-load-balancing/pom.xml   | 2 +-
 .../features/clustered/clustered-durable-subscription/pom.xml| 2 +-
 examples/features/clustered/clustered-grouping/pom.xml   | 2 +-
 examples/features/clustered/clustered-jgroups/pom.xml| 2 +-
 examples/features/clustered/clustered-queue/pom.xml  | 2 +-
 examples/features/clustered/clustered-static-discovery/pom.xml   | 2 +-
 examples/features/clustered/clustered-static-oneway/pom.xml  | 2 +-
 examples/features/clustered/clustered-topic/pom.xml  | 2 +-
 examples/features/clustered/pom.xml  | 2 +-
 examples/features/clustered/queue-message-redistribution/pom.xml | 2 +-
 examples/features/clustered/symmetric-cluster/pom.xml| 2 +-
 examples/features/ha/application-layer-failover/pom.xml  | 2 +-
 examples/features/ha/client-side-failoverlistener/pom.xml| 2 +-
 examples/features/ha/colocated-failover-scale-down/pom.xml   | 2 +-
 examples/features/ha/colocated-failover/pom.xml  | 2 +-
 examples/features/ha/ha-policy-autobackup/pom.xml| 2 +-
 examples/features/ha/multiple-failover-failback/pom.xml  | 2 +-
 examples/features/ha/multiple-failover/pom.xml   | 2 +-
 examples/features/ha/non-transaction-failover/pom.xml| 2 +-
 examples/features/ha/pom.xml | 2 +-
 examples/features/ha/replicated-failback-static/pom.xml  | 2 +-
 examples/features/ha/replicated-failback/pom.xml | 2 +-
 examples/features/ha/replicated-multiple-failover/pom.xml| 2 +-
 examples/features/ha/replicated-transaction-failover/pom.xml | 2 +-
 examples/features/ha/scale-down/pom.xml  | 2 +-
 examples/features/ha/stop-server-failover/pom.xml| 2 +-
 examples/features/ha/transaction-failover/pom.xml| 2 +-
 examples/features/perf/perf/pom.xml  | 2 +-
 examples/features/perf/pom.xml   | 2 +-
 examples/features/perf/soak/pom.xml  | 2 +-
 examples/features/pom.xml| 2 +-
 examples/features/standard/bridge/pom.xml| 2 +-
 examples/features/standard/browser/pom.xml   | 2 +-
 examples/features/standard/client-kickoff/pom.xml| 2 +-
 examples/features/standard/consumer-rate-limi

Git Push Summary

2015-09-11 Thread martyntaylor 
Repository: activemq-artemis
Updated Tags:  refs/tags/1.1.0 [deleted] 8a3835523

activemq-artemis git commit: ARTEMIS-223 Testcase replicating issue

2015-09-11 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 853317145 -> 1add10abf


ARTEMIS-223 Testcase replicating issue


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

Branch: refs/heads/master
Commit: 1add10abfd001f66ebfd6f511481432e8caa1d99
Parents: 8533171
Author: Clebert Suconic 
Authored: Fri Sep 11 12:07:48 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 13:21:50 2015 -0400

--
 .../impl/journal/BatchingIDGenerator.java   |  8 
 .../impl/journal/JournalStorageManager.java |  5 ++
 .../persistence/XmlImportExportTest.java| 49 ++--
 3 files changed, 58 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1add10ab/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
index 7b32c4c..a8bb7cb 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
@@ -92,6 +92,14 @@ public final class BatchingIDGenerator implements 
IDGenerator {
   counter.set(nextID);
}
 
+   // for testcases
+   public void forceNextID(long nextID) {
+  long idJournal = counter.incrementAndGet();
+  counter.set(nextID);
+  storeID(idJournal, nextID);
+
+   }
+
public long generateID() {
   long id = counter.getAndIncrement();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1add10ab/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index f1a6e38..440bd62 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -115,6 +115,7 @@ import org.apache.activemq.artemis.utils.ByteUtil;
 import org.apache.activemq.artemis.utils.DataConstants;
 import org.apache.activemq.artemis.utils.ExecutorFactory;
 import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
+import org.apache.activemq.artemis.utils.IDGenerator;
 import org.apache.activemq.artemis.utils.UUID;
 import org.apache.activemq.artemis.utils.XidCodecSupport;
 
@@ -462,6 +463,10 @@ public class JournalStorageManager implements 
StorageManager {
   largeMessagesToDelete.clear();
}
 
+   public IDGenerator getIDGenerator() {
+  return idGenerator;
+   }
+
/**
 * @param pageFilesToSync
 * @throws Exception

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1add10ab/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
index 962490f..f2e321b 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/XmlImportExportTest.java
@@ -25,6 +25,7 @@ import javax.jms.Session;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 import org.apache.activemq.artemis.api.core.Message;
@@ -40,6 +41,7 @@ import 
org.apache.activemq.artemis.api.core.client.ServerLocator;
 import org.apache.activemq.artemis.api.jms.JMSFactoryType;
 import org.apache.activemq.artemis.cli.commands.tools.XmlDataExporter;
 import org.apache.activemq.artemis.cli.commands.tools.X

activemq-artemis git commit: ARTEMIS-223 fix on long conversion

2015-09-11 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 490662923 -> 853317145


ARTEMIS-223 fix on long conversion


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

Branch: refs/heads/master
Commit: 853317145964671d94a0485ee7baa3335f402c15
Parents: 4906629
Author: Clebert Suconic 
Authored: Fri Sep 11 11:55:06 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 11:55:06 2015 -0400

--
 .../activemq/artemis/cli/commands/tools/XmlDataImporter.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/85331714/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
index c850262..1946687 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
@@ -336,7 +336,8 @@ public final class XmlDataImporter extends ActionAbstract {
 managementSession.start();
 ActiveMQServerLogger.LOGGER.debug("Requesting ID for: " + queue);
 ClientMessage reply = requestor.request(managementMessage);
-queueID = (Long) ManagementHelper.getResult(reply);
+Number idObject = (Number) ManagementHelper.getResult(reply);
+queueID = idObject.longValue();
 requestor.close();
 ActiveMQServerLogger.LOGGER.debug("ID for " + queue + " is: " + 
queueID);
 queueIDs.put(queue, queueID);  // store it so we don't have to 
look it up every time

activemq-artemis git commit: fixing checkstyle on example

2015-09-11 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 243a94176 -> 490662923


fixing checkstyle on 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/49066292
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/49066292
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/49066292

Branch: refs/heads/master
Commit: 490662923c14014233b38850ee8968283be1dc76
Parents: 243a941
Author: Clebert Suconic 
Authored: Fri Sep 11 10:16:28 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 10:16:34 2015 -0400

--
 examples/protocols/amqp/queue/pom.xml   |  2 +-
 .../artemis/jms/example/AMQPQueueExample.java   | 67 
 .../artemis/jms/example/ProtonJExample.java | 67 
 .../artemis/tests/unit/util/LinkedListTest.java | 10 +--
 4 files changed, 73 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/49066292/examples/protocols/amqp/queue/pom.xml
--
diff --git a/examples/protocols/amqp/queue/pom.xml 
b/examples/protocols/amqp/queue/pom.xml
index 8a2b028..c0ade01 100644
--- a/examples/protocols/amqp/queue/pom.xml
+++ b/examples/protocols/amqp/queue/pom.xml
@@ -78,7 +78,7 @@ under the License.
  runClient
   
   
- 
org.apache.activemq.artemis.jms.example.ProtonJExample
+ 
org.apache.activemq.artemis.jms.example.AMQPQueueExample
   



http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/49066292/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java
--
diff --git 
a/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java
 
b/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java
new file mode 100644
index 000..ea3f006
--- /dev/null
+++ 
b/examples/protocols/amqp/queue/src/main/java/org/apache/activemq/artemis/jms/example/AMQPQueueExample.java
@@ -0,0 +1,67 @@
+/*
+ * 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.jms.example;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.apache.qpid.jms.JmsConnectionFactory;
+
+public class AMQPQueueExample {
+
+   public static void main(String[] args) throws Exception {
+  Connection connection = null;
+  ConnectionFactory connectionFactory = new 
JmsConnectionFactory("amqp://localhost:5672");
+
+  try {
+
+ // Step 1. Create an amqp qpid 1.0 connection
+ connection = connectionFactory.createConnection();
+
+ // Step 2. Create a session
+ Session session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
+
+ // Step 3. Create a sender
+ Queue queue = session.createQueue("jms.queue.exampleQueue");
+ MessageProducer sender = session.createProducer(queue);
+
+ // Step 4. send a few simple message
+ sender.send(session.createTextMessage("Hello world "));
+
+ connection.start();
+
+ // Step 5. create a moving receiver, this means the message will be 
removed from the queue
+ MessageConsumer consumer = session.createConsumer(queue);
+
+ // Step 7. receive the simple message
+ TextMessage m = (TextMessage) consumer.receive(5000);
+ System.out.println("message = " + m.getText());
+
+  }
+  finally {
+ if (connection != null) {
+// Step 9. close the connection
+connection.close();
+ }
+  }
+   }
+}

http://git-wip-us.apache.org/rep

[8/8] activemq-artemis git commit: Merge PR #166

2015-09-11 Thread martyntaylor 
Merge PR #166


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

Branch: refs/heads/master
Commit: 243a94176d94bad87e5c0c89600dc980ee22ba29
Parents: 7316609 6cbde62
Author: Martyn Taylor 
Authored: Fri Sep 11 15:05:19 2015 +0100
Committer: Martyn Taylor 
Committed: Fri Sep 11 15:05:19 2015 +0100

--
 README.md   |   6 +
 .../core/client/impl/ServerLocatorImpl.java |  71 
 artemis-protocols/artemis-proton-plug/pom.xml   |   4 +-
 .../org/proton/plug/test/AbstractJMSTest.java   |  34 +---
 .../java/org/proton/plug/test/ProtonTest.java   |  29 ++--
 docs/user-manual/en/persistence.md  |  28 +---
 examples/protocols/amqp/pom.xml |   4 +-
 examples/protocols/amqp/proton-j/pom.xml| 108 
 examples/protocols/amqp/proton-j/readme.html|  95 ---
 .../artemis/jms/example/ProtonJExample.java |  64 ---
 .../activemq/server0/artemis-roles.properties   |  17 --
 .../activemq/server0/artemis-users.properties   |  17 --
 .../main/resources/activemq/server0/broker.xml  |  68 
 examples/protocols/amqp/queue/pom.xml   | 108 
 examples/protocols/amqp/queue/readme.html   |  46 +
 .../artemis/jms/example/ProtonJExample.java |  67 
 pom.xml |  67 
 tests/activemq5-unit-tests/pom.xml  |   8 -
 .../activemq/conversions/AmqpAndMqttTest.java   | 119 -
 tests/integration-tests/pom.xml |   4 +-
 .../jms/cluster/MultipleThreadsOpeningTest.java |  33 ++--
 .../tests/integration/proton/ProtonTest.java| 167 ++-
 22 files changed, 372 insertions(+), 792 deletions(-)
--

[3/8] activemq-artemis git commit: using new qpid-jms client on AMQP

2015-09-11 Thread martyntaylor 
using new qpid-jms client on AMQP


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

Branch: refs/heads/master
Commit: 7b2c50415af90c748a6e1b343b45dcd5bec8b196
Parents: 649edd3
Author: Clebert Suconic 
Authored: Thu Sep 10 13:57:18 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 09:06:00 2015 -0400

--
 artemis-protocols/artemis-proton-plug/pom.xml   |   4 +-
 .../org/proton/plug/test/AbstractJMSTest.java   |  34 +---
 .../java/org/proton/plug/test/ProtonTest.java   |  29 ++--
 examples/protocols/amqp/pom.xml |   4 +-
 examples/protocols/amqp/proton-j/pom.xml| 108 -
 examples/protocols/amqp/proton-j/readme.html|  95 ---
 .../artemis/jms/example/ProtonJExample.java |  64 
 .../activemq/server0/artemis-roles.properties   |  17 --
 .../activemq/server0/artemis-users.properties   |  17 --
 .../main/resources/activemq/server0/broker.xml  |  68 
 examples/protocols/amqp/queue/pom.xml   | 108 +
 examples/protocols/amqp/queue/readme.html   |  46 ++
 .../artemis/jms/example/ProtonJExample.java |  67 
 tests/activemq5-unit-tests/pom.xml  |   8 -
 tests/integration-tests/pom.xml |   4 +-
 .../tests/integration/proton/ProtonTest.java| 160 ++-
 16 files changed, 258 insertions(+), 575 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/artemis-protocols/artemis-proton-plug/pom.xml
--
diff --git a/artemis-protocols/artemis-proton-plug/pom.xml 
b/artemis-protocols/artemis-proton-plug/pom.xml
index cedbc87..47e3a91 100644
--- a/artemis-protocols/artemis-proton-plug/pom.xml
+++ b/artemis-protocols/artemis-proton-plug/pom.xml
@@ -88,8 +88,8 @@
   
   
  org.apache.qpid
- qpid-amqp-1-0-client-jms
- 0.24
+ qpid-jms-client
+ 0.5.0
  test
   
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7b2c5041/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
--
diff --git 
a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
 
b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
index bccea5f..90fff62 100644
--- 
a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
+++ 
b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/AbstractJMSTest.java
@@ -21,24 +21,22 @@ import javax.jms.ConnectionFactory;
 import javax.jms.ExceptionListener;
 import javax.jms.JMSException;
 import javax.jms.Queue;
+import javax.jms.Session;
 
 import java.lang.ref.WeakReference;
 
-import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
-import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
+import org.apache.qpid.jms.JmsConnectionFactory;
 import org.proton.plug.test.minimalserver.DumbServer;
 import org.proton.plug.test.minimalserver.MinimalServer;
 
 public class AbstractJMSTest {
 
-   protected final boolean useHawtJMS;
protected final boolean useSASL;
 
protected String address = "exampleQueue";
protected MinimalServer server = new MinimalServer();
 
-   public AbstractJMSTest(boolean useHawtJMS, boolean useSASL) {
-  this.useHawtJMS = useHawtJMS;
+   public AbstractJMSTest(boolean useSASL) {
   this.useSASL = useSASL;
}
 
@@ -77,34 +75,16 @@ public class AbstractJMSTest {
 
protected ConnectionFactory createConnectionFactory() {
   if (useSASL) {
- if (useHawtJMS) {
-//return new JmsConnectionFactory("", 
"aaa", "amqp://localhost:" + Constants.PORT);
-return null;
- }
- else {
-return new ConnectionFactoryImpl("localhost", Constants.PORT, 
"", "aaa");
- }
+ return new JmsConnectionFactory("", "aaa", 
"amqp://localhost:5672");
   }
   else {
- if (useHawtJMS) {
-//return new JmsConnectionFactory("amqp://localhost:" 
+ Constants.PORT);
-return null;
- }
- else {
-return new ConnectionFactoryImpl("localhost", Constants.PORT, 
null, null);
- }
+ return new JmsConnectionFactory( "amqp://localhost:5672");
 
   }
}
 
-   protected Queue createQueue() {
-  if (useHawtJMS) {
- // return new JmsQueue(ad

[6/8] activemq-artemis git commit: ARTEMIS-222 fixing a deadlock that appeared on the testsuite (MultipleThreadsOpeningTest)

2015-09-11 Thread martyntaylor 
ARTEMIS-222 fixing a deadlock that appeared on the testsuite 
(MultipleThreadsOpeningTest)

https://issues.apache.org/jira/browse/ARTEMIS-222


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

Branch: refs/heads/master
Commit: f5a727259e7d913c49130e57155ad7aa2616f79f
Parents: d5a0128
Author: Clebert Suconic 
Authored: Thu Sep 10 16:22:38 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 09:07:49 2015 -0400

--
 .../core/client/impl/ServerLocatorImpl.java | 71 +++-
 .../jms/cluster/MultipleThreadsOpeningTest.java | 33 ++---
 2 files changed, 64 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f5a72725/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index bed47b7..c979246 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -561,32 +561,34 @@ public final class ServerLocatorImpl implements 
ServerLocatorInternal, Discovery
   clusterTransportConfiguration = locator.clusterTransportConfiguration;
}
 
-   private synchronized TransportConfiguration selectConnector() {
+   private TransportConfiguration selectConnector() {
   Pair[] usedTopology;
 
   synchronized (topologyArrayGuard) {
  usedTopology = topologyArray;
   }
 
-  // if the topologyArray is null, we will use the initialConnectors
-  if (usedTopology != null) {
- if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) {
-ActiveMQClientLogger.LOGGER.trace("Selecting connector from 
toplogy.");
- }
- int pos = loadBalancingPolicy.select(usedTopology.length);
- Pair pair = 
usedTopology[pos];
+  synchronized (this) {
+ // if the topologyArray is null, we will use the initialConnectors
+ if (usedTopology != null) {
+if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) {
+   ActiveMQClientLogger.LOGGER.trace("Selecting connector from 
toplogy.");
+}
+int pos = loadBalancingPolicy.select(usedTopology.length);
+Pair pair = 
usedTopology[pos];
 
- return pair.getA();
-  }
-  else {
- // Get from initialconnectors
- if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) {
-ActiveMQClientLogger.LOGGER.trace("Selecting connector from 
initial connectors.");
+return pair.getA();
  }
+ else {
+// Get from initialconnectors
+if (ActiveMQClientLogger.LOGGER.isTraceEnabled()) {
+   ActiveMQClientLogger.LOGGER.trace("Selecting connector from 
initial connectors.");
+}
 
- int pos = loadBalancingPolicy.select(initialConnectors.length);
+int pos = loadBalancingPolicy.select(initialConnectors.length);
 
- return initialConnectors[pos];
+return initialConnectors[pos];
+ }
   }
}
 
@@ -637,16 +639,23 @@ public final class ServerLocatorImpl implements 
ServerLocatorInternal, Discovery
}
 
private ClientSessionFactoryInternal connect(final boolean skipWarnings) 
throws ActiveMQException {
+  ClientSessionFactoryInternal returnFactory = null;
+
   synchronized (this) {
  // static list of initial connectors
  if (getNumInitialConnectors() > 0 && discoveryGroup == null) {
-ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) 
staticConnector.connect(skipWarnings);
-addFactory(sf);
-return sf;
+returnFactory = (ClientSessionFactoryInternal) 
staticConnector.connect(skipWarnings);
  }
   }
-  // wait for discovery group to get the list of initial connectors
-  return (ClientSessionFactoryInternal) createSessionFactory();
+
+  if (returnFactory != null) {
+ addFactory(returnFactory);
+ return returnFactory;
+  }
+  else {
+ // wait for discovery group to get the list of initial connectors
+ return (ClientSessionFactoryInternal) createSessionFactory();
+  }
}
 
@Override
@@ -844,11 +853,11 @@ public final class ServerLoca

[1/8] activemq-artemis git commit: improving jdk detection and javadoc options

2015-09-11 Thread martyntaylor 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 7316609dd -> 243a94176


improving jdk detection and javadoc options

The build wasn't working at this stage unless I specified release due to some 
javadoc issues
What could break builds after releases


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

Branch: refs/heads/master
Commit: 649edd3a376819312d5e4552a90e83b4dbdc4929
Parents: 7316609
Author: Clebert Suconic 
Authored: Thu Sep 10 13:56:20 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 09:05:25 2015 -0400

--
 pom.xml | 67 +---
 1 file changed, 37 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/649edd3a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c06e961..f26dd51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,26 @@
   artemis-protocols
   artemis-dto
   artemis-boot
+  artemis-web
+  artemis-website
+  artemis-cli
+  artemis-commons
+  artemis-selector
+  artemis-core-client
+  artemis-server
+  artemis-jms-client
+  artemis-jms-server
+  artemis-native
+  artemis-journal
+  artemis-ra
+  artemis-rest
+  artemis-service-extensions
+  artemis-maven-plugin
+  integration/activemq-spring-integration
+  integration/activemq-aerogear-integration
+  integration/activemq-vertx-integration
+  artemis-distribution
+  tests

 
ActiveMQ Artemis Parent
@@ -483,6 +503,23 @@

 
   
+ jdk18
+ 
+1.8
+ 
+ 
+
+   
+  org.apache.maven.plugins
+  maven-javadoc-plugin
+  
+ -Xdoclint:none
+  
+   
+
+ 
+  
+  
  dev
  
 artemis-boot
@@ -517,29 +554,6 @@
  
 true
  
- 
-artemis-dto
-artemis-web
-artemis-website
-artemis-cli
-artemis-commons
-artemis-selector
-artemis-core-client
-artemis-server
-artemis-jms-client
-artemis-jms-server
-artemis-native
-artemis-journal
-artemis-ra
-artemis-rest
-artemis-service-extensions
-artemis-maven-plugin
-integration/activemq-spring-integration
-integration/activemq-aerogear-integration
-integration/activemq-vertx-integration
-artemis-distribution
-tests
- 
   
   
  release
@@ -594,13 +608,6 @@
  
   

-   
-  org.apache.maven.plugins
-  maven-javadoc-plugin
-  
- -Xdoclint:none
-  
-

[5/8] activemq-artemis git commit: Improving test.

2015-09-11 Thread martyntaylor 
Improving test.

There's a race here that only happens on Virtual Machines (VMWare.. etc)


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

Branch: refs/heads/master
Commit: d5a01287a5c54c3a6f1c1e8b22f7a4885cb83163
Parents: d3ea9ac
Author: Clebert Suconic 
Authored: Thu Sep 10 17:50:07 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 09:06:38 2015 -0400

--
 .../activemq/artemis/tests/integration/proton/ProtonTest.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d5a01287/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
index e779c14..7663f69 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/proton/ProtonTest.java
@@ -131,6 +131,7 @@ public class ProtonTest extends ActiveMQTestBase {
@After
public void tearDown() throws Exception {
   try {
+ Thread.sleep(250);
  if (connection != null) {
 connection.close();
  }
@@ -257,6 +258,10 @@ public class ProtonTest extends ActiveMQTestBase {
 
   cons.close();
 
+  for (int i = 0; i < 100 && serverQueue.getConsumerCount() != 0; i++) {
+ Thread.sleep(500);
+  }
+
   assertEquals(0, serverQueue.getConsumerCount());
 
   session.close();
@@ -330,7 +335,7 @@ public class ProtonTest extends ActiveMQTestBase {
   connection = createConnection();
   session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
   MessageConsumer consumer = session.createConsumer(queue);
-  Thread.sleep(1000);
+  Thread.sleep(100);
   consumer.close();
   connection.close();
   Assert.assertEquals(numMessages, getMessageCount(q));

[7/8] activemq-artemis git commit: small change on README around docs

2015-09-11 Thread martyntaylor 
small change on README around docs


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

Branch: refs/heads/master
Commit: 6cbde624d8d912a49240fab2df122821a9ce2606
Parents: f5a7272
Author: Clebert Suconic 
Authored: Fri Sep 11 09:18:53 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 09:18:53 2015 -0400

--
 README.md | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6cbde624/README.md
--
diff --git a/README.md b/README.md
index 195441f..213688b 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,12 @@ This file describes some minimum 'stuff one needs to know' to 
get started coding
 For details about the modifying the code, building the project, running tests, 
IDE integration, etc. see
 our [Hacking Guide](./docs/hacking-guide/en/SUMMARY.md).
 
+## Documentation
+
+Our documentation is always in sync with our releases at the [Apache ActiveMQ 
Artemis](http://activemq.apache.org/artemis/docs.html) website.
+
+Or you can also look at the current master version on 
[github](https://github.com/apache/activemq-artemis/blob/master/docs/user-manual/en/SUMMARY.md).
+
 ## Examples
 
 To run an example firstly make sure you have run

[2/8] activemq-artemis git commit: Removing a non open wire test -- this test is only validating AMQP <-> MQTT converstion through ActiveMQ5. No value for OpenWire tests

2015-09-11 Thread martyntaylor 
Removing a non open wire test
-- this test is only validating AMQP <-> MQTT converstion through ActiveMQ5. No 
value for OpenWire tests


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

Branch: refs/heads/master
Commit: e7e1e0c6ebd30748743585fa1620b1fa1aa47ed9
Parents: 7b2c504
Author: Clebert Suconic 
Authored: Thu Sep 10 15:52:56 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 09:06:00 2015 -0400

--
 .../activemq/conversions/AmqpAndMqttTest.java   | 119 ---
 1 file changed, 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e7e1e0c6/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/conversions/AmqpAndMqttTest.java
--
diff --git 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/conversions/AmqpAndMqttTest.java
 
b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/conversions/AmqpAndMqttTest.java
deleted file mode 100644
index d9b7add..000
--- 
a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/conversions/AmqpAndMqttTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.conversions;
-
-import org.apache.activemq.CombinationTestSupport;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
-import org.apache.qpid.amqp_1_0.jms.impl.QueueImpl;
-import org.apache.qpid.amqp_1_0.jms.impl.TopicImpl;
-import org.fusesource.mqtt.client.BlockingConnection;
-import org.fusesource.mqtt.client.MQTT;
-import org.fusesource.mqtt.client.QoS;
-
-import javax.jms.*;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-
-/**
- */
-public class AmqpAndMqttTest extends CombinationTestSupport {
-
-   protected BrokerService broker;
-   private TransportConnector amqpConnector;
-   private TransportConnector mqttConnector;
-
-   @Override
-   protected void setUp() throws Exception {
-  super.setUp();
-  broker = createBroker();
-  broker.start();
-  broker.waitUntilStarted();
-   }
-
-   @Override
-   protected void tearDown() throws Exception {
-  if (broker != null) {
- broker.stop();
- broker.waitUntilStopped();
- broker = null;
-  }
-  super.tearDown();
-   }
-
-   protected BrokerService createBroker() throws Exception {
-  BrokerService broker = new BrokerService();
-  broker.setPersistent(false);
-  amqpConnector = broker.addConnector("amqp://0.0.0.0:0");
-  mqttConnector = broker.addConnector("mqtt://0.0.0.0:0");
-  return broker;
-   }
-
-   public void testFromMqttToAmqp() throws Exception {
-  Connection amqp = createAmqpConnection();
-  Session session = amqp.createSession(false, Session.AUTO_ACKNOWLEDGE);
-  MessageConsumer consumer = 
session.createConsumer(session.createTopic("topic://FOO"));
-
-  final BlockingConnection mqtt = 
createMQTTConnection().blockingConnection();
-  mqtt.connect();
-  byte[] payload = bytes("Hello World");
-  mqtt.publish("FOO", payload, QoS.AT_LEAST_ONCE, false);
-  mqtt.disconnect();
-
-  Message msg = consumer.receive(1000 * 5);
-  assertNotNull(msg);
-  assertTrue(msg instanceof BytesMessage);
-
-  BytesMessage bmsg = (BytesMessage) msg;
-  byte[] actual = new byte[(int) bmsg.getBodyLength()];
-  bmsg.readBytes(actual);
-  assertTrue(Arrays.equals(actual, payload));
-  amqp.close();
-   }
-
-   private byte[] bytes(String value) {
-  try {
- return value.getBytes("UTF-8");
-  }
-  catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
-  }
-   }
-
-   protected MQTT createMQTTConnect

[4/8] activemq-artemis git commit: removing old doc (non relevant any longer)

2015-09-11 Thread martyntaylor 
removing old doc (non relevant any longer)


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

Branch: refs/heads/master
Commit: d3ea9aca504fc2305a55dc18d6e608cb8f95c181
Parents: e7e1e0c
Author: Clebert Suconic 
Authored: Thu Sep 10 16:31:47 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 09:06:00 2015 -0400

--
 docs/user-manual/en/persistence.md | 28 +---
 1 file changed, 1 insertion(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d3ea9aca/docs/user-manual/en/persistence.md
--
diff --git a/docs/user-manual/en/persistence.md 
b/docs/user-manual/en/persistence.md
index c5f0862..a9269b1 100644
--- a/docs/user-manual/en/persistence.md
+++ b/docs/user-manual/en/persistence.md
@@ -269,7 +269,7 @@ The message journal is configured using the following 
attributes in
 journal. The compacting algorithm won't start until you have at
 least `journal-compact-min-files`
 
-Setting this to 0 will disable the feature to compact completely. 
+Setting this to 0 will disable the feature to compact completely.
 This could be dangerous though as the journal could grow indefinitely.
 Use it wisely!
 
@@ -354,29 +354,3 @@ straightforward. Simply set the parameter 
`persistence-enabled` in
 Please note that if you set this parameter to false, then *zero*
 persistence will occur. That means no bindings data, message data, large
 message data, duplicate id caches or paging data will be persisted.
-
-## Import/Export the Journal Data
-
-You may want to inspect the existent records on each one of the journals
-used by Apache ActiveMQ Artemis, and you can use the export/import tool for 
that
-purpose.
-you can export the journal as a text file by using this command:
-
-`java -cp activemq-tools-jar-with-dependencies.jar export-journal 
`
-
-To import the file as binary data on the journal (Notice you also
-require netty.jar):
-
-`java -cp activemq-tools-jar-with-dependencies.jar import-journal 
`
-
--   JournalDirectory: Use the configured folder for your selected folder. 
Example: ./activemq/data/journal
-
--   JournalPrefix: Use the prefix for your selected journal, as discussed above
-
--   FileExtension: Use the extension for your selected journal, as discussed 
above
-
--   FileSize: Use the size for your selected journal, as discussed above
-
--   FileOutput or FileInput: text file that will contain the exported data
-
-See [Tools](tools.md) for more information.

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

2015-09-11 Thread clebertsuconic 
This closes #165


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

Branch: refs/heads/master
Commit: 7316609dd08f63a0d11bac78e02b366cf3ce5ed6
Parents: f4751af 91d93a0
Author: Clebert Suconic 
Authored: Fri Sep 11 08:45:08 2015 -0400
Committer: Clebert Suconic 
Committed: Fri Sep 11 08:45:08 2015 -0400

--
 .../activemq/artemis/cli/commands/tools/XmlDataImporter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/2] activemq-artemis git commit: ARTEMIS-223 Cast QueueId to Long not Integer

2015-09-11 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master f4751afcd -> 7316609dd


ARTEMIS-223 Cast QueueId to Long not Integer


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

Branch: refs/heads/master
Commit: 91d93a002c3986473bb0a7391c3e85dd698fe06e
Parents: f4751af
Author: Martyn Taylor 
Authored: Fri Sep 11 10:53:55 2015 +0100
Committer: Martyn Taylor 
Committed: Fri Sep 11 10:55:31 2015 +0100

--
 .../activemq/artemis/cli/commands/tools/XmlDataImporter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/91d93a00/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
index 854ca98..c850262 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
@@ -336,7 +336,7 @@ public final class XmlDataImporter extends ActionAbstract {
 managementSession.start();
 ActiveMQServerLogger.LOGGER.debug("Requesting ID for: " + queue);
 ClientMessage reply = requestor.request(managementMessage);
-queueID = (Integer) ManagementHelper.getResult(reply);
+queueID = (Long) ManagementHelper.getResult(reply);
 requestor.close();
 ActiveMQServerLogger.LOGGER.debug("ID for " + queue + " is: " + 
queueID);
 queueIDs.put(queue, queueID);  // store it so we don't have to 
look it up every time

activemq git commit: Adding logging to help debug test failures

2015-09-11 Thread cshannon 
Repository: activemq
Updated Branches:
  refs/heads/master fe34a61c3 -> 226222546


Adding logging to help debug test failures

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


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

Branch: refs/heads/master
Commit: 226222546ab94441e6d66ea641092471d5b8b886
Parents: fe34a61
Author: Christopher L. Shannon (cshannon) 
Authored: Fri Sep 11 11:33:28 2015 +
Committer: Christopher L. Shannon (cshannon) 
Committed: Fri Sep 11 12:09:25 2015 +

--
 .../region/cursors/KahaDBPendingMessageCursorTest.java | 13 +++--
 .../cursors/MultiKahaDBPendingMessageCursorTest.java   |  2 +-
 .../activemq/store/AbstractStoreStatTestSupport.java   |  8 
 .../store/kahadb/KahaDBMessageStoreSizeStatTest.java   |  9 +
 .../kahadb/MultiKahaDBMessageStoreSizeStatTest.java| 11 +++
 5 files changed, 28 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/22622254/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java
index 7d54b08..557c70e 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/KahaDBPendingMessageCursorTest.java
@@ -45,12 +45,13 @@ public class KahaDBPendingMessageCursorTest extends
 protected static final Logger LOG = LoggerFactory
 .getLogger(KahaDBPendingMessageCursorTest.class);
 
-File dataFileDir = new File("target/test-amq-5923/pending-datadb");
+@Rule
+public TemporaryFolder dataFileDir = new TemporaryFolder(new 
File("target"));
 
 @Override
 protected void setUpBroker(boolean clearDataDir) throws Exception {
-if (clearDataDir && dataFileDir.exists())
-FileUtils.cleanDirectory(dataFileDir);
+if (clearDataDir && dataFileDir.getRoot().exists())
+FileUtils.cleanDirectory(dataFileDir.getRoot());
 super.setUpBroker(clearDataDir);
 }
 
@@ -58,7 +59,7 @@ public class KahaDBPendingMessageCursorTest extends
 protected void initPersistence(BrokerService brokerService)
 throws IOException {
 broker.setPersistent(true);
-broker.setDataDirectoryFile(dataFileDir);
+broker.setDataDirectoryFile(dataFileDir.getRoot());
 }
 
 /**
@@ -67,7 +68,7 @@ public class KahaDBPendingMessageCursorTest extends
  *
  * @throws Exception
  */
-@Test(timeout=2)
+@Test(timeout=1)
 public void testDurableMessageSizeAfterRestartAndPublish() throws 
Exception {
 AtomicLong publishedMessageSize = new AtomicLong();
 
@@ -106,7 +107,7 @@ public class KahaDBPendingMessageCursorTest extends
  *
  * @throws Exception
  */
-@Test(timeout=2)
+@Test(timeout=1)
 public void testNonPersistentDurableMessageSize() throws Exception {
 AtomicLong publishedMessageSize = new AtomicLong();
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/22622254/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java
index e1c3f22..9768980 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/MultiKahaDBPendingMessageCursorTest.java
@@ -41,7 +41,7 @@ public class MultiKahaDBPendingMessageCursorTest extends
 
 //setup multi-kaha adapter
 MultiKahaDBPersistenceAdapter persistenceAdapter = new 
MultiKahaDBPersistenceAdapter();
-persistenceAdapter.setDirectory(dataFileDir);
+persistenceAdapter.setDirectory(dataFileDir.getRoot());
 
 KahaDBPersistenceAdapter kahaStore = new KahaDBPersistenceAdapter();
 kahaStore.setJournalMaxFileLength(1024 * 512);

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

Jenkins build is unstable: ActiveMQ-Java7 » ActiveMQ :: StartUp/Stop Plugin #817

2015-09-11 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java7 » ActiveMQ :: Web #817

2015-09-11 Thread Apache Jenkins Server 
See

Jenkins build is unstable: ActiveMQ-Java7 #817

2015-09-11 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java7 » ActiveMQ :: Assembly #817

2015-09-11 Thread Apache Jenkins Server 
See

Jenkins build is unstable: ActiveMQ-Java7 » ActiveMQ :: HTTP Protocol Support #817

2015-09-11 Thread Apache Jenkins Server 
See

Jenkins build is unstable: ActiveMQ-Java7 » ActiveMQ :: Karaf Integration Tests #817

2015-09-11 Thread Apache Jenkins Server 
See

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

2015-09-11 Thread Apache Jenkins Server 
See