various fixes/cleanup: old producers are now completely gone, old logfile class too

[mir.git] / source / Mir.java

diff --git a/source/Mir.java b/source/Mir.java
index 2c80e1e..be2b77e 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -1,36 +1,3 @@
-import freemarker.template.SimpleHash;\r
-import freemarker.template.SimpleList;\r
-import freemarker.template.SimpleScalar;\r
-import freemarker.template.TemplateModel;\r
-\r
-import mir.config.MirPropertiesConfiguration;\r
-\r
-import mir.generator.FreemarkerGenerator;\r
-\r
-import mir.misc.HTMLTemplateProcessor;\r
-import mir.misc.StringUtil;\r
-\r
-import mir.servlet.AbstractServlet;\r
-import mir.servlet.ServletModule;\r
-import mir.servlet.ServletModuleDispatch;\r
-import mir.servlet.ServletModuleException;\r
-import mir.servlet.ServletModuleUserException;\r
-\r
-import mir.util.StringRoutines;\r
-\r
-import mircoders.entity.EntityUsers;\r
-\r
-import mircoders.global.MirGlobal;\r
-\r
-import mircoders.module.ModuleMessage;\r
-import mircoders.module.ModuleUsers;\r
-\r
-import mircoders.storage.DatabaseArticleType;\r
-import mircoders.storage.DatabaseMessages;\r
-import mircoders.storage.DatabaseUsers;\r
-\r
-import org.apache.struts.util.MessageResources;\r
-\r
 /*\r
  * Copyright (C) 2001, 2002 The Mir-coders group\r
  *\r
@@ -61,6 +28,7 @@ import org.apache.struts.util.MessageResources;
  * to your version of the file, but you are not obligated to do so.  If you do\r
  * not wish to do so, delete this exception statement from your version.\r
  */\r
+\r
 import java.io.IOException;\r
 import java.io.PrintWriter;\r
 \r
@@ -80,12 +48,40 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;\r
 import javax.servlet.http.HttpSession;\r
 \r
+import org.apache.struts.util.MessageResources;\r
+\r
+\r
+import freemarker.template.SimpleHash;\r
+import freemarker.template.SimpleList;\r
+import freemarker.template.SimpleScalar;\r
+import freemarker.template.TemplateModel;\r
+\r
+import mir.config.MirPropertiesConfiguration;\r
+import mir.generator.FreemarkerGenerator;\r
+import mir.misc.HTMLTemplateProcessor;\r
+import mir.misc.StringUtil;\r
+import mir.servlet.AbstractServlet;\r
+import mir.servlet.ServletModule;\r
+import mir.servlet.ServletModuleDispatch;\r
+import mir.servlet.ServletModuleException;\r
+import mir.servlet.ServletModuleUserException;\r
+import mir.util.StringRoutines;\r
+\r
+import mircoders.entity.EntityUsers;\r
+import mircoders.global.MirGlobal;\r
+import mircoders.module.ModuleMessage;\r
+import mircoders.module.ModuleUsers;\r
+import mircoders.storage.DatabaseArticleType;\r
+import mircoders.storage.DatabaseMessages;\r
+import mircoders.storage.DatabaseUsers;\r
+\r
+\r
 \r
 /**\r
  * Mir.java - main servlet, that dispatches to servletmodules\r
  *\r
- * @author $Author: idfx $\r
- * @version $Id: Mir.java,v 1.28 2003/01/28 23:37:08 idfx Exp $\r
+ * @author $Author: zapata $\r
+ * @version $Id: Mir.java,v 1.29 2003/02/23 05:00:10 zapata Exp $\r
  *\r
  */\r
 public class Mir extends AbstractServlet {\r
@@ -93,7 +89,7 @@ public class Mir extends AbstractServlet {
   private static ModuleMessage messageModule = null;\r
   private final static HashMap servletModuleInstanceHash = new HashMap();\r
 \r
-  //I don't know about making this static cause it removes the \r
+  //I don't know about making this static cause it removes the\r
   //possibility to change the config on the fly.. -mh\r
   private static List loginLanguages = null;\r
   public HttpSession session;\r
@@ -146,7 +142,7 @@ public class Mir extends AbstractServlet {
     }\r
   }\r
 \r
-  // FIXME: this should probalby go into AbstractServlet so it can be used in \r
+  // FIXME: this should probalby go into AbstractServlet so it can be used in\r
   // OpenMir as well -mh\r
   protected String getDefaultLanguage(HttpServletRequest req) {\r
     String defaultlanguage =\r
@@ -188,7 +184,7 @@ public class Mir extends AbstractServlet {
     //make sure client browsers don't cache anything\r
     setNoCaching(res);\r
 \r
-    //FIXME: this seems kind of hackish and only here because we can have \r
+    //FIXME: this seems kind of hackish and only here because we can have\r
     // default other than the one that the browser is set to.\r
     Locale locale = new Locale(getDefaultLanguage(req), "");\r
     MessageResources messageResources =\r
@@ -377,9 +373,10 @@ public class Mir extends AbstractServlet {
         MirPropertiesConfiguration.instance().getString("Mir.ErrorTemplate"),\r
         modelRoot, out, getLocale(req));\r
       out.close();\r
-    } catch (Exception e) {\r
-      e.printStackTrace(System.out);\r
-      System.err.println("Error in ErrorTemplate: " + e.getMessage());\r
+    }\r
+    catch (Exception e) {\r
+      logger.error("Error in ErrorTemplate: " + e.getMessage());\r
+      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
     }\r
   }\r
 \r
@@ -397,8 +394,9 @@ public class Mir extends AbstractServlet {
         MirPropertiesConfiguration.instance().getString("Mir.UserErrorTemplate"),\r
         modelRoot, out, getLocale(req));\r
       out.close();\r
-    } catch (Exception e) {\r
-      System.err.println("Error in UserErrorTemplate");\r
+    }\r
+    catch (Exception e) {\r
+      logger.error("Error in UserErrorTemplate");\r
     }\r
   }\r
 \r
@@ -465,10 +463,10 @@ public class Mir extends AbstractServlet {
 \r
       HTMLTemplateProcessor.process(res, startTemplate, mergeData, out,\r
         getLocale(req));\r
-    } catch (Exception e) {\r
-      e.printStackTrace(System.out);\r
-      handleError(req, res, out,\r
-        "error while trying to send startpage. " + e.getMessage());\r
+    }\r
+    catch (Exception e) {\r
+      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+      handleError(req, res, out, "error while trying to send startpage. " + e.getMessage());\r
     }\r
   }\r
 \r