ozeigermann 2004/03/31 06:55:42
Modified: src/conf/catalina Tag: SLIDE_2_0_RELEASE_BRANCH
tomcat-5-server.patch tomcat-4-server.patch
Log:
Adapted patches to 4.1.30 and 5.1.19
Revision Changes Path
No revision
No revision
1.1.2.2 +14 -14 jakarta-slide/src/conf/catalina/tomcat-5-server.patch
Index: tomcat-5-server.patch
===================================================================
RCS file: /home/cvs/jakarta-slide/src/conf/catalina/tomcat-5-server.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- tomcat-5-server.patch 11 Feb 2004 08:16:41 -0000 1.1.2.1
+++ tomcat-5-server.patch 31 Mar 2004 14:55:41 -0000 1.1.2.2
@@ -1,24 +1,24 @@
--- Tomcat 5.0/conf/server.xml 2004-01-14 15:16:31.000000000 +0100
+++ server.xml 2004-01-14 15:14:21.000000000 +0100
-@@ -159,6 +159,8 @@
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- debug="0" resourceName="UserDatabase"/>
-
+@@ -173,6 +173,8 @@
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ debug="0" resourceName="UserDatabase"/>
+
+ <Realm className="wrappers.catalina.SlideRealm" name="Slide DAV Server"
namespace="slide" />
+
- <!-- Comment out the old realm but leave here for now in case we
- need to go back quickly -->
- <!--
-@@ -352,6 +354,12 @@
- <Context path="" docBase="ROOT" debug="0">
- -->
-
+ <!-- Comment out the old realm but leave here for now in case we
+ need to go back quickly -->
+ <!--
+@@ -353,6 +355,12 @@
+ directory="logs" prefix="localhost_log." suffix=".txt"
+ timestamp="true"/>
+
+ <Context path="/slide"
+ docBase="../slide"
+ debug="9"
+ privileged="true"
+ useNaming="true"/>
+
- </Host>
-
- </Engine>
+ </Host>
+
+ </Engine>
1.1.2.2 +22 -22 jakarta-slide/src/conf/catalina/tomcat-4-server.patch
Index: tomcat-4-server.patch
===================================================================
RCS file: /home/cvs/jakarta-slide/src/conf/catalina/tomcat-4-server.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- tomcat-4-server.patch 11 Feb 2004 08:16:41 -0000 1.1.2.1
+++ tomcat-4-server.patch 31 Mar 2004 14:55:41 -0000 1.1.2.2
@@ -1,24 +1,24 @@
--- Tomcat 4.1.29/conf/server.xml 2004-01-14 14:48:35.000000000 +0100
+++ server.xml 2004-01-14 14:46:57.000000000 +0100
-@@ -184,6 +184,8 @@
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- debug="0" resourceName="UserDatabase"/>
-
-+ <Realm className="wrappers.catalina.SlideRealm" name="Slide DAV Server"
namespace="slide" />
-+
- <!-- Comment out the old realm but leave here for now in case we
- need to go back quickly -->
- <!--
-@@ -266,6 +268,12 @@
- <Context path="" docBase="ROOT" debug="0"/>
- -->
-
-+ <Context path="/slide"
-+ docBase="../slide"
-+ debug="9"
-+ privileged="true"
-+ useNaming="true"/>
-+
- <!-- Tomcat Examples Context -->
- <Context path="/examples" docBase="examples" debug="0"
- reloadable="true" crossContext="true">
+@@ -195,6 +195,8 @@
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ debug="0" resourceName="UserDatabase"/>
+
++ <Realm className="wrappers.catalina.SlideRealm" name="Slide DAV Server"
namespace="slide" />
++
+ <!-- Comment out the old realm but leave here for now in case we
+ need to go back quickly -->
+ <!--
+@@ -277,6 +279,12 @@
+ <Context path="" docBase="ROOT" debug="0"/>
+ -->
+
++ <Context path="/slide"
++ docBase="../slide"
++ debug="9"
++ privileged="true"
++ useNaming="true"/>
++
+ <!-- Tomcat Examples Context -->
+ <Context path="/examples" docBase="examples" debug="0"
+ reloadable="true" crossContext="true">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
