templateModelRoot ist now a simplehash with two entries: data and config, bugfix...

[mir.git] / source / OpenMir.java

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 7ade219..96820b2 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -9,7 +9,6 @@ import java.sql.*;
 import freemarker.template.*;
 
 import mir.misc.*;
-import mir.xml.XmlConfigurator;
 import mir.servlet.*;
 
 import mircoders.servlet.*;
@@ -27,7 +26,7 @@ import mircoders.storage.*;
 
 public class OpenMir extends AbstractServlet {
   
-  private static boolean                confed=false;
+  //private static boolean                confed=false;
   private static String lang;
   public HttpSession session;
 
@@ -36,32 +35,6 @@ 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 {
 
@@ -69,10 +42,11 @@ public class OpenMir extends AbstractServlet {
     long            sessionConnectTime=0;
 
     
-    if (!confed){
-      confed = getConfig(req);
-    }
     
+    // get the configration
+    if(getServletContext().getAttribute("mir.confed") == null) {
+      getConfig(req);
+    }
     session = req.getSession();
 
     if(session.getAttribute("Language")==null){
@@ -83,6 +57,9 @@ public class OpenMir extends AbstractServlet {
     try {
       ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res);
     }
+    catch (ServletModuleUserException e) {
+      handleUserError(res,res.getWriter(), e.getMsg());  
+    }
     catch (ServletModuleException e){
       e.printStackTrace();
       handleError(res,res.getWriter(), "OpenIndy :: ServletException in Module ServletModule -- " + e.toString());
@@ -92,6 +69,22 @@ public class OpenMir extends AbstractServlet {
     theLog.printInfo("EXECTIME (ServletModuleOpenIndy): " + sessionConnectTime + " ms");
   }
 
+  private void handleUserError(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.UserErrorTemplate"),modelRoot,out);
+      out.close();
+    }
+    catch (Exception e) {
+      System.err.println("Fehler in UserErrorTemplate");
+    }
+
+  }
+
   private void handleError(HttpServletResponse res,PrintWriter out, String errorString) {
 
     try {