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 2016/07/08 18:52:31 UTC
[1/2] activemq-artemis git commit: ARTEMIS-619 stop components along
with server
Repository: activemq-artemis
Updated Branches:
refs/heads/master db578d37a -> 506dbc7ff
ARTEMIS-619 stop components along with server
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/17cf45ad
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/17cf45ad
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/17cf45ad
Branch: refs/heads/master
Commit: 17cf45ad4f20a82fc251bab291962c607f1b3d15
Parents: db578d3
Author: jbertram <jb...@apache.org>
Authored: Fri Jul 8 13:23:04 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Fri Jul 8 13:23:04 2016 -0500
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/Run.java | 11 +++++++++--
.../activemq/artemis/component/WebServerComponent.java | 5 -----
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/17cf45ad/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
index d3c711d..3a0c6c9 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
@@ -102,6 +102,13 @@ public class Run extends LockAbstract {
fileConfiguration.getLargeMessagesLocation().mkdirs();
}
+ private void stopServerAndComponenets() throws Exception {
+ for (ActiveMQComponent component : components) {
+ component.stop();
+ }
+ server.stop();
+ }
+
/**
* Add a simple shutdown hook to stop the server.
*
@@ -139,7 +146,7 @@ public class Run extends LockAbstract {
if (file.exists()) {
try {
try {
- server.stop();
+ stopServerAndComponenets();
}
catch (Exception e) {
e.printStackTrace();
@@ -162,7 +169,7 @@ public class Run extends LockAbstract {
@Override
public void run() {
try {
- server.stop();
+ stopServerAndComponenets();
}
catch (Exception e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/17cf45ad/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
----------------------------------------------------------------------
diff --git a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
index b857d5b..739edc0 100644
--- a/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
+++ b/artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
@@ -98,11 +98,6 @@ public class WebServerComponent implements ExternalComponent {
}
}
- WebAppContext handler = new WebAppContext();
- handler.setContextPath("/");
- handler.setResourceBase(warDir.toString());
- handler.setLogUrlOnStart(true);
-
ResourceHandler resourceHandler = new ResourceHandler();
resourceHandler.setResourceBase(warDir.toString());
resourceHandler.setDirectoriesListed(true);
[2/2] activemq-artemis git commit: This closes #626
Posted by cl...@apache.org.
This closes #626
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/506dbc7f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/506dbc7f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/506dbc7f
Branch: refs/heads/master
Commit: 506dbc7fffb4a71bdce3b78042ee6b0b5cdde9f3
Parents: db578d3 17cf45a
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Jul 8 14:49:11 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Jul 8 14:49:11 2016 -0400
----------------------------------------------------------------------
.../org/apache/activemq/artemis/cli/commands/Run.java | 11 +++++++++--
.../activemq/artemis/component/WebServerComponent.java | 5 -----
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------