2014-09-29 18:42 GMT+04:00 <ma...@apache.org>: > Author: markt > Date: Mon Sep 29 14:42:11 2014 > New Revision: 1628197 > > URL: http://svn.apache.org/r1628197 > Log: > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57038 > Add a WebResource.getCoseBase() method, implement for all WebResource > implementations and then use it in the web application class loader to set > the correct code base for resources loaded from JARs and WARs. > > Modified: > tomcat/trunk/java/org/apache/catalina/WebResource.java > tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java > > tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java > tomcat/trunk/java/org/apache/catalina/webresources/CachedResource.java > tomcat/trunk/java/org/apache/catalina/webresources/EmptyResource.java > tomcat/trunk/java/org/apache/catalina/webresources/FileResource.java > tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java > tomcat/trunk/java/org/apache/catalina/webresources/JarResourceRoot.java > tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java > tomcat/trunk/webapps/docs/changelog.xml
> Modified: > tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1628197&r1=1628196&r2=1628197&view=diff > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java > Mon Sep 29 14:42:11 2014 > @@ -41,7 +41,7 @@ public class JarWarResource extends Abst > String baseUrl, JarEntry jarEntry, String archivePath, > String internalPath, Manifest manifest) { > super(root, webAppPath, base, "jar:war:" + baseUrl + "^/" + > archivePath, > - jarEntry, internalPath, manifest); > + jarEntry, internalPath, manifest, "jar" + baseUrl + "!/" + > archivePath); 1. On the previous line it is "jar:war:" with a trailing ":", so I guess it had to be s/"jar"/"jar:"/ here. > this.archivePath = archivePath; > } > > > Modified: tomcat/trunk/webapps/docs/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1628197&r1=1628196&r2=1628197&view=diff > ============================================================================== > --- tomcat/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 29 14:42:11 2014 > @@ -75,6 +75,12 @@ > to allow equals characters in cookie values but is configured to > allow > name only cookies. (markt) > </fix> > + <fix> > + <bug>57038</bug>: Add a <code>WebResource.getCoseBase()</code> > method, 2. s/Cose/Code/ > + implement for all <code>WebResource</code> implementations and then > use > + it in the web application class loader to set the correct code base > for > + resources loaded from JARs and WARs. (markt) > + </fix> Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
