projects
/
mir.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
39a36a2
)
changes for tomcat 4.1.x also compatible with 4.0.x, mir/servlet/Mir becomes /mir...
author
mh
<mh>
Fri, 15 Nov 2002 22:04:11 +0000
(22:04 +0000)
committer
mh
<mh>
Fri, 15 Nov 2002 22:04:11 +0000
(22:04 +0000)
etc/web.xml
patch
|
blob
|
history
lib/servlet-2.2.jar
[deleted file]
patch
|
blob
|
history
source/config.properties-dist
patch
|
blob
|
history
source/mir/misc/HTMLTemplateProcessor.java
patch
|
blob
|
history
source/mir/servlet/AbstractServlet.java
patch
|
blob
|
history
source/mircoders/producer/Producer.java
patch
|
blob
|
history
diff --git
a/etc/web.xml
b/etc/web.xml
index
001d9a0
..
7169c05
100755
(executable)
--- a/
etc/web.xml
+++ b/
etc/web.xml
@@
-1,8
+1,8
@@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE web-app
-
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2
//EN"
-
"http://java.sun.com/j2ee/dtds/web-app_2_2
.dtd">
+
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3
//EN"
+
"http://java.sun.com/dtd/web-app_2_3
.dtd">
<web-app>
<servlet>
<web-app>
<servlet>
@@
-134,16
+134,27
@@
</mime-type>
</mime-mapping>
</mime-type>
</mime-mapping>
+ <resource-ref>
+ <description>
+ 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.
+ </description>
- <taglib>
- <taglib-uri>
- http://java.apache.org/tomcat/examples-taglib
- </taglib-uri>
- <taglib-location>
- /WEB-INF/jsp/example-taglib.tld
- </taglib-location>
- </taglib>
+ <res-ref-name>
+ jdbc/Mir
+ </res-ref-name>
+
+ <res-type>
+ javax.sql.DataSource
+ </res-type>
+
+ <res-auth>
+ Container
+ </res-auth>
+
+ </resource-ref>
<security-constraint>
<web-resource-collection>
<security-constraint>
<web-resource-collection>
diff --git
a/lib/servlet-2.2.jar
b/lib/servlet-2.2.jar
deleted file mode 100755
(executable)
index
18ca666
..0000000
Binary files a/lib/servlet-2.2.jar and /dev/null differ
diff --git
a/source/config.properties-dist
b/source/config.properties-dist
index
dcb56bf
..
bc6ad12
100755
(executable)
--- a/
source/config.properties-dist
+++ b/
source/config.properties-dist
@@
-84,7
+84,7
@@
ServletModule.FileEdit.ExtFilter=inc
#
# the url of the openposting-servlet
#
# 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
# 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
63f088e
..
f517a3c
100755
(executable)
--- 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/" + MirConfig.getProp("ServletName");
//actionRoot = docRoot + "/servlet/NadirAktuell";
- actionRoot = docRoot + "/
servlet/
Mir";
+ actionRoot = docRoot + "/Mir";
defEncoding = MirConfig.getProp("Mir.DefaultEncoding");
openAction = MirConfig.getProp("Producer.OpenAction");
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
70ddc61
..
e0ee075
100755
(executable)
--- 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("/");
throws UnavailableException {
//String RealPath = super.getServletContext().getRealPath("/");
- String
U
ri = req.getRequestURI();
- String
N
ame = super.getServletName();
- String
RootUri = StringUtil.replace(Uri, "/servlet/" + N
ame, "");
+ String
u
ri = req.getRequestURI();
+ String
n
ame = super.getServletName();
+ String
rootUri = StringUtil.replace(uri, "/"+n
ame, "");
// init config
//MirConfig.initConfig(RealPath, RootUri, Name, getInitParameter("Config"));
// init config
//MirConfig.initConfig(RealPath, RootUri, Name, getInitParameter("Config"));
- MirConfig.initConfig(super.getServletContext(),
RootUri, N
ame,
+ MirConfig.initConfig(super.getServletContext(),
rootUri, n
ame,
getInitParameter("Config"));
getInitParameter("Config"));
- theLog = Logfile.getInstance(MirConfig.getPropWithHome(
N
ame + ".Logfile"));
- theLog.printInfo(
N
ame + " started.");
+ theLog = Logfile.getInstance(MirConfig.getPropWithHome(
n
ame + ".Logfile"));
+ theLog.printInfo(
n
ame + " started.");
theLog.printInfo("Path is: " + MirConfig.getProp("Home"));
theLog.printInfo("Root URI is: " + MirConfig.getProp("RootUri"));
theLog.printInfo("StandardLanguage is: " + MirConfig.getProp("StandardLanguage"));
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
c2cb977
..
c62d9ca
100755
(executable)
--- 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 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;
protected static Logfile theLog = Logfile.getInstance(MirConfig.getProp("Home") + "/" + MirConfig.getProp("Producer.Logfile"));
protected static ModuleTopics topicsModule;