Ok, big merge. here's the new xml-config stuff in action. There's a few

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 3613683..7ade219 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -8,13 +8,14 @@ import java.sql.*;
 
 import freemarker.template.*;
 
-import webdb.misc.*;
-import webdb.servlet.*;
-
+import mir.misc.*;
+import mir.xml.XmlConfigurator;
 import mir.servlet.*;
-import mir.module.*;
-import mir.entity.*;
-import mir.storage.*;
+
+import mircoders.servlet.*;
+import mircoders.module.*;
+import mircoders.entity.*;
+import mircoders.storage.*;
 
 /**
  *  OpenMir.java - main servlet for open posting and comment feature to articles
@@ -24,59 +25,90 @@ import mir.storage.*;
  */
 
 
-public class OpenMir extends AbstractServlet
-{
-       private static Logfile                theLog;
-       private static boolean                confed=false;
-       private static String   lang;
-
-       public void doGet(HttpServletRequest req, HttpServletResponse res)
-               throws ServletException, IOException {
-               doPost(req,res);
-       }
-
-       public void doPost(HttpServletRequest req, HttpServletResponse res)
-               throws ServletException, IOException {
-
-               long            startTime = (new java.util.Date()).getTime();
-               long            sessionConnectTime=0;
-
+public class OpenMir extends AbstractServlet {
+  
+  private static boolean                confed=false;
+  private static String lang;
+  public HttpSession session;
+
+  public void doGet(HttpServletRequest req, HttpServletResponse res)
+    throws ServletException, IOException {
+    doPost(req,res);
+  }
+
+  public void init() throws ServletException {
+    try {
+      XmlConfigurator xmlXonfigurator = XmlConfigurator.getInstance();
+      xmlXonfigurator.addRequiredTag("/mir/class:mir.storage.DatabaseConfig/property:username");
+      xmlXonfigurator.addRequiredTag("/mir/class:mir.storage.DatabaseConfig/property:password");
+      xmlXonfigurator.addComesFirstTag("/mir/class:mir.storage.DatabaseConfig/property:password");
+      xmlXonfigurator.addComesFirstTag("/mir/class:mir.storage.DatabaseConfig/property:username");
+      xmlXonfigurator.addComesFirstTag("/mir/class:mir.storage.DatabaseConfig/property:host");
+      xmlXonfigurator.addComesFirstTag("/mir/class:mir.storage.DatabaseConfig/property:adaptor");
+      xmlXonfigurator.addComesFirstTag("/mir/class:mir.storage.DatabaseConfig/property:limit");
+      xmlXonfigurator.addComesFirstTag("/mir/class:mir.storage.DatabaseConfig/property:poolMax");
+      xmlXonfigurator.addComesFirstTag("/mir/class:mir.storage.DatabaseConfig/property:poolMin");
+      xmlXonfigurator.addComesFirstTag("/mir/class:mir.storage.DatabaseConfig/property:poolResetTime");
+      xmlXonfigurator.addComesFirstTag("/mir/class:mir.storage.DatabaseConfig/property:poolLog");
+      xmlXonfigurator.configure(new File(getInitParameter("xml-config")));
+      System.err.println("INIT");
+      /*try {
+        MirXmlParser xmlParser = new MirXmlParser();
+        xmlParser.parse("/home/heckmann/server.xml");*/
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new UnavailableException ("Error loading Config file: "+e.toString(), 0);
+    } 
+    System.err.println("DONE INIT");
+  }
+
+  public void doPost(HttpServletRequest req, HttpServletResponse res)
+    throws ServletException, IOException {
+
+    long            startTime = (new java.util.Date()).getTime();
+    long            sessionConnectTime=0;
+
+    
     if (!confed){
       confed = getConfig(req);
     }
+    
+    session = req.getSession();
 
-               HttpSession session = req.getSession(true);
     if(session.getAttribute("Language")==null){
-      setLanguage(req,getAcceptLanguage(req));
+      setLanguage(session,getAcceptLanguage(req));
     }
 
-               res.setContentType("text/html");
-               try {
-                       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
-               }
-               catch (ServletModuleException e){ handleError(res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.toString()); }
-               // timing...
-               sessionConnectTime = new java.util.Date().getTime() - startTime;
-               theLog.printInfo("EXECTIME (ServletModuleOpenIndy): " + sessionConnectTime + " ms");
-       }
-
-       private void handleError(PrintWriter out, String errorString) {
-
-               try {
-                       theLog.printError(errorString);
-                       SimpleHash modelRoot = new SimpleHash();
-                       modelRoot.put("errorstring", new SimpleScalar(errorString));
-                       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
-                       HTMLTemplateProcessor.process(Configuration.getProperty("Mir.ErrorTemplate"),modelRoot,out);
-                       out.close();
-               }
-               catch (Exception e) {
-                       System.err.println("Fehler in ErrorTemplate");
-               }
-
-       }
-
-       public String getServletInfo(){ return "OpenIndy 1.0 rev01"; }
+    res.setContentType("text/html");
+    try {
+      ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
+    }
+    catch (ServletModuleException e){
+      e.printStackTrace();
+      handleError(res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.toString());
+    }
+    // timing...
+    sessionConnectTime = new java.util.Date().getTime() - startTime;
+    theLog.printInfo("EXECTIME (ServletModuleOpenIndy): " + sessionConnectTime + " ms");
+  }
+
+  private void handleError(HttpServletResponse res,PrintWriter out, String errorString) {
+
+    try {
+      theLog.printError(errorString);
+      SimpleHash modelRoot = new SimpleHash();
+      modelRoot.put("errorstring", new SimpleScalar(errorString));
+      modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
+      HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.ErrorTemplate"),modelRoot,out);
+      out.close();
+    }
+    catch (Exception e) {
+      System.err.println("Fehler in ErrorTemplate");
+    }
+
+  }
+
+  public String getServletInfo(){ return "OpenIndy 1.0 rev01"; }
 
 }