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 37b4d8a..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.*;
@@ -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 {