geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r224624 - /geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
Date Sun, 24 Jul 2005 15:06:58 GMT
Author: jgenender
Date: Sun Jul 24 08:06:56 2005
New Revision: 224624

URL: http://svn.apache.org/viewcvs?rev=224624&view=rev
Log:
Fixed webservice class loader problem

Modified:
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=224624&r1=224623&r2=224624&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
(original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
Sun Jul 24 08:06:56 2005
@@ -182,15 +182,20 @@
         this.webServices = webServices;
 
         URI root = URI.create(configurationBaseUrl.toString());
-//        webAppRoot = root.resolve(webAppRoot);
+        if (configurationBaseUrl.getProtocol().equalsIgnoreCase("file")) {
+            root = new URI("file", configurationBaseUrl.getPath(), null);
+        } else {
+            root = URI.create(configurationBaseUrl.toString());
+        }
         URL webAppRootURL = webAppRoot.toURL();
 
         URL[] urls = new URL[webClassPath.length];
         for (int i = 0; i < webClassPath.length; i++) {
             URI classPathEntry = webClassPath[i];
-            classPathEntry = webAppRoot.resolve(classPathEntry);
+            classPathEntry = root.resolve(classPathEntry);
             urls[i] = classPathEntry.toURL();
         }
+        
         this.webClassLoader = new TomcatClassLoader(urls, webAppRootURL, classLoader, contextPriorityClassLoader);
 
         this.kernel = kernel;



Mime
View raw message