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 fe9e1c9..7ade219 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -9,6 +9,7 @@ import java.sql.*;
 import freemarker.template.*;
 
 import mir.misc.*;
+import mir.xml.XmlConfigurator;
 import mir.servlet.*;
 
 import mircoders.servlet.*;
@@ -24,9 +25,8 @@ import mircoders.storage.*;
  */
 
 
-public class OpenMir extends AbstractServlet
-{
-  private static Logfile                theLog;
+public class OpenMir extends AbstractServlet {
+  
   private static boolean                confed=false;
   private static String lang;
   public HttpSession session;
@@ -36,18 +36,45 @@ public class OpenMir extends AbstractServlet
     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;
 
-    session = req.getSession(true);
     
     if (!confed){
       confed = getConfig(req);
     }
-      
+    
+    session = req.getSession();
+
     if(session.getAttribute("Language")==null){
       setLanguage(session,getAcceptLanguage(req));
     }
@@ -56,7 +83,10 @@ public class OpenMir extends AbstractServlet
     try {
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
     }
-    catch (ServletModuleException e){ handleError(res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.toString()); }
+    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");
@@ -69,7 +99,7 @@ public class OpenMir extends AbstractServlet
       SimpleHash modelRoot = new SimpleHash();
       modelRoot.put("errorstring", new SimpleScalar(errorString));
       modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));
-      HTMLTemplateProcessor.process(res,Configuration.getProperty("Mir.ErrorTemplate"),modelRoot,out);
+      HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.ErrorTemplate"),modelRoot,out);
       out.close();
     }
     catch (Exception e) {