yoavs 2005/07/21 12:57:17
Modified: catalina/src/conf catalina.properties
catalina/src/share/org/apache/catalina/startup
catalina.properties
webapps/docs changelog.xml
Log:
Bugzilla 34746.
Revision Changes Path
1.13 +2 -0
jakarta-tomcat-catalina/catalina/src/conf/catalina.properties
Index: catalina.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/conf/catalina.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- catalina.properties 20 Oct 2004 12:28:58 -0000 1.12
+++ catalina.properties 21 Jul 2005 19:57:17 -0000 1.13
@@ -54,6 +54,8 @@
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
+# Please note that foe individual jar files, e.g. bar.jar, you need the URL
form
+# starting with file:.
shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
#
1.8 +2 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties
Index: catalina.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- catalina.properties 20 Oct 2004 12:28:57 -0000 1.7
+++ catalina.properties 21 Jul 2005 19:57:17 -0000 1.8
@@ -54,6 +54,8 @@
# "foo/*.jar": Add all the JARs of the specified folder as class
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
#
1.325 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- changelog.xml 21 Jul 2005 04:12:33 -0000 1.324
+++ changelog.xml 21 Jul 2005 19:57:17 -0000 1.325
@@ -78,6 +78,9 @@
Update JULI to provide support for taking over java.util.logging
bootstrap configuration,
and move the default properties file to
${catalina.base}/conf/logging.properties (remm)
</update>
+ <fix>
+ <bug>34746</bug>: Updated catalina.properties instructions per Bill
Edwards' suggestion. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
