You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/08/11 22:27:15 UTC
[1/3] activemq-artemis git commit: Changing run-examples to also run
HA examples
Repository: activemq-artemis
Updated Branches:
refs/heads/master 6b1736f35 -> 952d372ce
Changing run-examples to also run HA 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/a53dd926
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a53dd926
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a53dd926
Branch: refs/heads/master
Commit: a53dd926a50440c40562e70b7dbfa1da6e4e27f4
Parents: 6b1736f
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Aug 11 14:31:50 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 11 17:24:53 2016 -0400
----------------------------------------------------------------------
.../src/test/scripts/run-examples.sh | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a53dd926/artemis-distribution/src/test/scripts/run-examples.sh
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/test/scripts/run-examples.sh b/artemis-distribution/src/test/scripts/run-examples.sh
index b97caf6..428e6f0 100755
--- a/artemis-distribution/src/test/scripts/run-examples.sh
+++ b/artemis-distribution/src/test/scripts/run-examples.sh
@@ -111,24 +111,24 @@ cd symmetric-cluster; mvn verify; cd ..
# TODO: these will hung eventually when ran in series
-#cd $ARTEMIS_HOME/examples/features/ha/
-#
-#cd application-layer-failover; mvn verify; cd ..
-#cd client-side-failoverlistener; mvn verify; cd ..
-#cd colocated-failover; mvn verify; cd ..
-#cd colocated-failover-scale-down; mvn verify; cd ..
-#cd ha-policy-autobackup; mvn verify; cd ..
-#cd multiple-failover; mvn verify; cd ..
-#cd multiple-failover-failback; mvn verify; cd ..
-#cd non-transaction-failover; mvn verify; cd ..
-#cd replicated-failback; mvn verify; cd ..
-#cd replicated-failback-static; mvn verify; cd ..
-
-#cd replicated-multiple-failover; mvn verify; cd ..
-
-#cd replicated-transaction-failover; mvn verify; cd ..
-#cd scale-down; mvn verify; cd ..
-#cd transaction-failover; mvn verify; cd ..
+cd $ARTEMIS_HOME/examples/features/ha/
+
+cd application-layer-failover; mvn verify; cd ..
+cd client-side-failoverlistener; mvn verify; cd ..
+cd colocated-failover; mvn verify; cd ..
+cd colocated-failover-scale-down; mvn verify; cd ..
+cd ha-policy-autobackup; mvn verify; cd ..
+cd multiple-failover; mvn verify; cd ..
+cd multiple-failover-failback; mvn verify; cd ..
+cd non-transaction-failover; mvn verify; cd ..
+cd replicated-failback; mvn verify; cd ..
+cd replicated-failback-static; mvn verify; cd ..
+
+cd replicated-multiple-failover; mvn verify; cd ..
+
+cd replicated-transaction-failover; mvn verify; cd ..
+cd scale-down; mvn verify; cd ..
+cd transaction-failover; mvn verify; cd ..
cd $CURRENT_DIR
[3/3] activemq-artemis git commit: This closes #719
Posted by jb...@apache.org.
This closes #719
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/952d372c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/952d372c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/952d372c
Branch: refs/heads/master
Commit: 952d372cee429d6fc75e0d078f16a90970e46b34
Parents: 6b1736f c568a97
Author: jbertram <jb...@apache.org>
Authored: Thu Aug 11 17:26:17 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Thu Aug 11 17:26:17 2016 -0500
----------------------------------------------------------------------
.../apache/activemq/artemis/cli/Artemis.java | 7 ++++
.../src/test/scripts/run-examples.sh | 36 ++++++++++----------
.../jms/server/impl/JMSServerManagerImpl.java | 9 +++--
.../core/server/impl/ActiveMQServerImpl.java | 13 +++----
4 files changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: ARTEMIS-601 Reload manager wasn't
working with backups
Posted by jb...@apache.org.
ARTEMIS-601 Reload manager wasn't working with backups
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c568a977
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c568a977
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c568a977
Branch: refs/heads/master
Commit: c568a9774fdd4625ef4190d8a73d2f7c31f16bca
Parents: a53dd92
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Aug 11 17:24:37 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Aug 11 17:25:08 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/activemq/artemis/cli/Artemis.java | 7 +++++++
.../artemis/jms/server/impl/JMSServerManagerImpl.java | 9 ++++-----
.../artemis/core/server/impl/ActiveMQServerImpl.java | 13 +++++++------
3 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c568a977/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
index 40b52bf..bd64b33 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
@@ -84,6 +84,13 @@ public class Artemis {
System.err.println(cliException.getMessage());
return cliException;
}
+ catch (NullPointerException e) {
+ // Yeah.. I really meant System.err..
+ // this is the CLI and System.out and System.err are common places for interacting with the user
+ // this is a programming error that must be visualized and corrected
+ e.printStackTrace();
+ return e;
+ }
catch (RuntimeException re) {
System.err.println(re.getMessage());
System.out.println();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c568a977/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index ce9a27c..8e313a3 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -274,6 +274,10 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
@Override
public void activationComplete() {
+ ReloadManager reloadManager = server.getReloadManager();
+ if (config != null && config.getConfigurationUrl() != null && reloadManager != null) {
+ reloadManager.addCallback(config.getConfigurationUrl(), new JMSReloader());
+ }
}
@@ -406,11 +410,6 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
*/
startCalled = true;
server.start();
- ReloadManager reloadManager = server.getReloadManager();
- if (config != null && config.getConfigurationUrl() != null && reloadManager != null) {
- reloadManager.addCallback(config.getConfigurationUrl(), new JMSReloader());
- }
-
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c568a977/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 3b86c22..0d25271 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -461,12 +461,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
// start connector service
connectorsService = new ConnectorsService(configuration, storageManager, scheduledPool, postOffice, serviceRegistry);
connectorsService.start();
-
- this.reloadManager = new ReloadManagerImpl(getScheduledPool(), configuration.getConfigurationFileRefreshPeriod());
-
- if (configuration.getConfigurationUrl() != null && getScheduledPool() != null) {
- reloadManager.addCallback(configuration.getConfigurationUrl(), new ConfigurationFileReloader());
- }
}
finally {
// this avoids embedded applications using dirty contexts from startup
@@ -1952,6 +1946,13 @@ public class ActiveMQServerImpl implements ActiveMQServer {
deployGroupingHandlerConfiguration(configuration.getGroupingHandlerConfiguration());
+ this.reloadManager = new ReloadManagerImpl(getScheduledPool(), configuration.getConfigurationFileRefreshPeriod());
+
+ if (configuration.getConfigurationUrl() != null && getScheduledPool() != null) {
+ reloadManager.addCallback(configuration.getConfigurationUrl(), new ConfigurationFileReloader());
+ }
+
+
return true;
}