yoavs 2004/08/21 12:31:56
Modified: catalina/src/share/org/apache/catalina/startup Tag:
TOMCAT_5_0 Bootstrap.java
webapps/docs Tag: TOMCAT_5_0 changelog.xml
Log:
Addressed Bugzilla 30179, updated release plan.
Revision Changes Path
No revision
No revision
1.18.2.1 +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.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- Bootstrap.java 12 Mar 2004 14:32:47 -0000 1.18
+++ Bootstrap.java 21 Aug 2004 19:31:56 -0000 1.18.2.1
@@ -125,13 +125,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)) {
@@ -141,6 +135,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
No revision
No revision
1.70.2.8 +6 -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.70.2.7
retrieving revision 1.70.2.8
diff -u -r1.70.2.7 -r1.70.2.8
--- changelog.xml 21 Aug 2004 19:14:29 -0000 1.70.2.7
+++ changelog.xml 21 Aug 2004 19:31:56 -0000 1.70.2.8
@@ -41,6 +41,9 @@
<update>
Removed classic compiler directives from Ant build, as we use modern
anyways. (yoavs)
</update>
+ <update>
+ Modified RELEASE-PLAN-5.0.html to indicate status given start of work on
Tomcat 5.next. (yoavs)
+ </update>
</changelog>
</subsection>
@@ -82,6 +85,9 @@
<fix>
<bug>29668</bug>: NPE in HostConfig, directory created for deployed WAR
instead of xml file. (yoavs)
</fix>
+ <fix>
+ <bug>30179</bug>: Improved Bootstrap catalina.properties handling. (yoavs)
+ </fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
