merged 1.1 branch into head

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 20e3f9a..4c1d9c9 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001-2006 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -19,8 +19,6 @@
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
  * the code of this program with  any library licensed under the Apache Software License,
- * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
- * (or with modified versions of the above that use the same license as the above),
  * and distribute linked combinations including the two.  You must obey the
  * GNU General Public License in all respects for all of the code used other than
  * the above mentioned libraries.  If you modify this file, you may extend this
@@ -28,38 +26,45 @@
  * If you do not wish to do so, delete this exception statement from your version.
  */
 
-import java.io.IOException;
-import java.io.PrintWriter;
+import mir.servlet.AbstractServlet;
+import mir.servlet.ServletModuleUserExc;
+import mir.util.ExceptionRoutines;
+import mircoders.servlet.ServletModuleOpenIndy;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-
-import mir.servlet.AbstractServlet;
-import mir.servlet.ServletModuleDispatch;
-import mir.servlet.ServletModuleUserExc;
-import mir.util.ExceptionFunctions;
-import mircoders.servlet.ServletModuleOpenIndy;
+import java.io.IOException;
+import java.io.PrintWriter;
 
 /**
  *  OpenMir.java - main servlet for open posting and comment feature to articles
  *
  *  @author RK 1999-2001, the mir-coders group
+ *  @version $Id: OpenMir.java,v 1.39 2007/04/08 21:46:44 idfx Exp $
  *
  */
 
 
 public class OpenMir extends AbstractServlet {
-  public void process(HttpServletRequest aRequest, HttpServletResponse aResponse)
-        throws ServletException, IOException {
-    if ((configuration.getString("RootUri") == null) ||
-        configuration.getString("RootUri").equals("")) {
+  private ServletModuleOpenIndy servletModule;
+
+  private synchronized ServletModuleOpenIndy getServletModule() {
+    if (servletModule == null) {
+      servletModule = new ServletModuleOpenIndy();
+    }
+
+    return servletModule;
+  }
+
+  public void process(HttpServletRequest aRequest,
+                      HttpServletResponse aResponse) throws ServletException, IOException {
+    if ("".equals(configuration.getString("RootUri", ""))) {
       configuration.setProperty("RootUri", aRequest.getContextPath());
     }
 
     long startTime = System.currentTimeMillis();
-    long sessionConnectTime=0;
 
     HttpSession session = aRequest.getSession();
 
@@ -71,28 +76,37 @@ public class OpenMir extends AbstractServlet {
     aResponse.setContentType("text/html; charset="+configuration.getString("Mir.DefaultHTMLCharset"));
 
     try {
-      ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(), aRequest, aResponse);
+      // call appropriate ServletModuleOpenIndy method 
+      // as specified in http request 
+      // example: OpenMir?do=opensession calls the opensession method
+
+      getServletModule().handleRequest(aRequest, aResponse);
     }
     catch (Throwable e) {
-      Throwable cause = ExceptionFunctions.traceCauseException(e);
+      logger.warn("Error in open publishing", e);
 
-      if (cause instanceof ServletModuleUserExc)
+      Throwable cause = ExceptionRoutines.traceCauseException(e);
+
+      if (cause instanceof ServletModuleUserExc) {
         handleUserError(aRequest, aResponse, aResponse.getWriter(), (ServletModuleUserExc) cause);
-      else
+      }
+      else {
         handleError(aRequest, aResponse, aResponse.getWriter(), cause);
+      }
     }
 
-    sessionConnectTime = System.currentTimeMillis() - startTime;
+    long sessionConnectTime = System.currentTimeMillis() - startTime;
+
     logger.debug("EXECTIME (ServletModuleOpenIndy): " + sessionConnectTime + " ms");
   }
 
   private void handleUserError(HttpServletRequest aRequest, HttpServletResponse aResponse,
-                               PrintWriter out, ServletModuleUserExc anException) {
-    ((ServletModuleOpenIndy) ServletModuleOpenIndy.getInstance()).handleUserError(aRequest, aResponse, out, anException);
+                               PrintWriter anOutputWriter, ServletModuleUserExc anException) {
+    getServletModule().handleUserError(aRequest, aResponse, anOutputWriter, anException);
   }
 
   private void handleError(HttpServletRequest aRequest, HttpServletResponse aResponse,PrintWriter out, Throwable anException) {
-    ((ServletModuleOpenIndy) ServletModuleOpenIndy.getInstance()).handleError(aRequest, aResponse, out, anException);
+    getServletModule().handleError(aRequest, aResponse, out, anException);
   }
 
   public String getServletInfo(){