Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-619 stop components along with server

This commit is contained in:
jbertram 2016-07-08 13:23:04 -05:00
parent db578d37ad
commit 17cf45ad4f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
View File

@ -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();

5
artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
View File

@ -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);