Author: markt
Date: Sat Nov 26 09:48:18 2016
New Revision: 1771453
URL: http://svn.apache.org/viewvc?rev=1771453&view=rev
Log:
Correctly generate URLs for resources located inside JARs that are themselves
located inside a packed WAR file.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarResource.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1771453&r1=1771452&r2=1771453&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
Sat Nov 26 09:48:18 2016
@@ -136,7 +136,7 @@ public abstract class AbstractArchiveRes
@Override
public URL getURL() {
- String url = baseUrl + "!/" + resource.getName();
+ String url = baseUrl + resource.getName();
try {
return new URL(url);
} catch (MalformedURLException e) {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1771453&r1=1771452&r2=1771453&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
Sat Nov 26 09:48:18 2016
@@ -32,7 +32,7 @@ public class JarResource extends Abstrac
public JarResource(AbstractArchiveResourceSet archiveResourceSet, String
webAppPath,
String baseUrl, JarEntry jarEntry) {
- super(archiveResourceSet, webAppPath, "jar:" + baseUrl, jarEntry,
baseUrl);
+ super(archiveResourceSet, webAppPath, "jar:" + baseUrl + "!/",
jarEntry, baseUrl);
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarResource.java?rev=1771453&r1=1771452&r2=1771453&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarResource.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarResource.java
Sat Nov 26 09:48:18 2016
@@ -16,8 +16,6 @@
*/
package org.apache.catalina.webresources;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.jar.JarEntry;
import org.apache.juli.logging.Log;
@@ -34,21 +32,7 @@ public class WarResource extends Abstrac
public WarResource(AbstractArchiveResourceSet archiveResourceSet, String
webAppPath,
String baseUrl, JarEntry jarEntry) {
- super(archiveResourceSet, webAppPath, "war:" + baseUrl, jarEntry,
baseUrl);
- }
-
-
- @Override
- public URL getURL() {
- String url = getBaseUrl() + "*/" + getResource().getName();
- try {
- return new URL(url);
- } catch (MalformedURLException e) {
- if (getLog().isDebugEnabled()) {
- getLog().debug(sm.getString("fileResource.getUrlFail", url),
e);
- }
- return null;
- }
+ super(archiveResourceSet, webAppPath, "war:" + baseUrl + "*/",
jarEntry, baseUrl);
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1771453&r1=1771452&r2=1771453&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sat Nov 26 09:48:18 2016
@@ -82,6 +82,10 @@
in the <code>Authenticator</code>. Patch provided by Michael Osipov.
(markt)
</fix>
+ <fix>
+ Correctly generate URLs for resources located inside JARs that are
+ themselves located inside a packed WAR file. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
