Author: rmannibucau
Date: Wed Oct 10 10:02:19 2012
New Revision: 1396530
URL: http://svn.apache.org/viewvc?rev=1396530&view=rev
Log:
adding the tomcatloader.destroy in the webappbuilder to get all the lifecycle
in a single place
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1396530&r1=1396529&r2=1396530&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
Wed Oct 10 10:02:19 2012
@@ -20,9 +20,6 @@ package org.apache.tomee.catalina;
import org.apache.catalina.Container;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleListener;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.startup.Bootstrap;
@@ -103,15 +100,15 @@ public class TomcatLoader implements Loa
/**
* OpenEJB Server Daemon
*/
- private EjbServer ejbServer;
+ private static EjbServer ejbServer;
/**
* OpenEJB Service Manager that manage services
*/
- private ServiceManager manager;
+ private static ServiceManager manager;
/** other services */
- private List<ServerService> services = new ArrayList<ServerService> ();
+ private static final List<ServerService> services = new
ArrayList<ServerService> ();
/**
* Creates a new instance.
@@ -288,15 +285,6 @@ public class TomcatLoader implements Loa
}
}
- standardServer.addLifecycleListener(new LifecycleListener() {
- public void lifecycleEvent(LifecycleEvent event) {
- String type = event.getType();
- if (Lifecycle.AFTER_STOP_EVENT.equals(type)) {
- TomcatLoader.this.destroy();
- }
- }
- });
-
if (SystemInstance.get().getOptions().get(TOMEE_NOSHUTDOWNHOOK_PROP,
(String) null) != null) {
final Field daemonField =
Bootstrap.class.getDeclaredField("daemon");
final boolean acc = daemonField.isAccessible();
@@ -339,7 +327,7 @@ public class TomcatLoader implements Loa
/**
* Destroy system.
*/
- public void destroy() {
+ public static void destroy() {
for (ServerService s : services) {
try {
s.stop();
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1396530&r1=1396529&r2=1396530&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
Wed Oct 10 10:02:19 2012
@@ -1422,6 +1422,8 @@ public class TomcatWebAppBuilder impleme
}
}
}
+
+ TomcatLoader.destroy();
}
/**
