From e1f215ca7e06db66dd267485f373a08182957e98 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 15 Nov 2002 22:04:11 +0000 Subject: [PATCH] changes for tomcat 4.1.x also compatible with 4.0.x, mir/servlet/Mir becomes /mir/Mir. beware. fix web.xml to work with 4.1.x. remove servlet-2.2.jar which comes w/ tomcat and should be v2.3 --- etc/web.xml | 31 +++++++++++++++++++---------- lib/servlet-2.2.jar | Bin 36778 -> 0 bytes source/config.properties-dist | 2 +- source/mir/misc/HTMLTemplateProcessor.java | 2 +- source/mir/servlet/AbstractServlet.java | 12 +++++------ source/mircoders/producer/Producer.java | 2 +- 6 files changed, 30 insertions(+), 19 deletions(-) delete mode 100755 lib/servlet-2.2.jar diff --git a/etc/web.xml b/etc/web.xml index 001d9a03..7169c059 100755 --- a/etc/web.xml +++ b/etc/web.xml @@ -1,8 +1,8 @@ + PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> @@ -134,16 +134,27 @@ + + + Resource reference to a factory for java.sql.Connection instances that + may be used for talking to a particular database that is configured in + the server.xml file. + - - - http://java.apache.org/tomcat/examples-taglib - - - /WEB-INF/jsp/example-taglib.tld - - + + jdbc/Mir + + + + javax.sql.DataSource + + + + Container + + + diff --git a/lib/servlet-2.2.jar b/lib/servlet-2.2.jar deleted file mode 100755 index 18ca666c4610269de93616b8f70e6e4cfe5566fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36778 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 GeENTH8<;}? diff --git a/source/config.properties-dist b/source/config.properties-dist index dcb56bf8..bc6ad12b 100755 --- a/source/config.properties-dist +++ b/source/config.properties-dist @@ -84,7 +84,7 @@ ServletModule.FileEdit.ExtFilter=inc # # the url of the openposting-servlet -Producer.OpenAction=http://indy.code-fu.de/Mir/servlet/OpenMir +Producer.OpenAction=http://indy.code-fu.de/Mir/OpenMir # use this property if the pages are not produced under the docRoot diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java index 63f088ee..f517a3ce 100755 --- a/source/mir/misc/HTMLTemplateProcessor.java +++ b/source/mir/misc/HTMLTemplateProcessor.java @@ -87,7 +87,7 @@ public final class HTMLTemplateProcessor { //actionRoot = docRoot + "/servlet/" + MirConfig.getProp("ServletName"); //actionRoot = docRoot + "/servlet/NadirAktuell"; - actionRoot = docRoot + "/servlet/Mir"; + actionRoot = docRoot + "/Mir"; defEncoding = MirConfig.getProp("Mir.DefaultEncoding"); openAction = MirConfig.getProp("Producer.OpenAction"); diff --git a/source/mir/servlet/AbstractServlet.java b/source/mir/servlet/AbstractServlet.java index 70ddc614..e0ee0754 100755 --- a/source/mir/servlet/AbstractServlet.java +++ b/source/mir/servlet/AbstractServlet.java @@ -63,17 +63,17 @@ public abstract class AbstractServlet extends HttpServlet { throws UnavailableException { //String RealPath = super.getServletContext().getRealPath("/"); - String Uri = req.getRequestURI(); - String Name = super.getServletName(); - String RootUri = StringUtil.replace(Uri, "/servlet/" + Name, ""); + String uri = req.getRequestURI(); + String name = super.getServletName(); + String rootUri = StringUtil.replace(uri, "/"+name, ""); // init config //MirConfig.initConfig(RealPath, RootUri, Name, getInitParameter("Config")); - MirConfig.initConfig(super.getServletContext(), RootUri, Name, + MirConfig.initConfig(super.getServletContext(), rootUri, name, getInitParameter("Config")); - theLog = Logfile.getInstance(MirConfig.getPropWithHome(Name + ".Logfile")); - theLog.printInfo(Name + " started."); + 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")); theLog.printInfo("StandardLanguage is: " + MirConfig.getProp("StandardLanguage")); diff --git a/source/mircoders/producer/Producer.java b/source/mircoders/producer/Producer.java index c2cb9771..c62d9ca9 100755 --- a/source/mircoders/producer/Producer.java +++ b/source/mircoders/producer/Producer.java @@ -51,7 +51,7 @@ abstract public class Producer { protected static String producerOpenAction = MirConfig.getProp("Producer.OpenAction");; /** @todo same as in HTMLTemplateProcessor, this should be dynamically set */ - protected static String actionRoot = MirConfig.getProp("RootUri") + "/servlet/Mir"; + protected static String actionRoot = MirConfig.getProp("RootUri") + "/Mir"; protected static Logfile theLog = Logfile.getInstance(MirConfig.getProp("Home") + "/" + MirConfig.getProp("Producer.Logfile")); protected static ModuleTopics topicsModule; -- 2.11.0