X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2FOpenMir.java;h=7ade219aba553ef44f5ffac55f64423d7567e380;hb=baf56cc3d324ffa8715509e559bbe049739f32f3;hp=4b1d17853c7edfaa43095cdc024c844b8eb4f376;hpb=10f8008d76b07f1e6d2ed16c391d3411f0abf184;p=mir.git

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 4b1d1785..7ade219a 100755
--- 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.*;
@@ -35,6 +36,32 @@ 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 {
 
@@ -72,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) {