Changeset 6629

Timestamp:

Nov 27, 2014, 8:41:11 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1893: Starting and stopping BASE in Tomcat is not implemented correctly

Also nullify several static propertis in Application class.

Location:

trunk

Files:

• config/dist/web.xml (modified) (2 diffs)
• src/clients/web/net/sf/basedb/clients/web/servlet/ExtensionsServlet.java (modified) (3 diffs)
• src/clients/web/net/sf/basedb/clients/web/servlet/StartStopServlet.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/Application.java (modified) (2 diffs)

trunk/config/dist/web.xml

@@ -60 +60 @@
   
   <!-- 
-    BASE startup and shutdown servlet; 
-    should be configured to load on startup as the first servlet 
+    Listener implementation that start and stop BASE 
+    when the Tomcat is starting/stopping.
   -->
-  <servlet>
+  <listener>
     <description>Starts and stops BASE when Tomcat is starting and stopping</description>
     <display-name>BASE Start/Stop servlet</display-name>
-    <servlet-name>BASE</servlet-name>
-    <servlet-class>net.sf.basedb.clients.web.servlet.StartStopServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
+    <listener-class>net.sf.basedb.clients.web.servlet.StartStopServlet</listener-class>
+  </listener>
   
   <!-- The View servlet used to download files in view mode -->
@@ -218 +216 @@
   <servlet>
     <description>
-      Starts up the extensions system in the web client and handles request for
-      servlets inside extensions.
+      Handles request for servlets inside extensions.
     </description>
     <display-name>Web client extensions manager</display-name>
     <servlet-name>ExtensionsServlet</servlet-name>
     <servlet-class>net.sf.basedb.clients.web.servlet.ExtensionsServlet</servlet-class>
-    <load-on-startup>2</load-on-startup>
   </servlet>
   <servlet-mapping>

trunk/src/clients/web/net/sf/basedb/clients/web/servlet/ExtensionsServlet.java

@@ -25 +25 @@
 import java.util.regex.Pattern;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -40 +38 @@
 
 /**
-  Servlet for starting the extension system when the web server starts. 
-  The servlet should be configured with the
-  <code>&lt;load-on-startup&gt;1&lt;/load-on-startup&gt;</code>
-  option in the web.xml file. When the servlet is loaded it will initialise the
-  {@link ExtensionsControl} class.
-  <p>
-  
-  This servlet is also acting as a proxy for requests to extension defined
+  This servlet is acting as a proxy for requests to extension defined
   servlets. Such servlets are defined in <code>META-INF/servlets.xml</code>
   in the extension JAR file. A request to a servlet must have the following
@@ -65 +56 @@
   public ExtensionsServlet()
   {}
-  
-  @Override
-  public void init()
-    throws ServletException
-  {
-    super.init();
-    ServletConfig cfg = getServletConfig();
-    ServletContext context = cfg.getServletContext();
-    ExtensionsControl.init(context);
-  }
-
-  @Override
-  public void destroy()
-  {
-    ExtensionsControl.close();
-    super.destroy();
-  }
   
   /**

trunk/src/clients/web/net/sf/basedb/clients/web/servlet/StartStopServlet.java

@@ -21 +21 @@
 package net.sf.basedb.clients.web.servlet;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import net.sf.basedb.clients.web.extensions.ExtensionsControl;
 import net.sf.basedb.core.Application;
 
 /**
-  Servlet for starting BASE when the web server is started and
+  Servlet listener for starting BASE when the web server is started and
   stopping BASE when the web server is stopped. This servlet is very simple.
-  It will call {@link Application#start()} when it is loaded and
-  {@link Application#stop()} when it is destroyed.
-  <p>
-  
-  This servlet should be configured to load before any other servlet that
-  use BASE classes.
+  It will call {@link Application#start()} and {@link ExtensionsControl#init(javax.servlet.ServletContext)}
+  when it is loaded and {@link Application#stop()} and {@link ExtensionsControl#close()}
+  when it is destroyed.
+
   
   @author nicklas
@@ -40 +40 @@
 */
 public class StartStopServlet 
-  extends HttpServlet
+  implements ServletContextListener
 {
   
@@ -48 +48 @@
   {}
   
-  /**
-    Calls {@link Application#start()}.
-  */
   @Override
-  public void init()
-    throws ServletException
+  public void contextInitialized(ServletContextEvent ctx) 
   {
-    super.init();
     Application.start();
+    ExtensionsControl.init(ctx.getServletContext());
+  }
+  
+  @Override
+  public void contextDestroyed(ServletContextEvent ctx) 
+  {
+    ExtensionsControl.close();
+    Application.stop();   
   }
 
-  /**
-    Calls {@link Application#stop()}.
-  */
-  @Override
-  public void destroy()
-  {
-    Application.stop();
-    super.destroy();
-  }
 
 }

trunk/src/core/net/sf/basedb/core/Application.java

@@ -672 +672 @@
     if (timer != null) timer.cancel();
     if (internalJobQueue != null) internalJobQueue.close();
+    internalJobQueue = null;
     timer = null;
     scheduler = null;
     cleanSessionControlCache(true);
     sessionCache = null;
-    
     Keyring.unload();
     SystemItems.unload();
@@ -690 +690 @@
     ExtendedProperties.unload();
     Config.unload();
+
+    xtManager = null;
+    secondaryStorageDriver = null;
+    userFilesDirectory = null;
+    pluginsDirectory = null;
+    extendedPropertiesFile = null;
+    rawDataTypesFile = null;
+    dynamicCatalog = null;
+    dynamicSchema = null;
+    hostName = null;
+    databaseVersionNumber = null;
+    
     schemaVersion = -2;
     log.info("BASE has been stopped");