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

[mir.git] / source / mircoders / servlet / ServletModuleBreaking.java

diff --git a/source/mircoders/servlet/ServletModuleBreaking.java b/source/mircoders/servlet/ServletModuleBreaking.java
index c2a7d3f..745ad65 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleBreaking.java
+++ b/source/mircoders/servlet/ServletModuleBreaking.java
@@ -30,12 +30,13 @@ public class ServletModuleBreaking extends ServletModule
 
        private ServletModuleBreaking() {
 
-               theLog = Logfile.getInstance(Configuration.getProperty("Home") + Configuration.getProperty("ServletModule.Breaking.Logfile"));
-               templateListString = Configuration.getProperty("ServletModule.Breaking.ListTemplate");
-               templateObjektString = Configuration.getProperty("ServletModule.Breaking.ObjektTemplate");
-               templateConfirmString = Configuration.getProperty("ServletModule.Breaking.ConfirmTemplate");
+               theLog = Logfile.getInstance(this.getClass().getName());
+               templateListString = MirConfig.getProp("ServletModule.Breaking.ListTemplate");
+               templateObjektString = MirConfig.getProp("ServletModule.Breaking.ObjektTemplate");
+               templateConfirmString = MirConfig.getProp("ServletModule.Breaking.ConfirmTemplate");
                try {
-                       mainModule = new ModuleBreaking(DatabaseBreaking.getInstance());
+      DatabaseBreaking dbb = DatabaseBreaking.getInstance();
+                       mainModule = new ModuleBreaking(dbb);
                }
                catch (StorageObjectException e) {
                        theLog.printDebugInfo("ServletModuleBreaking konnte nicht initialisiert werden");
@@ -67,7 +68,7 @@ public class ServletModuleBreaking extends ServletModule
                                mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
 
                        // raus damit
-                       HTMLTemplateProcessor.process(getLanguage(req)+"/"+templateListString, mergeData, res.getWriter());
+                       HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateListString, mergeData, res.getWriter());
                }
                catch (ModuleException e) {throw new ServletModuleException(e.toString());}
                catch (IOException e) {throw new ServletModuleException(e.toString());}