yoavs 2004/08/21 12:34:59
Modified: catalina/src/share/org/apache/catalina/startup
Bootstrap.java
webapps/docs changelog.xml
Log:
Addressed Bugzilla 30179.
Revision Changes Path
1.21 +11 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
Index: Bootstrap.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Bootstrap.java 16 Aug 2004 23:48:59 -0000 1.20
+++ Bootstrap.java 21 Aug 2004 19:34:59 -0000 1.21
@@ -118,13 +118,7 @@
StringTokenizer tokenizer = new StringTokenizer(value, ",");
while (tokenizer.hasMoreElements()) {
String repository = tokenizer.nextToken();
- // Check for a JAR URL repository
- try {
- urlList.add(new URL(repository));
- continue;
- } catch (MalformedURLException e) {
- // Ignore
- }
+
// Local repository
boolean packed = false;
if (repository.startsWith(CATALINA_HOME_TOKEN)) {
@@ -134,6 +128,15 @@
repository = getCatalinaBase()
+ repository.substring(CATALINA_BASE_TOKEN.length());
}
+
+ // Check for a JAR URL repository
+ try {
+ urlList.add(new URL(repository));
+ continue;
+ } catch (MalformedURLException e) {
+ // Ignore
+ }
+
if (repository.endsWith("*.jar")) {
packed = true;
repository = repository.substring
1.91 +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.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- changelog.xml 21 Aug 2004 12:26:56 -0000 1.90
+++ changelog.xml 21 Aug 2004 19:34:59 -0000 1.91
@@ -73,6 +73,9 @@
<fix>
<bug>30561</bug>: Broken restart of NamingService. (yoavs)
</fix>
+ <fix>
+ <bug>30179</bug>: Better Bootstrap handling of catalina.properties. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
