From: rk Date: Mon, 24 Sep 2001 23:30:37 +0000 (+0000) Subject: configuration Mir independant X-Git-Tag: prexmlproducerconfig~436 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=31b2b299af14d02e348ba161ca7f1f831fc22806;p=mir.git configuration Mir independant --- diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java index 5607c4e3..139c6946 100755 --- a/source/mir/misc/HTMLTemplateProcessor.java +++ b/source/mir/misc/HTMLTemplateProcessor.java @@ -45,10 +45,7 @@ public final class HTMLTemplateProcessor { templateCache.startAutoUpdate(); theLog = Logfile.getInstance(MirConfig.getPropWithHome("HTMLTemplateProcessor.Logfile")); docRoot = MirConfig.getProp("RootUri"); - /** @todo - quickhack: action-root is only for Mir!!!!, idfx */ actionRoot = docRoot + "/servlet/" + MirConfig.getProp("ServletName"); - //actionRoot = docRoot + "/servlet/Mir"; openAction = MirConfig.getProp("Producer.OpenAction"); productionHost = MirConfig.getProp("Producer.ProductionHost"); diff --git a/source/mir/servlet/AbstractServlet.java b/source/mir/servlet/AbstractServlet.java index d47b9c39..ac633045 100755 --- a/source/mir/servlet/AbstractServlet.java +++ b/source/mir/servlet/AbstractServlet.java @@ -35,9 +35,10 @@ public abstract class AbstractServlet extends HttpServlet { String Name = super.getServletName(); String RootUri = StringUtil.replace(Uri, "/servlet/" + Name, ""); - + // init config MirConfig.initConfig(RealPath, RootUri, Name, getInitParameter("Config")); - theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Mir.Logfile")); + + theLog = Logfile.getInstance(MirConfig.getPropWithHome(Name+".Logfile")); theLog.printInfo(Name + " started."); theLog.printInfo("Path is: " + MirConfig.getProp("Home")); theLog.printInfo("Root URI is: " + MirConfig.getProp("RootUri"));