Jenkins build is still unstable: ActiveMQ-Java7 » ActiveMQ :: MQTT Protocol #1154

[Apache Jenkins Server]

See 

Jenkins build is unstable: ActiveMQ-Java8 #856

[Apache Jenkins Server]

See 

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

[Apache Jenkins Server]

See 

Jenkins build is back to normal : ActiveMQ-Java8 » ActiveMQ :: Unit Tests #856

[Apache Jenkins Server]

See 

Build failed in Jenkins: ActiveMQ-Artemis-Master #691

[Apache Jenkins Server]

See 

Changes:

[tabish121] ARTEMIS-776 Attach response should only list supported filters

[clebertsuconic] ARTEMIS-777 Remove dependency on legacy Qpid AMQP 0.x JMS 
client

[clebertsuconic] ARTEMIS-775 Tests for AMQP credit handling

[clebertsuconic] ARTEMIS-761 fix possible dup journal record ID

--
[...truncated 21274 lines...]
[INFO] Exclude: **/*.jceks
[INFO] Exclude: **/*.jks
[INFO] Exclude: **/org/apache/activemq/artemis/utils/json/**
[INFO] Exclude: **/org/apache/activemq/artemis/utils/Base64.java
[INFO] Exclude: **/.settings/**
[INFO] Exclude: **/.project
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.checkstyle
[INFO] Exclude: **/.factorypath
[INFO] Exclude: ratReport.txt
[INFO] Exclude: **/org.apache.activemq.artemis.cfg
[INFO] Exclude: **/*.data
[INFO] Exclude: **/*.bin
[INFO] Exclude: **/src/test/resources/keystore
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.redo
[INFO] Exclude: **/node/**
[INFO] Exclude: **/node_modules/**
[INFO] Exclude: **/package.json
[INFO] Exclude: **/npm-shrinkwrap.json
[INFO] Exclude: **/CMakeCache.txt
[INFO] Exclude: **/CMakeFiles/
[INFO] Exclude: **/Makefile
[INFO] Exclude: **/cmake_install.cmake
[INFO] Exclude: 
artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.h
[INFO] 12 resources included (use -debug for more details)
[INFO] Rat check: Summary over all files. Unapproved: 0, unknown: 0, generated: 
0, approved: 12 licenses.
[INFO] 
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ 
performance-tests ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ 
performance-tests ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-surefire-plugin:2.18.1:test (default-test) @ performance-tests 
---
[INFO] Tests are skipped.
[INFO] 
[INFO] 
[INFO] Building ActiveMQ Artemis Extra Tests 1.5.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-enforcer-plugin:1.4:enforce (enforce-maven) @ extra-tests ---
[INFO] 
[INFO] --- maven-enforcer-plugin:1.4:enforce (enforce-java) @ extra-tests ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (process-resource-bundles) 
@ extra-tests ---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
extra-tests ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ extra-tests ---
[INFO] No sources to compile
[INFO] 
[INFO] --- maven-checkstyle-plugin:2.17:check (default) @ extra-tests ---
[INFO] Starting audit...
Audit done.
[INFO] 
[INFO] --- apache-rat-plugin:0.12:check (default) @ extra-tests ---
[INFO] Enabled default license matchers.
[INFO] Will parse SCM ignores for exclusions...
[INFO] Finished adding exclusions from SCM ignore files.
[INFO] 61 implicit excludes (use -debug for more details).
[INFO] Exclude: **/*.txt
[INFO] Exclude: **/*.md
[INFO] Exclude: etc/ide-settings/**
[INFO] Exclude: docs/**/*.json
[INFO] Exclude: docs/**/_book/
[INFO] Exclude: **/target/
[INFO] Exclude: **/META-INF/services/*
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/*.jceks
[INFO] Exclude: **/*.jks
[INFO] Exclude: **/org/apache/activemq/artemis/utils/json/**
[INFO] Exclude: **/org/apache/activemq/artemis/utils/Base64.java
[INFO] Exclude: **/.settings/**
[INFO] Exclude: **/.project
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.checkstyle
[INFO] Exclude: **/.factorypath
[INFO] Exclude: ratReport.txt
[INFO] Exclude: **/org.apache.activemq.artemis.cfg
[INFO] Exclude: **/*.data
[INFO] Exclude: **/*.bin
[INFO] Exclude: **/src/test/resources/keystore
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.redo
[INFO] Exclude: **/node/**
[INFO] Exclude: **/node_modules/**
[INFO] Exclude: **/package.json
[INFO] Exclude: **/npm-shrinkwrap.json
[INFO] Exclude: **/CMakeCache.txt
[INFO] Exclude: **/CMakeFiles/
[INFO] Exclude: **/Makefile
[INFO] Exclude: **/cmake_install.cmake
[INFO] Exclude: 
artemis-native/src/main/c/org_apache_activemq_artemis_jlibaio_LibaioContext.h
[INFO] 49 resources included (use -debug for more details)
[INFO] Rat check: Summary over all files. Unapproved: 0, unknown: 0, generated: 
0, approved: 49 licenses.
[INFO] 
[INFO] --- maven-enforcer-plugin:1.4:enforce 

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

[clebertsuconic]

This closes #826


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

Branch: refs/heads/master
Commit: de746a7620c53c00acb2cc985c78127046095c3e
Parents: ca2bf0e c47a9a5
Author: Clebert Suconic 
Authored: Fri Oct 7 18:50:45 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 18:50:45 2016 -0400

--
 .../impl/journal/BatchingIDGenerator.java   |  2 +-
 .../journal/DuplicateRecordIdTest.java  | 54 
 .../RolesConfigurationStorageTest.java  | 27 ++
 .../impl/BatchIDGeneratorUnitTest.java  |  2 +-
 4 files changed, 83 insertions(+), 2 deletions(-)
--

[1/2] activemq-artemis git commit: ARTEMIS-761 fix possible dup journal record ID

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master ca2bf0ed8 -> de746a762


ARTEMIS-761 fix possible dup journal record ID


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

Branch: refs/heads/master
Commit: c47a9a5f802888443638c3bbb9aec769a6bf2e1d
Parents: ca2bf0e
Author: jbertram 
Authored: Tue Oct 4 10:34:00 2016 -0500
Committer: Clebert Suconic 
Committed: Fri Oct 7 18:50:44 2016 -0400

--
 .../impl/journal/BatchingIDGenerator.java   |  2 +-
 .../journal/DuplicateRecordIdTest.java  | 54 
 .../RolesConfigurationStorageTest.java  | 27 ++
 .../impl/BatchIDGeneratorUnitTest.java  |  2 +-
 4 files changed, 83 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c47a9a5f/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 c61bf64..694cb2a 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
@@ -90,7 +90,7 @@ public final class BatchingIDGenerator implements IDGenerator 
{
   encoding.decode(buffer);
 
   // Keep nextID and counter the same, the next generateID will update the 
checkpoint
-  nextID = encoding.id;
+  nextID = encoding.id + 1;
 
   counter.set(nextID);
}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c47a9a5f/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/DuplicateRecordIdTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/DuplicateRecordIdTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/DuplicateRecordIdTest.java
new file mode 100644
index 000..7d89e2c
--- /dev/null
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/DuplicateRecordIdTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.tests.integration.journal;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.api.core.management.AddressSettingsInfo;
+import org.apache.activemq.artemis.cli.commands.tools.PrintData;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DuplicateRecordIdTest extends ActiveMQTestBase {
+
+   protected ActiveMQServer server;
+
+   @Override
+   @Before
+   public void setUp() throws Exception {
+  super.setUp();
+  server = createServer(false, 
createDefaultInVMConfig().addAddressesSetting("#", new 
AddressSettings().setDeadLetterAddress(new 
SimpleString("dlq")).setExpiryAddress(new SimpleString("dlq";
+  server.getConfiguration().setPersistenceEnabled(true);
+   }
+
+   @Test
+   public void testDuplicateRecordId() throws Exception {
+  for (int i = 0; i < 3; i++) {
+ server.start();
+ ActiveMQServerControl 

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

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/master 538ed7451 -> 1ac89543a


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

Add better cleanup of connections on test failure.

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

Branch: refs/heads/master
Commit: 1ac89543a8d7f969f84fa51d92c4e1e0d65f1161
Parents: 538ed74
Author: Timothy Bish 
Authored: Fri Oct 7 18:48:44 2016 -0400
Committer: Timothy Bish 
Committed: Fri Oct 7 18:48:44 2016 -0400

--
 .../amqp/client/AmqpClientTestSupport.java  | 24 -
 .../amqp/interop/AmqpAnonymousSenderTest.java   |  2 +-
 .../AmqpBrokerReuqestedHearbeatsTest.java   |  8 ++---
 .../AmqpClientRequestsHeartbeatsTest.java   |  4 +--
 .../AmqpConfiguredMaxConnectionsTest.java   |  2 +-
 .../amqp/interop/AmqpConnectionsTest.java   | 14 
 .../AmqpCorrelationIdPreservationTest.java  |  4 +--
 .../interop/AmqpCorruptedFrameHandlingTest.java |  6 ++--
 .../interop/AmqpDeliveryAnnotationsTest.java|  2 +-
 .../interop/AmqpDescribedTypePayloadTest.java   |  6 ++--
 .../AmqpDisabledInactivityMonitorTest.java  |  4 +--
 .../amqp/interop/AmqpDurableReceiverTest.java   | 18 +-
 .../amqp/interop/AmqpMaxFrameSizeTest.java  |  2 +-
 .../interop/AmqpMessageIdPreservationTest.java  |  4 +--
 .../amqp/interop/AmqpReceiverDrainTest.java |  8 ++---
 .../amqp/interop/AmqpReceiverTest.java  | 24 ++---
 .../amqp/interop/AmqpSaslPlainTest.java |  2 +-
 .../amqp/interop/AmqpScheduledMessageTest.java  | 11 +++---
 .../amqp/interop/AmqpSendReceiveTest.java   | 26 +++---
 .../transport/amqp/interop/AmqpSenderTest.java  | 12 +++
 .../transport/amqp/interop/AmqpSessionTest.java |  2 +-
 .../amqp/interop/AmqpSlowReceiverTest.java  |  4 +--
 .../AmqpSocketProxyIdleTimeoutTests.java|  4 +--
 .../amqp/interop/AmqpTempDestinationTest.java   | 16 -
 .../amqp/interop/AmqpTransactionTest.java   | 36 ++--
 25 files changed, 133 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/1ac89543/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpClientTestSupport.java
--
diff --git 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpClientTestSupport.java
 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpClientTestSupport.java
index 123f86c..b421931 100644
--- 
a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpClientTestSupport.java
+++ 
b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpClientTestSupport.java
@@ -18,8 +18,11 @@ package org.apache.activemq.transport.amqp.client;
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.activemq.transport.amqp.AmqpTestSupport;
+import org.junit.After;
 
 /**
  * Test support class for tests that will be using the AMQP Proton wrapper 
client.
@@ -29,6 +32,8 @@ public class AmqpClientTestSupport extends AmqpTestSupport {
 private String connectorScheme = "amqp";
 private boolean useSSL;
 
+private List connections = new ArrayList();
+
 public AmqpClientTestSupport() {
 }
 
@@ -37,6 +42,18 @@ public class AmqpClientTestSupport extends AmqpTestSupport {
 this.useSSL = useSSL;
 }
 
+@Override
+@After
+public void tearDown() throws Exception {
+for (AmqpConnection connection : connections) {
+try {
+connection.close();
+} catch (Exception ex) {}
+}
+
+super.tearDown();
+}
+
 public String getConnectorScheme() {
 return connectorScheme;
 }
@@ -135,6 +152,11 @@ public class AmqpClientTestSupport extends AmqpTestSupport 
{
 }
 }
 
+public AmqpConnection trackConnection(AmqpConnection connection) {
+connections.add(connection);
+return connection;
+}
+
 public AmqpConnection createAmqpConnection() throws Exception {
 return createAmqpConnection(getBrokerAmqpConnectionURI());
 }
@@ -148,7 +170,7 @@ public class AmqpClientTestSupport extends AmqpTestSupport {
 }
 
 public AmqpConnection createAmqpConnection(URI brokerURI, String username, 
String password) throws Exception {
-return createAmqpClient(brokerURI, username, password).connect();
+return trackConnection(createAmqpClient(brokerURI, username, 
password).connect());
 }
 
 public 

[2/2] activemq-artemis git commit: ARTEMIS-775 Tests for AMQP credit handling

[clebertsuconic]

ARTEMIS-775 Tests for AMQP credit handling

Some new tests that cover some AMQP credit handling scenarios.  Test
case 'testCloseBusyReceiver' currently fails due to being dispatched a
duplicate message.

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

Branch: refs/heads/master
Commit: bc6ad1dfdbada759e06c50107bbc7bbee2c09a15
Parents: 07ab1be
Author: Timothy Bish 
Authored: Fri Oct 7 12:09:28 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 18:40:49 2016 -0400

--
 .../transport/amqp/client/AmqpMessage.java  |   6 +-
 .../integration/amqp/AmqpSendReceiveTest.java   | 557 +++
 2 files changed, 560 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bc6ad1df/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
--
diff --git 
a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
 
b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
index 2d95d29..3ca17a6 100644
--- 
a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
+++ 
b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
@@ -269,7 +269,7 @@ public class AmqpMessage {
 * @return the set message ID in String form or null if not set.
 */
public String getMessageId() {
-  if (message.getProperties() == null) {
+  if (message.getProperties() == null || 
message.getProperties().getMessageId() == null) {
  return null;
   }
 
@@ -319,7 +319,7 @@ public class AmqpMessage {
 * @return the set correlation ID in String form or null if not set.
 */
public String getCorrelationId() {
-  if (message.getProperties() == null) {
+  if (message.getProperties() == null || 
message.getProperties().getCorrelationId() == null) {
  return null;
   }
 
@@ -394,7 +394,7 @@ public class AmqpMessage {
 * @return true if the message is marked as being durable.
 */
public boolean isDurable() {
-  if (message.getHeader() == null) {
+  if (message.getHeader() == null || message.getHeader().getDurable() == 
null) {
  return false;
   }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bc6ad1df/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java
new file mode 100644
index 000..6597a62
--- /dev/null
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSendReceiveTest.java
@@ -0,0 +1,557 @@
+/*
+ * 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.tests.integration.amqp;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.tests.integration.mqtt.imported.util.Wait;
+import org.apache.activemq.transport.amqp.client.AmqpClient;
+import org.apache.activemq.transport.amqp.client.AmqpConnection;
+import org.apache.activemq.transport.amqp.client.AmqpMessage;
+import 

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

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 07ab1be33 -> ca2bf0ed8


This closes #824


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

Branch: refs/heads/master
Commit: ca2bf0ed89e98b1144996c191f8a7d45884bd7d5
Parents: 07ab1be bc6ad1d
Author: Clebert Suconic 
Authored: Fri Oct 7 18:40:49 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 18:40:49 2016 -0400

--
 .../transport/amqp/client/AmqpMessage.java  |   6 +-
 .../integration/amqp/AmqpSendReceiveTest.java   | 557 +++
 2 files changed, 560 insertions(+), 3 deletions(-)
--

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

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 1bb3c1536 -> 07ab1be33


This closes #828


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

Branch: refs/heads/master
Commit: 07ab1be3311bfec5f897d3c39463f5f5b13dc62b
Parents: 1bb3c15 4496cd6
Author: Clebert Suconic 
Authored: Fri Oct 7 18:39:41 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 18:39:41 2016 -0400

--
 tests/integration-tests/pom.xml | 93 +---
 1 file changed, 44 insertions(+), 49 deletions(-)
--

[2/2] activemq-artemis git commit: ARTEMIS-777 Remove dependency on legacy Qpid AMQP 0.x JMS client

[clebertsuconic]

ARTEMIS-777 Remove dependency on legacy Qpid AMQP 0.x JMS client

Remove the dependency on the qpid-client module which is an AMQP JMS
client for the 0.x AMQP protocols which Artemis does not support.

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

Branch: refs/heads/master
Commit: 4496cd612056a5798bbb7f02b0ad3829acec75af
Parents: 1bb3c15
Author: Timothy Bish 
Authored: Fri Oct 7 18:09:11 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 18:39:41 2016 -0400

--
 tests/integration-tests/pom.xml | 93 +---
 1 file changed, 44 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4496cd61/tests/integration-tests/pom.xml
--
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 9ac3a72..ced7814 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -29,7 +29,7 @@

   ${project.basedir}/../..
   4.0.6
- 4.9.1
+ 4.9.1
   2.1.6
   2.0.3-final

@@ -156,12 +156,12 @@
  artemis-hornetq-protocol
  ${project.version}
   
-  
-  org.apache.activemq
-  artemis-features
-  ${project.version}
-  pom
-  
+  
+ org.apache.activemq
+ artemis-features
+ ${project.version}
+ pom
+  
 
   
   
@@ -220,11 +220,6 @@
   proton-j

   
- org.apache.qpid
- qpid-client
- 0.24
-  
-  
  org.slf4j
  slf4j-api
  1.7.5
@@ -314,31 +309,31 @@
  
   
 
- 
+ 
 
-  
-  org.ops4j.pax.exam
-  pax-exam-container-karaf
-  ${pax.exam.version}
-  test
-  
-  
-  org.ops4j.pax.exam
-  pax-exam-junit4
-  ${pax.exam.version}
-  test
-  
-  
-  org.apache.karaf
-  apache-karaf
-  ${karaf.version}
-  tar.gz
-  
-  
-  org.apache.karaf.shell
-  org.apache.karaf.shell.console
-  ${karaf.version}
-  
+  
+ org.ops4j.pax.exam
+ pax-exam-container-karaf
+ ${pax.exam.version}
+ test
+  
+  
+ org.ops4j.pax.exam
+ pax-exam-junit4
+ ${pax.exam.version}
+ test
+  
+  
+ org.apache.karaf
+ apache-karaf
+ ${karaf.version}
+ tar.gz
+  
+  
+ org.apache.karaf.shell
+ org.apache.karaf.shell.console
+ ${karaf.version}
+  
   
  org.apache.activemq.tests
  artemis-test-support
@@ -445,19 +440,19 @@
-Djgroups.bind_addr=::1 
${activemq-surefire-argline}
 
  
- 
- org.apache.servicemix.tooling
- depends-maven-plugin
- 1.2
- 
- 
- generate-depends-file
- 
- 
generate-depends-file
- 
- 
- 
- 
+
+   org.apache.servicemix.tooling
+   depends-maven-plugin
+   1.2
+   
+  
+ generate-depends-file
+ 
+generate-depends-file
+ 
+  
+   
+
   

 

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

[clebertsuconic]

This closes #827


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

Branch: refs/heads/master
Commit: 1bb3c153622a14a53dfa1b8106554d20eafa2766
Parents: 736886f 398da40
Author: Clebert Suconic 
Authored: Fri Oct 7 18:32:17 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 18:32:17 2016 -0400

--
 .../amqp/proton/ProtonServerSenderContext.java  | 206 ++-
 .../integration/amqp/AmqpClientTestSupport.java |   5 +-
 .../amqp/AmqpReceiverWithFiltersTest.java   | 117 +++
 3 files changed, 228 insertions(+), 100 deletions(-)
--

Jenkins build is back to normal : ActiveMQ-Artemis-Master #690

[Apache Jenkins Server]

See 

Build failed in Jenkins: ActiveMQ-Artemis-Master #689

[Apache Jenkins Server]

See 

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on jenkins-test-39e (Ubuntu ubuntu jenkins-cloud-8GB 
jenkins-cloud-4GB cloud-slave) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git # timeout=10
ERROR: Error fetching remote repo 'origin'
hudson.plugins.git.GitException: Failed to fetch from 
https://git-wip-us.apache.org/repos/asf/activemq-artemis.git
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:799)
at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1055)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1086)
at hudson.scm.SCM.checkout(SCM.java:485)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1269)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:604)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:529)
at hudson.model.Run.execute(Run.java:1741)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:410)
Caused by: hudson.plugins.git.GitException: Command "git config 
remote.origin.url https://git-wip-us.apache.org/repos/asf/activemq-artemis.git; 
returned status code 4:
stdout: 
stderr: error: failed to write new configuration file .git/config.lock

at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1723)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1699)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1695)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1317)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1329)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1031)
at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160)
at sun.reflect.GeneratedMethodAccessor149.invoke(Unknown Source)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:884)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:859)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:818)
at hudson.remoting.UserRequest.perform(UserRequest.java:153)
at hudson.remoting.UserRequest.perform(UserRequest.java:50)
at hudson.remoting.Request$2.run(Request.java:332)
at 
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
at ..remote call to jenkins-test-39e(Native Method)
at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1416)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:253)
at hudson.remoting.Channel.call(Channel.java:781)
at 
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:249)
at com.sun.proxy.$Proxy134.setRemoteUrl(Unknown Source)
at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:298)
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:787)
... 11 more
ERROR: null
Retrying after 10 seconds
 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git # timeout=10
ERROR: Error fetching remote repo 'origin'
hudson.plugins.git.GitException: Failed to fetch from 
https://git-wip-us.apache.org/repos/asf/activemq-artemis.git
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:799)
at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1055)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1086)
at hudson.scm.SCM.checkout(SCM.java:485)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1269)
at 

Build failed in Jenkins: ActiveMQ-Artemis-Master #688

[Apache Jenkins Server]

See 

--
Started by an SCM change
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on jenkins-test-39e (Ubuntu ubuntu jenkins-cloud-8GB 
jenkins-cloud-4GB cloud-slave) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git # timeout=10
ERROR: Error fetching remote repo 'origin'
hudson.plugins.git.GitException: Failed to fetch from 
https://git-wip-us.apache.org/repos/asf/activemq-artemis.git
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:799)
at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1055)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1086)
at hudson.scm.SCM.checkout(SCM.java:485)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1269)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:604)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:529)
at hudson.model.Run.execute(Run.java:1741)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:410)
Caused by: hudson.plugins.git.GitException: Command "git config 
remote.origin.url https://git-wip-us.apache.org/repos/asf/activemq-artemis.git; 
returned status code 4:
stdout: 
stderr: error: failed to write new configuration file .git/config.lock

at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1723)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1699)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1695)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1317)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1329)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1031)
at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:160)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:884)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:859)
at 
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:818)
at hudson.remoting.UserRequest.perform(UserRequest.java:153)
at hudson.remoting.UserRequest.perform(UserRequest.java:50)
at hudson.remoting.Request$2.run(Request.java:332)
at 
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
at ..remote call to jenkins-test-39e(Native Method)
at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1416)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:253)
at hudson.remoting.Channel.call(Channel.java:781)
at 
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:249)
at com.sun.proxy.$Proxy134.setRemoteUrl(Unknown Source)
at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:298)
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:787)
... 11 more
ERROR: null
Retrying after 10 seconds
 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/activemq-artemis.git # timeout=10
Cleaning workspace
 > git rev-parse --verify HEAD # timeout=10
Resetting working tree
 > git reset --hard # timeout=10
ERROR: Error fetching remote repo 'origin'
hudson.plugins.git.GitException: Failed to fetch from 
https://git-wip-us.apache.org/repos/asf/activemq-artemis.git
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:799)
at 

Build failed in Jenkins: ActiveMQ-Java8 #855

[Apache Jenkins Server]

See 

Changes:

[gtully] AMQ-6459 - store based % usage needs to poll the store for the current

[gtully] NO-JIRA - ensure stack trace in incuded with exception that terminates

--
[...truncated 3395 lines...]
[INFO] Skipping ActiveMQ :: Karaf Integration Tests
[INFO] This project has been banned from the build due to previous failures.
[INFO] 
[INFO] 
[INFO] 
[INFO] Skipping ActiveMQ :: Integration Test :: Spring 3.1
[INFO] This project has been banned from the build due to previous failures.
[INFO] 
[INFO] 
[INFO] 
[INFO] Skipping ActiveMQ :: Assembly
[INFO] This project has been banned from the build due to previous failures.
[INFO] 
[INFO] 
[INFO] Reactor Summary:
[INFO] 
[INFO] ActiveMQ ... SUCCESS [  4.821 s]
[INFO] ActiveMQ :: Openwire Generator . SUCCESS [  4.978 s]
[INFO] ActiveMQ :: Client . SUCCESS [03:19 min]
[INFO] ActiveMQ :: Openwire Legacy Support  SUCCESS [  4.985 s]
[INFO] ActiveMQ :: JAAS ... SUCCESS [ 22.034 s]
[INFO] ActiveMQ :: Broker . SUCCESS [01:27 min]
[INFO] ActiveMQ :: KahaDB Store ... SUCCESS [02:18 min]
[INFO] ActiveMQ :: STOMP Protocol . SUCCESS [13:06 min]
[INFO] ActiveMQ :: MQTT Protocol .. SUCCESS [22:20 min]
[INFO] ActiveMQ :: JDBC Store . SUCCESS [  3.811 s]
[INFO] ActiveMQ :: LevelDB Store .. SUCCESS [05:30 min]
[INFO] ActiveMQ :: Generic JMS Pool ... SUCCESS [ 43.020 s]
[INFO] ActiveMQ :: Pool ... SUCCESS [  5.264 s]
[INFO] ActiveMQ :: RA . SUCCESS [02:36 min]
[INFO] ActiveMQ :: Spring . SUCCESS [01:04 min]
[INFO] ActiveMQ :: Console  SUCCESS [  7.092 s]
[INFO] ActiveMQ :: Partition Management ... SUCCESS [ 19.493 s]
[INFO] ActiveMQ :: Runtime Configuration .. SUCCESS [08:41 min]
[INFO] ActiveMQ :: Tooling  SUCCESS [  1.315 s]
[INFO] ActiveMQ :: JUnit Rule . SUCCESS [  5.566 s]
[INFO] ActiveMQ :: Unit Tests . FAILURE [  02:10 h]
[INFO] ActiveMQ :: HTTP Protocol Support .. SKIPPED
[INFO] ActiveMQ :: AMQP ... SKIPPED
[INFO] ActiveMQ :: Camel .. SKIPPED
[INFO] ActiveMQ :: All JAR bundle . SKIPPED
[INFO] ActiveMQ :: Log4j Appender . SUCCESS [  7.003 s]
[INFO] ActiveMQ :: Apache Karaf ... SKIPPED
[INFO] ActiveMQ :: ConnectionFactory .. SUCCESS [  4.609 s]
[INFO] ActiveMQ :: RAR  SKIPPED
[INFO] ActiveMQ :: Run Jar  SUCCESS [  2.695 s]
[INFO] ActiveMQ :: Shiro .. SKIPPED
[INFO] ActiveMQ :: Memory Usage Test Plugin ... SUCCESS [  3.758 s]
[INFO] ActiveMQ :: Performance Test Plugin  SUCCESS [  9.549 s]
[INFO] ActiveMQ :: StartUp/Stop Plugin  SKIPPED
[INFO] ActiveMQ :: Web  SKIPPED
[INFO] ActiveMQ :: OSGi bundle  SKIPPED
[INFO] ActiveMQ :: Blueprint .. SUCCESS [  2.223 s]
[INFO] ActiveMQ :: Web Demo ... SKIPPED
[INFO] ActiveMQ :: Web Console  SKIPPED
[INFO] ActiveMQ :: Karaf Integration Tests  SKIPPED
[INFO] ActiveMQ :: Integration Test :: Spring 3.1 . SKIPPED
[INFO] ActiveMQ :: Assembly ... SKIPPED
[INFO] 
[INFO] BUILD FAILURE
[INFO] 
[INFO] Total time: 03:14 h
[INFO] Finished at: 2016-10-07T18:57:09+00:00
[INFO] Final Memory: 154M/1637M
[INFO] 
Waiting for Jenkins to finish collecting data
[ERROR] Failed to execute goal 

Build failed in Jenkins: ActiveMQ-Java8 » ActiveMQ :: Unit Tests #855

[Apache Jenkins Server]

See 


Changes:

[gtully] AMQ-6459 - store based % usage needs to poll the store for the current

--
[...truncated 655 lines...]
Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.22 sec - in 
org.apache.activemq.command.ActiveMQDestinationTest
Running org.apache.activemq.command.ActiveMQMapMessageTest
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.403 sec - in 
org.apache.activemq.command.ActiveMQMapMessageTest
Running org.apache.activemq.command.ActiveMQMessageTest
Tests run: 51, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.301 sec - in 
org.apache.activemq.command.ActiveMQMessageTest
Running org.apache.activemq.command.ActiveMQObjectMessageTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.26 sec - in 
org.apache.activemq.command.ActiveMQObjectMessageTest
Running org.apache.activemq.command.ActiveMQStreamMessageTest
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.342 sec - in 
org.apache.activemq.command.ActiveMQStreamMessageTest
Running org.apache.activemq.command.ActiveMQTextMessageTest
Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.198 sec - in 
org.apache.activemq.command.ActiveMQTextMessageTest
Running org.apache.activemq.command.MessageSendTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.287 sec - in 
org.apache.activemq.command.MessageSendTest
Running org.apache.activemq.command.MessageTest
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.282 sec - in 
org.apache.activemq.command.MessageTest
Running org.apache.activemq.config.BrokerPropertiesTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.815 sec - in 
org.apache.activemq.config.BrokerPropertiesTest
Running org.apache.activemq.config.BrokerXmlConfigTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.457 sec - in 
org.apache.activemq.config.BrokerXmlConfigTest
Running org.apache.activemq.config.JDBCConfigTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.481 sec - in 
org.apache.activemq.config.JDBCConfigTest
Running org.apache.activemq.console.command.AMQ3410Test
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.699 sec - in 
org.apache.activemq.console.command.AMQ3410Test
Running org.apache.activemq.console.command.AMQ3411Test
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.32 sec - in 
org.apache.activemq.console.command.AMQ3411Test
Running org.apache.activemq.console.command.PurgeCommandTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.175 sec - in 
org.apache.activemq.console.command.PurgeCommandTest
Running org.apache.activemq.filter.DestinationFilterTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.058 sec - in 
org.apache.activemq.filter.DestinationFilterTest
Running org.apache.activemq.filter.DestinationMapMemoryTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.063 sec - in 
org.apache.activemq.filter.DestinationMapMemoryTest
Running org.apache.activemq.filter.DestinationMapTempDestinationTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.3 sec - in 
org.apache.activemq.filter.DestinationMapTempDestinationTest
Running org.apache.activemq.filter.DestinationMapTest
Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.076 sec - in 
org.apache.activemq.filter.DestinationMapTest
Running org.apache.activemq.filter.DestinationPathTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.167 sec - in 
org.apache.activemq.filter.DestinationPathTest
Running org.apache.activemq.filter.DummyPolicyTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.559 sec - in 
org.apache.activemq.filter.DummyPolicyTest
Running org.apache.activemq.jmx.JmxAuditLogTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.372 sec - in 
org.apache.activemq.jmx.JmxAuditLogTest
Running org.apache.activemq.jmx.JmxCreateNCTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.349 sec - in 
org.apache.activemq.jmx.JmxCreateNCTest
Running org.apache.activemq.jmx.OpenTypeSupportTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.26 sec - in 
org.apache.activemq.jmx.OpenTypeSupportTest
Running org.apache.activemq.jmx.TotalMessageCountTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.701 sec - in 
org.apache.activemq.jmx.TotalMessageCountTest
Running org.apache.activemq.jndi.ActiveMQInitialContextFactoryTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.313 sec - in 
org.apache.activemq.jndi.ActiveMQInitialContextFactoryTest
Running org.apache.activemq.jndi.ActiveMQWASInitialContextFactoryTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.335 sec - in 

[1/2] activemq-artemis git commit: ARTEMIS-767 consumer with pre-ack flagged as slow

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 1b157addd -> 736886fc1


ARTEMIS-767 consumer with pre-ack flagged as slow


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

Branch: refs/heads/master
Commit: 59bff3b36b14fd00c0c06f3a53320a5f9c99f403
Parents: 1b157ad
Author: jbertram 
Authored: Fri Oct 7 11:43:19 2016 -0500
Committer: Clebert Suconic 
Committed: Fri Oct 7 14:47:21 2016 -0400

--
 .../core/server/impl/ServerConsumerImpl.java|  1 +
 .../integration/client/SlowConsumerTest.java| 70 
 2 files changed, 71 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/59bff3b3/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index 24eacf5..1318ff3 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -381,6 +381,7 @@ public class ServerConsumerImpl implements ServerConsumer, 
ReadyListener {
 
// With pre-ack, we ack *before* sending to the client
ref.getQueue().acknowledge(ref);
+   acks++;
 }
 
 if (message.isLargeMessage() && this.supportLargeMessage) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/59bff3b3/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
index a2d60d9..3643f77 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SlowConsumerTest.java
@@ -43,6 +43,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
 import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
+import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.artemis.utils.RandomUtil;
 import org.junit.Before;
@@ -210,6 +211,75 @@ public class SlowConsumerTest extends ActiveMQTestBase {
}
 
@Test
+   public void testSlowConsumerWithPreAckNotification() throws Exception {
+
+  ClientSessionFactory sf = createSessionFactory(locator);
+
+  ClientSession session = addClientSession(sf.createSession(false, true, 
true, true));
+
+  session.createQueue(QUEUE, QUEUE, null, false);
+
+  AddressSettings addressSettings = new 
AddressSettings().setSlowConsumerCheckPeriod(2).setSlowConsumerThreshold(1).setSlowConsumerPolicy(SlowConsumerPolicy.NOTIFY);
+
+  server.getAddressSettingsRepository().removeMatch(QUEUE.toString());
+  server.getAddressSettingsRepository().addMatch(QUEUE.toString(), 
addressSettings);
+
+  ClientProducer producer = 
addClientProducer(session.createProducer(QUEUE));
+
+  final int numMessages = 25;
+
+  for (int i = 0; i < numMessages; i++) {
+ producer.send(createTextMessage(session, "m" + i));
+  }
+
+  SimpleString notifQueue = RandomUtil.randomSimpleString();
+
+  
session.createQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(),
 notifQueue, null, false);
+
+  ClientConsumer notifConsumer = 
session.createConsumer(notifQueue.toString(), 
ManagementHelper.HDR_NOTIFICATION_TYPE + "='" + 
CoreNotificationType.CONSUMER_SLOW + "'");
+
+  final CountDownLatch notifLatch = new CountDownLatch(1);
+
+  notifConsumer.setMessageHandler(new MessageHandler() {
+ @Override
+ public void onMessage(ClientMessage message) {
+assertEquals(CoreNotificationType.CONSUMER_SLOW.toString(), 

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

[clebertsuconic]

This closes #825


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

Branch: refs/heads/master
Commit: 736886fc131c5f384478fcf57b29e78053ed5321
Parents: 1b157ad 59bff3b
Author: Clebert Suconic 
Authored: Fri Oct 7 14:47:22 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 14:47:22 2016 -0400

--
 .../core/server/impl/ServerConsumerImpl.java|  1 +
 .../integration/client/SlowConsumerTest.java| 70 
 2 files changed, 71 insertions(+)
--

activemq-artemis git commit: NO-JIRA Adding script to help debug data on testcases

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 54b7dcc48 -> 1b157addd


NO-JIRA Adding script to help debug data on testcases


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

Branch: refs/heads/master
Commit: 1b157addd8dc7ad500f20d3f75c6f5c0bf1f9ea8
Parents: 54b7dcc
Author: Clebert Suconic 
Authored: Fri Oct 7 14:36:05 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 14:36:05 2016 -0400

--
 scripts/print-data.sh | 35 +++
 1 file changed, 35 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b157add/scripts/print-data.sh
--
diff --git a/scripts/print-data.sh b/scripts/print-data.sh
new file mode 100755
index 000..cff7225
--- /dev/null
+++ b/scripts/print-data.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+# 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.
+
+# Setting the script to fail if anything goes wrong
+set -e
+
+
+# Use this to debug your testcases data. For example:
+# find what is the junit folder in use (e.g: junit6337151746263250365)
+#
+# cd 
/checkout-folder/tests/integration-tests/target/tmp/junit6337151746263250365
+#
+# /checkout-folder/scripts/print-data.sh bindings0-L/ journal0-L/ page0-L/
+#
+# this will generate the usual print-data output
+
+
+LOCATION=$(dirname "$0")
+
+$LOCATION/../artemis-distribution/target/apache-artemis*bin/apache-artemis*/bin/artemis
 data print --bindings $1 --journal $2 --paging $3

Jenkins build became unstable: ActiveMQ-Java7 » ActiveMQ :: MQTT Protocol #1153

[Apache Jenkins Server]

See 

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

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java8 #854

[Apache Jenkins Server]

See 

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

[Apache Jenkins Server]

See 

activemq git commit: NO-JIRA - ensure stack trace in incuded with exception that terminates data file appender thread

[gtully]

Repository: activemq
Updated Branches:
  refs/heads/master 8493f6b4d -> 538ed7451


NO-JIRA - ensure stack trace in incuded with exception that terminates data 
file appender thread


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

Branch: refs/heads/master
Commit: 538ed745106887545d6de0210c2f4929f6b2a20c
Parents: 8493f6b
Author: gtully 
Authored: Fri Oct 7 16:26:07 2016 +0100
Committer: gtully 
Committed: Fri Oct 7 16:26:07 2016 +0100

--
 .../activemq/store/kahadb/disk/journal/DataFileAppender.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/538ed745/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java
index 1e87331..a799803 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/DataFileAppender.java
@@ -356,7 +356,7 @@ class DataFileAppender implements FileAppender {
 signalDone(wb);
 }
 } catch (IOException e) {
-logger.info("Journal failed while writing at: " + wb.offset);
+logger.warn("Journal failed while writing at: " + 
wb.dataFile.getDataFileId() + ":" + wb.offset, e);
 synchronized (enqueueMutex) {
 firstAsyncException = e;
 if (wb != null) {

[1/3] activemq-artemis git commit: This closes #821

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 73a73bb9e -> 54b7dcc48


This closes #821


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

Branch: refs/heads/master
Commit: 330ddf0c6bf81613aea487bf73f383e5405ee6a4
Parents: 73a73bb ea54071
Author: Clebert Suconic 
Authored: Fri Oct 7 10:54:02 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:54:02 2016 -0400

--
 .../transport/amqp/client/AmqpMessage.java  |  28 +++-
 .../transport/amqp/client/AmqpReceiver.java |  70 ++--
 .../integration/amqp/AmqpTransactionTest.java   | 162 +++
 3 files changed, 244 insertions(+), 16 deletions(-)
--

[3/3] activemq-artemis git commit: ARTEMIS-773 closing connections through finally to avoid thread leakage

[clebertsuconic]

ARTEMIS-773 closing connections through finally to avoid thread leakage


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

Branch: refs/heads/master
Commit: 54b7dcc48e3e76eca2a7cca1348e7c2625cc7ba6
Parents: 330ddf0
Author: Clebert Suconic 
Authored: Fri Oct 7 10:57:21 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 11:04:45 2016 -0400

--
 .../integration/amqp/AmqpTransactionTest.java   | 275 ++-
 1 file changed, 141 insertions(+), 134 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54b7dcc4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
index e82e7b3..e42a718 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpTransactionTest.java
@@ -485,73 +485,77 @@ public class AmqpTransactionTest extends 
AmqpClientTestSupport {
   AmqpClient client = createAmqpClient();
   AmqpConnection connection = addConnection(client.connect());
 
-  // Root TXN session controls all TXN send lifetimes.
-  AmqpSession txnSession = connection.createSession();
-
-  // Normal Session which won't create an TXN itself
-  AmqpSession session = connection.createSession();
-  AmqpSender sender = session.createSender(getTestName());
+  try {
 
-  for (int i = 0; i < NUM_MESSAGES + 1; ++i) {
- AmqpMessage message = new AmqpMessage();
- message.setText("Test-Message");
- message.setApplicationProperty("msgId", i);
- sender.send(message, txnSession.getTransactionId());
-  }
+ // Root TXN session controls all TXN send lifetimes.
+ AmqpSession txnSession = connection.createSession();
 
-  // Read all messages from the Queue, do not accept them yet.
-  AmqpReceiver receiver = session.createReceiver(getTestName());
-  ArrayList messages = new ArrayList<>(NUM_MESSAGES);
-  receiver.flow((NUM_MESSAGES + 2) * 2);
-  for (int i = 0; i < NUM_MESSAGES; ++i) {
- AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS);
- assertNotNull(message);
- messages.add(message);
-  }
-
-  // Commit half the consumed messages
-  txnSession.begin();
-  for (int i = 0; i < NUM_MESSAGES / 2; ++i) {
- messages.get(i).accept(txnSession);
-  }
-  txnSession.commit();
-
-  // Rollback the other half the consumed messages
-  txnSession.begin();
-  for (int i = NUM_MESSAGES / 2; i < NUM_MESSAGES; ++i) {
- messages.get(i).accept(txnSession);
-  }
-  txnSession.rollback();
-
-  {
- AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS);
- assertNotNull(message);
- assertEquals(NUM_MESSAGES, message.getApplicationProperty("msgId"));
- message.release();
-  }
-
-  // Commit the other half the consumed messages
-  // This is a variation from the .NET client tests which doesn't settle 
the
-  // messages in the TX until commit is called but on ActiveMQ they will be
-  // redispatched regardless and not stay in the acquired state.
-  txnSession.begin();
-  for (int i = NUM_MESSAGES / 2; i < NUM_MESSAGES; ++i) {
- AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS);
- assertNotNull(message);
- message.accept();
-  }
-  txnSession.commit();
+ // Normal Session which won't create an TXN itself
+ AmqpSession session = connection.createSession();
+ AmqpSender sender = session.createSender(getTestName());
 
-  // The final message should still be pending.
-  {
- AmqpMessage message = receiver.receive(5, TimeUnit.SECONDS);
- receiver.flow(1);
- assertNotNull(message);
- assertEquals(NUM_MESSAGES, message.getApplicationProperty("msgId"));
- message.release();
+ for (int i = 0; i < NUM_MESSAGES + 1; ++i) {
+AmqpMessage message = new AmqpMessage();
+message.setText("Test-Message");
+message.setApplicationProperty("msgId", i);
+   

[2/3] activemq-artemis git commit: ARTEMIS-773 Tests that show issue with TX acquisition and retirement.

[clebertsuconic]

ARTEMIS-773 Tests that show issue with TX acquisition and retirement.

Two new tests that acquire messages inside a TX and manage their
settlement and retirement in differing ways, one test works the other
'testReceiversCommitAndRollbackWithMultipleSessionsInSingleTXNoSettlement' 
fails due to messages that were committed being redelivered to the
client unexpectedly.  

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

Branch: refs/heads/master
Commit: ea54071f77f1ff378ca1fa8904b858797c4869d0
Parents: 73a73bb
Author: Timothy Bish 
Authored: Thu Oct 6 16:53:10 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:54:02 2016 -0400

--
 .../transport/amqp/client/AmqpMessage.java  |  28 +++-
 .../transport/amqp/client/AmqpReceiver.java |  70 ++--
 .../integration/amqp/AmqpTransactionTest.java   | 162 +++
 3 files changed, 244 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea54071f/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
--
diff --git 
a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
 
b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
index e3e9681..2d95d29 100644
--- 
a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
+++ 
b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpMessage.java
@@ -128,11 +128,23 @@ public class AmqpMessage {
 * @throws Exception if an error occurs during the accept.
 */
public void accept() throws Exception {
+  accept(true);
+   }
+
+   /**
+* Accepts the message marking it as consumed on the remote peer.
+*
+* @param settle
+*true if the client should also settle the delivery when sending 
the accept.
+*
+* @throws Exception if an error occurs during the accept.
+*/
+   public void accept(boolean settle) throws Exception {
   if (receiver == null) {
  throw new IllegalStateException("Can't accept non-received message.");
   }
 
-  receiver.accept(delivery);
+  receiver.accept(delivery, settle);
}
 
/**
@@ -142,11 +154,23 @@ public class AmqpMessage {
 * @throws Exception if an error occurs during the accept.
 */
public void accept(AmqpSession txnSession) throws Exception {
+  accept(txnSession, true);
+   }
+
+   /**
+* Accepts the message marking it as consumed on the remote peer.
+*
+* @param session
+*  The session that is used to manage acceptance of the message.
+*
+* @throws Exception if an error occurs during the accept.
+*/
+   public void accept(AmqpSession txnSession, boolean settle) throws Exception 
{
   if (receiver == null) {
  throw new IllegalStateException("Can't accept non-received message.");
   }
 
-  receiver.accept(delivery, txnSession);
+  receiver.accept(delivery, txnSession, settle);
}
 
/**

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ea54071f/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java
--
diff --git 
a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java
 
b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java
index 8826713..b6d2ba1 100644
--- 
a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java
+++ 
b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpReceiver.java
@@ -16,7 +16,10 @@
  */
 package org.apache.activemq.transport.amqp.client;
 
-import javax.jms.InvalidDestinationException;
+import static org.apache.activemq.transport.amqp.AmqpSupport.COPY;
+import static org.apache.activemq.transport.amqp.AmqpSupport.JMS_SELECTOR_NAME;
+import static org.apache.activemq.transport.amqp.AmqpSupport.NO_LOCAL_NAME;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
@@ -27,6 +30,8 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import javax.jms.InvalidDestinationException;
+
 import 

[2/2] activemq-artemis git commit: ARTEMIS-774 Fixed format of JMeter benchmark

[clebertsuconic]

ARTEMIS-774 Fixed format of JMeter benchmark

Moved the Apache Licence header after the XML Declaration.


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

Branch: refs/heads/master
Commit: c69bf09fe031b83c48bb98b238e3702fd32e2fde
Parents: a2a21b0
Author: Francesco Nigro 
Authored: Fri Oct 7 16:24:19 2016 +0200
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:53:33 2016 -0400

--
 examples/perf/jmeter/1.jms_p2p_test.jmx | 2 +-
 examples/perf/jmeter/2.pub_sub_test.jmx | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c69bf09f/examples/perf/jmeter/1.jms_p2p_test.jmx
--
diff --git a/examples/perf/jmeter/1.jms_p2p_test.jmx 
b/examples/perf/jmeter/1.jms_p2p_test.jmx
index 8cdf6b7..f70b0a7 100644
--- a/examples/perf/jmeter/1.jms_p2p_test.jmx
+++ b/examples/perf/jmeter/1.jms_p2p_test.jmx
@@ -1,3 +1,4 @@
+
 
-
 
   
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c69bf09f/examples/perf/jmeter/2.pub_sub_test.jmx
--
diff --git a/examples/perf/jmeter/2.pub_sub_test.jmx 
b/examples/perf/jmeter/2.pub_sub_test.jmx
index eb650e1..53868ad 100644
--- a/examples/perf/jmeter/2.pub_sub_test.jmx
+++ b/examples/perf/jmeter/2.pub_sub_test.jmx
@@ -1,3 +1,4 @@
+
 
-
-
 
   
 

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

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a2a21b073 -> 73a73bb9e


This closes #823


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

Branch: refs/heads/master
Commit: 73a73bb9e3515534efc3eb80b89166eaf5446d61
Parents: a2a21b0 c69bf09
Author: Clebert Suconic 
Authored: Fri Oct 7 10:53:33 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:53:33 2016 -0400

--
 examples/perf/jmeter/1.jms_p2p_test.jmx | 2 +-
 examples/perf/jmeter/2.pub_sub_test.jmx | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
--

[2/3] activemq-artemis git commit: https://issues.apache.org/jira/browse/ARTEMIS-730

[clebertsuconic]

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

Adding instructions for adding the proper schemas to the Eclipse XML
Catalog


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

Branch: refs/heads/master
Commit: 39532d72451fc2d058145c8efe097a332b1bc9e3
Parents: 5b833ef
Author: Christopher L. Shannon (cshannon) 
Authored: Fri Oct 7 10:13:30 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:52:47 2016 -0400

--
 docs/hacking-guide/en/ide.md | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/39532d72/docs/hacking-guide/en/ide.md
--
diff --git a/docs/hacking-guide/en/ide.md b/docs/hacking-guide/en/ide.md
index 29f05ec..3831c78 100644
--- a/docs/hacking-guide/en/ide.md
+++ b/docs/hacking-guide/en/ide.md
@@ -78,6 +78,13 @@ It is strongly recommended to turn off the auto-updating of 
.gitignore files by
 generates new .gitignore files in many directories that are not needed due to 
the top level .gitignore file.  To turn
 it off, go to Preferences->Team->Git->Projects and deselect the "Automatically 
ignore derived resources" checkbox.
 
+### Schema setup
+For proper schema validation you can add the Artemis schemas to your Eclipse 
XML Catalog
+
+* Open: Window -> Preferences -> XML -> XML Catalog
+* Select Add -> Workspace -> Navigate to artemis-server and select 
src/main/resources/schema/artemis-server.xsd -> click OK
+* Repeat the above steps and add 
src/main/resources/schema/artemis-configuration.xsd
+
 ### Checkstyle setup
 You can import the Artemis Checkstyle template into eclipse to do Checkstyle 
validation. As a prerequisite you need to make sure the Checkstyle plugin is 
installed into Eclipse which you can get form the Eclipse Marketplace. You also 
will need to configure Sevntu-Checkstyle. See 
http://sevntu-checkstyle.github.io/sevntu.checkstyle/ for instructions. Then to 
configure the template:
 

[1/3] activemq-artemis git commit: This closes #822

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 67f804054 -> a2a21b073


This closes #822


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

Branch: refs/heads/master
Commit: a2a21b0736ab685fb7d9a640cd59a09517e6c630
Parents: 67f8040 39532d7
Author: Clebert Suconic 
Authored: Fri Oct 7 10:52:47 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:52:47 2016 -0400

--
 artemis-server/pom.xml   | 6 ++
 docs/hacking-guide/en/ide.md | 7 +++
 2 files changed, 13 insertions(+)
--

[3/3] activemq-artemis git commit: NO-JIRA: Exclude xml-apis test dependency

[clebertsuconic]

NO-JIRA: Exclude xml-apis test dependency

This dependency is not needed as the api is part of the JDK and it is
causing issues when m2eclipse


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

Branch: refs/heads/master
Commit: 5b833efc1ba456b64450fb27ac629ab0866190f1
Parents: 67f8040
Author: Christopher L. Shannon (cshannon) 
Authored: Fri Oct 7 10:07:56 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:52:47 2016 -0400

--
 artemis-server/pom.xml | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5b833efc/artemis-server/pom.xml
--
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index d9eaead..8cabc98 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -98,6 +98,12 @@
  apacheds-server-integ
  ${directory-version}
  test
+ 
+
+   xml-apis
+   xml-apis
+
+ 
   
   
  org.apache.directory.server

[4/5] activemq-artemis git commit: ARTEMIS-770 AMQP Message Transformer refactor

[clebertsuconic]

ARTEMIS-770 AMQP Message Transformer refactor

Refactor the AMQP Message transformers both for better performance and
also to fix a number of issues with the transformers creating inbound
and outbound messages with incorrectly mapped values or extra data
appended where it should not be.


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

Branch: refs/heads/master
Commit: 62627bf2ee4789d8c019170fba0fcbf64a697a38
Parents: 6f6d984
Author: Timothy Bish 
Authored: Mon Oct 3 14:23:50 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:42:52 2016 -0400

--
 .../amqp/broker/AMQPSessionCallback.java|  12 +-
 .../amqp/converter/ActiveMQJMSVendor.java   | 148 ---
 .../amqp/converter/ProtonMessageConverter.java  |  83 +-
 .../amqp/converter/jms/ServerJMSMessage.java|   9 +-
 .../converter/jms/ServerJMSObjectMessage.java   |  47 +-
 .../message/AMQPContentTypeSupport.java | 146 +++
 .../converter/message/AMQPMessageIdHelper.java  |  59 +-
 .../converter/message/AMQPMessageSupport.java   | 272 ++
 .../converter/message/AMQPMessageTypes.java |   4 +
 .../message/AMQPNativeInboundTransformer.java   |  28 +-
 .../message/AMQPNativeOutboundTransformer.java  |  82 +-
 .../message/AMQPRawInboundTransformer.java  |  48 +-
 .../amqp/converter/message/EncodedMessage.java  |  12 +-
 .../converter/message/InboundTransformer.java   | 182 ++--
 .../message/JMSMappingInboundTransformer.java   | 198 ++--
 .../message/JMSMappingOutboundTransformer.java  | 650 +
 .../amqp/converter/message/JMSVendor.java   |  53 --
 .../converter/message/OutboundTransformer.java  |  78 +-
 ...ActiveMQAMQPInvalidContentTypeException.java |  27 +
 .../amqp/proton/ProtonServerSenderContext.java  |  64 +-
 .../amqp/converter/TestConversions.java | 130 ++-
 .../message/AMQPContentTypeSupportTest.java | 230 +
 .../message/AMQPMessageIdHelperTest.java| 391 
 .../message/AMQPMessageSupportTest.java | 108 +++
 .../JMSMappingInboundTransformerTest.java   | 718 ++
 .../JMSMappingOutboundTransformerTest.java  | 952 +++
 .../JMSTransformationSpeedComparisonTest.java   | 300 ++
 .../message/MessageTransformationTest.java  | 264 +
 .../transport/amqp/client/AmqpMessage.java  |  24 +
 .../tests/integration/amqp/ProtonTest.java  |  71 +-
 30 files changed, 4458 insertions(+), 932 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/62627bf2/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
index c7ca446..66c7b4b 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
@@ -21,7 +21,6 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import io.netty.buffer.ByteBuf;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException;
 import org.apache.activemq.artemis.api.core.SimpleString;
@@ -37,6 +36,7 @@ import org.apache.activemq.artemis.core.server.ServerSession;
 import org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl;
 import org.apache.activemq.artemis.core.transaction.Transaction;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import 
org.apache.activemq.artemis.protocol.amqp.converter.ProtonMessageConverter;
 import 
org.apache.activemq.artemis.protocol.amqp.converter.message.EncodedMessage;
 import 
org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPException;
 import 
org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPInternalErrorException;
@@ -59,9 +59,10 @@ import org.apache.qpid.proton.amqp.messaging.Accepted;
 import org.apache.qpid.proton.amqp.messaging.Rejected;
 import org.apache.qpid.proton.amqp.transport.AmqpError;
 import org.apache.qpid.proton.amqp.transport.ErrorCondition;
+import 

[3/5] activemq-artemis git commit: ARTEMIS-770 AMQP Message Transformer refactor

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/62627bf2/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformer.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformer.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformer.java
index 9dd29ab..629c499 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformer.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingInboundTransformer.java
@@ -1,13 +1,13 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
+ * 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
- * 
+ * 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.
@@ -16,27 +16,50 @@
  */
 package org.apache.activemq.artemis.protocol.amqp.converter.message;
 
-import javax.jms.BytesMessage;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.StreamMessage;
-import javax.jms.TextMessage;
-import java.io.Serializable;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_DATA;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_NULL;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_SEQUENCE;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_VALUE_BINARY;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_VALUE_LIST;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_VALUE_MAP;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_VALUE_NULL;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_VALUE_STRING;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.JMS_AMQP_MESSAGE_FORMAT;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.JMS_AMQP_ORIGINAL_ENCODING;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.OCTET_STREAM_CONTENT_TYPE;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.SERIALIZED_JAVA_OBJECT_CONTENT_TYPE;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.createBytesMessage;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.createMapMessage;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.createMessage;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.createObjectMessage;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.createStreamMessage;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.createTextMessage;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.getCharsetForTextualContent;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.isContentType;
+
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
+import 
org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSMessage;
+import 
org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSStreamMessage;
+import 

[5/5] activemq-artemis git commit: This closes #820

[clebertsuconic]

This closes #820


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

Branch: refs/heads/master
Commit: 67f804054d49fa55461e79565fc9a78486d85724
Parents: 6f6d984 62627bf
Author: Clebert Suconic 
Authored: Fri Oct 7 10:45:23 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:45:23 2016 -0400

--
 .../amqp/broker/AMQPSessionCallback.java|  12 +-
 .../amqp/converter/ActiveMQJMSVendor.java   | 148 ---
 .../amqp/converter/ProtonMessageConverter.java  |  83 +-
 .../amqp/converter/jms/ServerJMSMessage.java|   9 +-
 .../converter/jms/ServerJMSObjectMessage.java   |  47 +-
 .../message/AMQPContentTypeSupport.java | 146 +++
 .../converter/message/AMQPMessageIdHelper.java  |  59 +-
 .../converter/message/AMQPMessageSupport.java   | 272 ++
 .../converter/message/AMQPMessageTypes.java |   4 +
 .../message/AMQPNativeInboundTransformer.java   |  28 +-
 .../message/AMQPNativeOutboundTransformer.java  |  82 +-
 .../message/AMQPRawInboundTransformer.java  |  48 +-
 .../amqp/converter/message/EncodedMessage.java  |  12 +-
 .../converter/message/InboundTransformer.java   | 182 ++--
 .../message/JMSMappingInboundTransformer.java   | 198 ++--
 .../message/JMSMappingOutboundTransformer.java  | 650 +
 .../amqp/converter/message/JMSVendor.java   |  53 --
 .../converter/message/OutboundTransformer.java  |  78 +-
 ...ActiveMQAMQPInvalidContentTypeException.java |  27 +
 .../amqp/proton/ProtonServerSenderContext.java  |  64 +-
 .../amqp/converter/TestConversions.java | 130 ++-
 .../message/AMQPContentTypeSupportTest.java | 230 +
 .../message/AMQPMessageIdHelperTest.java| 391 
 .../message/AMQPMessageSupportTest.java | 108 +++
 .../JMSMappingInboundTransformerTest.java   | 718 ++
 .../JMSMappingOutboundTransformerTest.java  | 952 +++
 .../JMSTransformationSpeedComparisonTest.java   | 300 ++
 .../message/MessageTransformationTest.java  | 264 +
 .../transport/amqp/client/AmqpMessage.java  |  24 +
 .../tests/integration/amqp/ProtonTest.java  |  71 +-
 30 files changed, 4458 insertions(+), 932 deletions(-)
--

[1/5] activemq-artemis git commit: ARTEMIS-770 AMQP Message Transformer refactor

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 6f6d9845f -> 67f804054


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/62627bf2/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformerTest.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformerTest.java
 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformerTest.java
new file mode 100644
index 000..2ece01d
--- /dev/null
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/JMSMappingOutboundTransformerTest.java
@@ -0,0 +1,952 @@
+/*
+ * 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.protocol.amqp.converter.message;
+
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_DATA;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_NULL;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_SEQUENCE;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_UNKNOWN;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.AMQP_VALUE_BINARY;
+import static 
org.apache.activemq.artemis.protocol.amqp.converter.message.AMQPMessageSupport.JMS_AMQP_ORIGINAL_ENCODING;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.jms.JMSException;
+
+import 
org.apache.activemq.artemis.core.buffers.impl.ResetLimitWrappedActiveMQBuffer;
+import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
+import 
org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerDestination;
+import 
org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSBytesMessage;
+import 
org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSMapMessage;
+import 
org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSMessage;
+import 
org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSObjectMessage;
+import 
org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSStreamMessage;
+import 
org.apache.activemq.artemis.protocol.amqp.converter.jms.ServerJMSTextMessage;
+import org.apache.activemq.artemis.protocol.amqp.util.NettyWritable;
+import org.apache.activemq.artemis.utils.IDGenerator;
+import org.apache.activemq.artemis.utils.SimpleIDGenerator;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.messaging.AmqpSequence;
+import org.apache.qpid.proton.amqp.messaging.AmqpValue;
+import org.apache.qpid.proton.amqp.messaging.Data;
+import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
+import org.apache.qpid.proton.message.Message;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+
+public class JMSMappingOutboundTransformerTest {
+
+   private final UUID TEST_OBJECT_VALUE = 
UUID.fromString("fee14b62-09e0-4ac6-a4c3-4206c630d844");
+   private final String TEST_ADDRESS = "queue://testAddress";
+
+   private IDGenerator idGenerator;
+   private JMSMappingOutboundTransformer transformer;
+
+   public static final byte QUEUE_TYPE = 0x00;
+   public static final byte TOPIC_TYPE = 0x01;
+   public static 

[2/5] activemq-artemis git commit: ARTEMIS-770 AMQP Message Transformer refactor

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/62627bf2/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/AMQPMessageIdHelperTest.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/AMQPMessageIdHelperTest.java
 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/AMQPMessageIdHelperTest.java
new file mode 100644
index 000..c53cda5
--- /dev/null
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/converter/message/AMQPMessageIdHelperTest.java
@@ -0,0 +1,391 @@
+/*
+ *
+ * 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.protocol.amqp.converter.message;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.util.UUID;
+
+import 
org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPException;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.UnsignedLong;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AMQPMessageIdHelperTest {
+
+   private AMQPMessageIdHelper messageIdHelper;
+
+   @Before
+   public void setUp() throws Exception {
+  messageIdHelper = new AMQPMessageIdHelper();
+   }
+
+   /**
+* Test that {@link AMQPMessageIdHelper#toBaseMessageIdString(Object)} 
returns null if given
+* null
+*/
+   @Test
+   public void testToBaseMessageIdStringWithNull() {
+  String nullString = null;
+  assertNull("null string should have been returned", 
messageIdHelper.toBaseMessageIdString(nullString));
+   }
+
+   /**
+* Test that {@link AMQPMessageIdHelper#toBaseMessageIdString(Object)} 
throws an IAE if given
+* an unexpected object type.
+*/
+   @Test
+   public void testToBaseMessageIdStringThrowsIAEWithUnexpectedType() {
+  try {
+ messageIdHelper.toBaseMessageIdString(new Object());
+ fail("expected exception not thrown");
+  } catch (IllegalArgumentException iae) {
+ // expected
+  }
+   }
+
+   /**
+* Test that {@link AMQPMessageIdHelper#toBaseMessageIdString(Object)} 
returns the given
+* basic string unchanged
+*/
+   @Test
+   public void testToBaseMessageIdStringWithString() {
+  String stringMessageId = "myIdString";
+
+  String baseMessageIdString = 
messageIdHelper.toBaseMessageIdString(stringMessageId);
+  assertNotNull("null string should not have been returned", 
baseMessageIdString);
+  assertEquals("expected base id string was not returned", 
stringMessageId, baseMessageIdString);
+   }
+
+   /**
+* Test that {@link AMQPMessageIdHelper#toBaseMessageIdString(Object)} 
returns a string
+* indicating an AMQP encoded string, when the given string happens to 
already begin with the
+* {@link AMQPMessageIdHelper#AMQP_UUID_PREFIX}.
+*/
+   @Test
+   public void 
testToBaseMessageIdStringWithStringBeginningWithEncodingPrefixForUUID() {
+  String uuidStringMessageId = AMQPMessageIdHelper.AMQP_UUID_PREFIX + 
UUID.randomUUID();
+  String expected = AMQPMessageIdHelper.AMQP_STRING_PREFIX + 
uuidStringMessageId;
+
+  String baseMessageIdString = 
messageIdHelper.toBaseMessageIdString(uuidStringMessageId);
+  assertNotNull("null string should not have been returned", 
baseMessageIdString);
+  assertEquals("expected base id string was not returned", expected, 
baseMessageIdString);
+   }
+
+   /**
+* Test that {@link AMQPMessageIdHelper#toBaseMessageIdString(Object)} 
returns a string
+* indicating an AMQP encoded string, when the given string happens to 
already begin with the
+* {@link AMQPMessageIdHelper#AMQP_ULONG_PREFIX}.
+*/
+   @Test
+   public void 
testToBaseMessageIdStringWithStringBeginningWithEncodingPrefixForLong() {
+  String longStringMessageId = AMQPMessageIdHelper.AMQP_ULONG_PREFIX + 

[2/2] activemq-artemis git commit: ARTEMIS-762 Reflect management changes in AMQP protocol

[clebertsuconic]

ARTEMIS-762 Reflect management changes in AMQP protocol


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

Branch: refs/heads/master
Commit: 95c4fdd4086ae522f1d2edfc537c06f820d10ac1
Parents: 20729e7
Author: Martyn Taylor 
Authored: Fri Sep 30 16:36:00 2016 +0100
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:38:01 2016 -0400

--
 .../core/management/ActiveMQServerControl.java  |  7 ++
 .../management/impl/JMSTopicControlImpl.java|  2 +-
 .../amqp/broker/AMQPConnectionCallback.java |  2 +-
 .../amqp/broker/AMQPSessionCallback.java| 17 ++--
 .../ActiveMQProtonRemotingConnection.java   |  7 +-
 .../amqp/proton/AMQPConnectionContext.java  |  7 +-
 .../protocol/amqp/proton/AmqpSupport.java   |  3 +
 .../amqp/proton/ProtonServerSenderContext.java  | 11 ++-
 .../amqp/proton/handler/ProtonHandler.java  | 17 +++-
 .../impl/ActiveMQServerControlImpl.java | 10 ++-
 .../transport/amqp/client/AmqpSession.java  | 14 +++-
 .../tests/integration/amqp/ProtonTest.java  | 85 +++-
 .../management/ActiveMQServerControlTest.java   | 26 ++
 .../ActiveMQServerControlUsingCoreTest.java |  5 ++
 14 files changed, 190 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/95c4fdd4/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index 02819e5..01a8d74 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -512,6 +512,13 @@ public interface ActiveMQServerControl {
void destroyQueue(@Parameter(name = "name", desc = "Name of the queue to 
destroy") String name) throws Exception;
 
/**
+* Destroys the queue corresponding to the specified name.
+*/
+   @Operation(desc = "Destroy a queue", impact = MBeanOperationInfo.ACTION)
+   void destroyQueue(@Parameter(name = "name", desc = "Name of the queue to 
destroy") String name,
+ @Parameter(name = "removeConsumers", desc = "Remove 
consumers of this queue") boolean removeConsumers) throws Exception;
+
+   /**
 * Enables message counters for this server.
 */
@Operation(desc = "Enable message counters", impact = 
MBeanOperationInfo.ACTION)

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/95c4fdd4/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
--
diff --git 
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
 
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
index d8c4179..cd8e4e0 100644
--- 
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
+++ 
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSTopicControlImpl.java
@@ -238,7 +238,7 @@ public class JMSTopicControlImpl extends StandardMBean 
implements TopicControl {
  throw new IllegalArgumentException("No subscriptions with name " + 
queueName + " for clientID " + clientID);
   }
   ActiveMQServerControl serverControl = (ActiveMQServerControl) 
managementService.getResource(ResourceNames.CORE_SERVER);
-  serverControl.destroyQueue(queueName);
+  serverControl.destroyQueue(queueName, true);
}
 
@Override

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/95c4fdd4/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPConnectionCallback.java
index 31abf87..4ced546 100644
--- 

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

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 20729e79f -> 6f6d9845f


This closes #814


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

Branch: refs/heads/master
Commit: 6f6d9845fe9f5a0b54a3bd0cda8a541feb150995
Parents: 20729e7 95c4fdd
Author: Clebert Suconic 
Authored: Fri Oct 7 10:38:01 2016 -0400
Committer: Clebert Suconic 
Committed: Fri Oct 7 10:38:01 2016 -0400

--
 .../core/management/ActiveMQServerControl.java  |  7 ++
 .../management/impl/JMSTopicControlImpl.java|  2 +-
 .../amqp/broker/AMQPConnectionCallback.java |  2 +-
 .../amqp/broker/AMQPSessionCallback.java| 17 ++--
 .../ActiveMQProtonRemotingConnection.java   |  7 +-
 .../amqp/proton/AMQPConnectionContext.java  |  7 +-
 .../protocol/amqp/proton/AmqpSupport.java   |  3 +
 .../amqp/proton/ProtonServerSenderContext.java  | 11 ++-
 .../amqp/proton/handler/ProtonHandler.java  | 17 +++-
 .../impl/ActiveMQServerControlImpl.java | 10 ++-
 .../transport/amqp/client/AmqpSession.java  | 14 +++-
 .../tests/integration/amqp/ProtonTest.java  | 85 +++-
 .../management/ActiveMQServerControlTest.java   | 26 ++
 .../ActiveMQServerControlUsingCoreTest.java |  5 ++
 14 files changed, 190 insertions(+), 23 deletions(-)
--

activemq git commit: AMQ-6459 - store based % usage needs to poll the store for the current value on each access

[gtully]

Repository: activemq
Updated Branches:
  refs/heads/master e91f5c806 -> 8493f6b4d


AMQ-6459 - store based % usage needs to poll the store for the current value on 
each access


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

Branch: refs/heads/master
Commit: 8493f6b4d79146509e554e2b640f486d79f40bbb
Parents: e91f5c8
Author: gtully 
Authored: Fri Oct 7 14:31:52 2016 +0100
Committer: gtully 
Committed: Fri Oct 7 14:31:52 2016 +0100

--
 .../org/apache/activemq/usage/TempUsage.java|  13 ++
 .../org/apache/activemq/bugs/AMQ6459Test.java   | 213 +++
 2 files changed, 226 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/8493f6b4/activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java 
b/activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java
index f068dbe..885afbe 100755
--- a/activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/usage/TempUsage.java
@@ -51,6 +51,19 @@ public class TempUsage extends PercentLimitUsage {
 }
 
 @Override
+public int getPercentUsage() {
+if (store != null) {
+usageLock.writeLock().lock();
+try {
+percentUsage = caclPercentUsage();
+} finally {
+usageLock.writeLock().unlock();
+}
+}
+return super.getPercentUsage();
+}
+
+@Override
 protected long retrieveUsage() {
 if (store == null) {
 return 0;

http://git-wip-us.apache.org/repos/asf/activemq/blob/8493f6b4/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6459Test.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6459Test.java 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6459Test.java
new file mode 100644
index 000..1734d6a
--- /dev/null
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ6459Test.java
@@ -0,0 +1,213 @@
+/**
+ * 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 org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.jmx.BrokerViewMBean;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.store.kahadb.plist.PListStoreImpl;
+import org.apache.activemq.usage.SystemUsage;
+import org.apache.activemq.util.Wait;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Ensure the tempPercentUsage JMX attribute decreases after temp store usage 
is decreased
+ *
+ */
+public class AMQ6459Test {
+
+private static final Logger LOG = 
LoggerFactory.getLogger(AMQ6459Test.class);
+
+private static final String DESTINATION = "testQ1";
+private static final int MESSAGES_TO_SEND = 4000;
+
+private String TRANSPORT_URL = "tcp://0.0.0.0:0";
+
+BrokerService broker;
+
+@Before
+public void createBroker() throws Exception {
+
+broker = new BrokerService();
+

svn commit: r999006 - in /websites/production/activemq/content: apache-activemq-board-report-201610-october.html cache/main.pageCache

[buildbot]

Author: buildbot
Date: Fri Oct  7 10:22:42 2016
New Revision: 999006

Log:
Production update by buildbot for activemq

Modified:

websites/production/activemq/content/apache-activemq-board-report-201610-october.html
websites/production/activemq/content/cache/main.pageCache

Modified: 
websites/production/activemq/content/apache-activemq-board-report-201610-october.html
==
--- 
websites/production/activemq/content/apache-activemq-board-report-201610-october.html
 (original)
+++ 
websites/production/activemq/content/apache-activemq-board-report-201610-october.html
 Fri Oct  7 10:22:42 2016
@@ -72,7 +72,7 @@
   
 
 
-DescriptionApache ActiveMQ is a popular and powerful open source messaging 
server. Apache ActiveMQ is fast, supports many cross language clients and 
protocols, comes with easy to use enterprise integration patterns and many 
advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 
1.0.ActivityActiveMQ ...ActiveMQ Artemis 
...(Most of this information is pulled 
from https://reporter.apache.org/;>reporter.apac
 he.org)
+DescriptionApache ActiveMQ is a popular and powerful open source messaging 
server. Apache ActiveMQ is fast, supports many cross language clients and 
protocols, comes with easy to use enterprise integration patterns and many 
advanced features while fully supporting JMS 1.1, J2EE 1.4, AMQP 
1.0.ActivityActiveMQ ...ActiveMQ ArtemisApache Artemis 1.4.0 
ReleasedAMQP 1.0 
implementation impro
 vementsLocal 
transaction support improvedmulti-session-per-tx and multi-tx-per-session capabilities 
supportSupport for 
OASIS AMQP JMS mappings for JMS 1.1 over AMQP 1.0 
addedMajor fefactor of 
the AMQP implementation making it simpler and easier to 
understand[CVE-2016-4978] 
Apache ActiveMQ Artemis: Deserialization of untrusted input 
vunerability.Fixed in 
Apache Artemis 1.4.0Announcement madeSupport for setting global li
 mits (total memory and disk utilization) addedBasic CDI integration 
added(Most of this information 
is pulled from https://reporter.apache.org/;>reporter.apache.org)
 
 
   

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

[CONF] Apache ActiveMQ > Apache ActiveMQ Board Report - 2016.10 (October)

[Martyn Taylor (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Martyn Taylor edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Apache ActiveMQ Board Report - 2016.10 (October) 
 
 
  
 
 
 
 
 
 
 ... 
 
 ActiveMQ ...
  ActiveMQ Artemis  
 
  Apache Artemis 1.4.0 Released   
  AMQP 1.0 implementation improvements  
 
  Local transaction support improved   
  multi-session-per-tx and multi-tx-per-session capabilities support   
  Support for OASIS AMQP JMS mappings for JMS 1.1 over AMQP 1.0 added   
  Major fefactor of the AMQP implementation making it simpler and easier to understand   
  
  [CVE-2016-4978] Apache ActiveMQ Artemis: Deserialization of untrusted input vunerability.  
 
  Fixed in Apache Artemis 1.4.0   
  Announcement made   
  
  Support for setting global limits (total memory and disk utilization) added   
  Basic CDI integration added   
  
   (Most of this information is pulled from reporter.apache.org)  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

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

activemq git commit: AMQ-6454 - ensure message.acknowledge throws if consumer has closed and message has been released broker side

[gtully]

Repository: activemq
Updated Branches:
  refs/heads/master 1316b57ed -> e91f5c806


AMQ-6454 - ensure message.acknowledge throws if consumer has closed and message 
has been released broker side


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

Branch: refs/heads/master
Commit: e91f5c8062f81a76e6983c489bfd092ce4071480
Parents: 1316b57
Author: gtully 
Authored: Fri Oct 7 09:57:14 2016 +0100
Committer: gtully 
Committed: Fri Oct 7 09:57:28 2016 +0100

--
 .../activemq/ActiveMQMessageConsumer.java   |  2 ++
 .../org/apache/activemq/JMSConsumerTest.java| 28 
 .../org/apache/activemq/JMSXAConsumerTest.java  |  4 +++
 3 files changed, 34 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/e91f5c80/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
--
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
index 83ce137..a52e2d4 100755
--- 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
@@ -602,6 +602,7 @@ public class ActiveMQMessageConsumer implements 
MessageAvailableConsumer, StatsC
 m.setAcknowledgeCallback(new Callback() {
 @Override
 public void execute() throws Exception {
+checkClosed();
 session.checkClosed();
 session.acknowledge();
 }
@@ -610,6 +611,7 @@ public class ActiveMQMessageConsumer implements 
MessageAvailableConsumer, StatsC
 m.setAcknowledgeCallback(new Callback() {
 @Override
 public void execute() throws Exception {
+checkClosed();
 session.checkClosed();
 acknowledge(md);
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/e91f5c80/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java 
b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
index 4f02d47..8785acb 100755
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.jms.BytesMessage;
+import javax.jms.JMSException;
 import javax.jms.DeliveryMode;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
@@ -859,6 +860,33 @@ public class JMSConsumerTest extends JmsTestSupport {
 redispatchSession.close();
 }
 
+public void testExceptionOnClientAckAfterConsumerClose() throws Exception {
+
+connection.start();
+Session session = connection.createSession(false, 
Session.CLIENT_ACKNOWLEDGE);
+destination = createDestination(session, 
ActiveMQDestination.QUEUE_TYPE);
+
+sendMessages(connection, destination, 1);
+
+MessageConsumer consumer = session.createConsumer(destination);
+Message message = consumer.receive(1000);
+assertNotNull(message);
+consumer.close();
+
+try {
+message.acknowledge();
+fail("Expect exception on ack after close - consumer gone so 
message available again");
+} catch (JMSException expected) {}
+
+Session redispatchSession = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
+MessageConsumer redispatchConsumer = 
redispatchSession.createConsumer(destination);
+Message msg = redispatchConsumer.receive(1000);
+assertNotNull(msg);
+
+redispatchSession.close();
+}
+
+
 public void initCombosForTestAckOfExpired() {
 addCombinationValues("destinationType",
 new Object[] {Byte.valueOf(ActiveMQDestination.QUEUE_TYPE), 
Byte.valueOf(ActiveMQDestination.TOPIC_TYPE)});

http://git-wip-us.apache.org/repos/asf/activemq/blob/e91f5c80/activemq-unit-tests/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSXAConsumerTest.java