You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/08/03 14:24:44 UTC

[1/5] activemq-artemis git commit: This closes #103 fixes

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 5e2a40555 -> d9ba65c01


This closes #103 fixes


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

Branch: refs/heads/master
Commit: d9ba65c01c433e14ea72010ddb7b67ab936f4317
Parents: 5e2a405 df075c4
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Aug 3 08:24:28 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 3 08:24:28 2015 -0400

----------------------------------------------------------------------
 .../server/cluster/impl/ClusterConnectionBridge.java   |  1 -
 .../jms/example/ColocatedFailoverScaleDownExample.java |  3 ++-
 .../artemis/jms/example/ColocatedFailoverExample.java  |  1 +
 .../src/main/resources/activemq/server0/broker.xml     |  4 +++-
 .../src/main/resources/activemq/server1/broker.xml     |  8 ++++++--
 .../integration/management/CoreMessagingProxy.java     | 13 ++++++++++---
 .../integration/mqtt/imported/MQTTTestSupport.java     |  6 ++++++
 7 files changed, 28 insertions(+), 8 deletions(-)
----------------------------------------------------------------------



[4/5] activemq-artemis git commit: Fix failing colocated examples

Posted by cl...@apache.org.
Fix failing colocated examples


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

Branch: refs/heads/master
Commit: df075c423fbecf57d78513465300dd6740196160
Parents: fe95e34
Author: jbertram <jb...@apache.org>
Authored: Wed Jul 29 16:53:44 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 3 08:24:28 2015 -0400

----------------------------------------------------------------------
 .../jms/example/ColocatedFailoverScaleDownExample.java       | 3 ++-
 .../artemis/jms/example/ColocatedFailoverExample.java        | 1 +
 .../src/main/resources/activemq/server0/broker.xml           | 4 +++-
 .../src/main/resources/activemq/server1/broker.xml           | 8 ++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/df075c42/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
index 29f54c3..147f65b 100644
--- a/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
+++ b/examples/jms/colocated-failover-scale-down/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverScaleDownExample.java
@@ -97,7 +97,8 @@ public class ColocatedFailoverScaleDownExample
          // Step 7. Crash server #0, the live server, and wait a little while to make sure
          // it has really crashed
          ServerUtil.killServer(server0);
-         Thread.sleep(5000);
+         System.out.println("Waiting for scale-down to complete...");
+         Thread.sleep(10000);
 
          // Step 8. start the connection ready to receive messages
          connection1.start();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/df075c42/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
index ad62419..c5bb765 100644
--- a/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
+++ b/examples/jms/colocated-failover/src/main/java/org/apache/activemq/artemis/jms/example/ColocatedFailoverExample.java
@@ -97,6 +97,7 @@ public class ColocatedFailoverExample
          // Step 7. Crash server #0, the live server, and wait a little while to make sure
          // it has really crashed
          ServerUtil.killServer(server0);
+         Thread.sleep(10000);
 
          // Step 8. start the connection ready to receive messages
          connection.start();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/df075c42/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
index b38d764..0a4103f 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server0/broker.xml
@@ -89,7 +89,9 @@ under the License.
                <master>
                   <failover-on-shutdown>true</failover-on-shutdown>
                </master>
-               <slave/>
+               <slave>
+                  <failover-on-shutdown>true</failover-on-shutdown>
+               </slave>
             </colocated>
          </shared-store>
       </ha-policy>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/df075c42/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
----------------------------------------------------------------------
diff --git a/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
index f0dd088..8083f27 100644
--- a/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
+++ b/examples/jms/colocated-failover/src/main/resources/activemq/server1/broker.xml
@@ -86,8 +86,12 @@ under the License.
                <backup-request-retry-interval>2000</backup-request-retry-interval>
                <max-backups>1</max-backups>
                <request-backup>true</request-backup>
-               <master/>
-               <slave/>
+               <master>
+                  <failover-on-shutdown>true</failover-on-shutdown>
+               </master>
+               <slave>
+                  <failover-on-shutdown>true</failover-on-shutdown>
+               </slave>
             </colocated>
          </shared-store>
       </ha-policy>


[3/5] activemq-artemis git commit: Fix NPE in management test

Posted by cl...@apache.org.
Fix NPE in management test


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

Branch: refs/heads/master
Commit: ecc2cecf87e6f529a9afef96795b78d13c530332
Parents: 5e2a405
Author: jbertram <jb...@apache.org>
Authored: Thu Jul 30 10:35:20 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 3 08:24:28 2015 -0400

----------------------------------------------------------------------
 .../integration/management/CoreMessagingProxy.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ecc2cecf/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
index fdd446a..1f13b20 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
@@ -94,13 +94,20 @@ public class CoreMessagingProxy
       ClientMessage m = session.createMessage(false);
       ManagementHelper.putOperationInvocation(m, resourceName, operationName, args);
       ClientMessage reply = requestor.request(m);
-      if (ManagementHelper.hasOperationSucceeded(reply))
+      if (reply != null)
       {
-         return ManagementHelper.getResult(reply);
+         if (ManagementHelper.hasOperationSucceeded(reply))
+         {
+            return ManagementHelper.getResult(reply);
+         }
+         else
+         {
+            throw new Exception((String) ManagementHelper.getResult(reply));
+         }
       }
       else
       {
-         throw new Exception((String)ManagementHelper.getResult(reply));
+         return null;
       }
    }
 


[5/5] activemq-artemis git commit: ARTEMIS-179 excessive cluster bridge retry logging

Posted by cl...@apache.org.
ARTEMIS-179 excessive cluster bridge retry logging

The information about the bridge connection retries is already logged
at DEBUG level elsewhere and a WARN message is already logged when the
connection dies in the first place. I don't see any good reason to
keep this logging here.


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

Branch: refs/heads/master
Commit: fc14e31aa708dca98d6f8ebb0a46651af002aaab
Parents: ecc2cec
Author: jbertram <jb...@apache.org>
Authored: Thu Jul 30 13:15:50 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 3 08:24:28 2015 -0400

----------------------------------------------------------------------
 .../artemis/core/server/cluster/impl/ClusterConnectionBridge.java   | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fc14e31a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
index ebf1988..357c22b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionBridge.java
@@ -155,7 +155,6 @@ public class ClusterConnectionBridge extends BridgeImpl
 
       if (factory == null)
       {
-         ActiveMQServerLogger.LOGGER.nodeNotAvailable(targetNodeID);
          return null;
       }
       factory.setReconnectAttempts(0);


[2/5] activemq-artemis git commit: Ensure MQTT tests clean up SSL properties

Posted by cl...@apache.org.
Ensure MQTT tests clean up SSL properties


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

Branch: refs/heads/master
Commit: fe95e34390bb8156d3d09fd3a67c4112b0779a45
Parents: fc14e31
Author: jbertram <jb...@apache.org>
Authored: Thu Jul 30 09:26:16 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 3 08:24:28 2015 -0400

----------------------------------------------------------------------
 .../tests/integration/mqtt/imported/MQTTTestSupport.java       | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fe95e343/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
index fd802ec..36a2308 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
@@ -111,6 +111,12 @@ public class MQTTTestSupport extends ActiveMQTestBase
    @After
    public void tearDown() throws Exception
    {
+      System.clearProperty("javax.net.ssl.trustStore");
+      System.clearProperty("javax.net.ssl.trustStorePassword");
+      System.clearProperty("javax.net.ssl.trustStoreType");
+      System.clearProperty("javax.net.ssl.keyStore");
+      System.clearProperty("javax.net.ssl.keyStorePassword");
+      System.clearProperty("javax.net.ssl.keyStoreType");
       stopBroker();
    }