remm 2003/09/23 06:43:18
Modified: catalina/src/share/org/apache/catalina/startup
Bootstrap.java ClassLoaderFactory.java
Log:
- Add the possibility to specify straight URLs in the repository list (= single JARs,
remote repositories, etc).
Revision Changes Path
1.12 +6 -4
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Bootstrap.java 2 Sep 2003 21:22:00 -0000 1.11
+++ Bootstrap.java 23 Sep 2003 13:43:18 -0000 1.12
@@ -63,6 +63,7 @@
import java.io.File;
import java.lang.reflect.Method;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.StringTokenizer;
@@ -92,7 +93,6 @@
protected static final String CATALINA_HOME_TOKEN = "${catalina.home}";
protected static final String CATALINA_BASE_TOKEN = "${catalina.base}";
- protected static final String HTTP_TOKEN = "http://";;
// ------------------------------------------------------- Static Variables
@@ -154,10 +154,12 @@
StringTokenizer tokenizer = new StringTokenizer(value, ",");
while (tokenizer.hasMoreElements()) {
String repository = tokenizer.nextToken();
- // Check for a remote repository
- if (repository.startsWith(HTTP_TOKEN)) {
+ // Check for a JAR URL repository
+ try {
urlList.add(new URL(repository));
continue;
+ } catch (MalformedURLException e) {
+ // Ignore
}
// Local repository
boolean packed = false;
1.5 +5 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java
Index: ClassLoaderFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClassLoaderFactory.java 2 Sep 2003 21:22:00 -0000 1.4
+++ ClassLoaderFactory.java 23 Sep 2003 13:43:18 -0000 1.5
@@ -222,7 +222,7 @@
}
}
- // Add remote URLs
+ // Add URLs
if (urls != null) {
for (int i = 0; i < urls.length; i++) {
list.add(urls[i].toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
