You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/02/03 22:38:42 UTC
[2/2] isis git commit: ISIS-1017 Shutdown IsisSystem so all services'
@PreDestroy callback is called too
ISIS-1017 Shutdown IsisSystem so all services' @PreDestroy callback is called too
Added code to embedded Jetty server to properly stop
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5b00642c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5b00642c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5b00642c
Branch: refs/heads/master
Commit: 5b00642c3e59bf918f5440be77d3a0d9b2d0bf73
Parents: 752d9f4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Feb 3 23:37:07 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Feb 3 23:37:07 2015 +0200
----------------------------------------------------------------------
.../apache/isis/viewer/wicket/viewer/IsisWicketApplication.java | 1 +
.../org/apache/isis/core/webserver/WebServerBootstrapper.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5b00642c/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 319d42f..ef1f2a5 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -643,6 +643,7 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
@Override
protected void onDestroy() {
try {
+ system.shutdown();
IsisContext.shutdown();
super.onDestroy();
} catch(final RuntimeException ex) {
http://git-wip-us.apache.org/repos/asf/isis/blob/5b00642c/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
index 4f1f466..22ab3f9 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
@@ -84,6 +84,9 @@ final class WebServerBootstrapper implements IsisBootstrapper {
try {
jettyServer.start();
if (startupMode.isForeground()) {
+ System.in.read();
+ System.out.println(">>> STOPPING EMBEDDED JETTY SERVER");
+ jettyServer.stop();
jettyServer.join();
}
} catch (final Exception ex) {