Author: markt
Date: Tue Jan 27 19:37:37 2015
New Revision: 1655127
URL: http://svn.apache.org/r1655127
Log:
Access base directly
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java?rev=1655127&r1=1655126&r2=1655127&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
Tue Jan 27 19:37:37 2015
@@ -28,7 +28,6 @@ import java.util.jar.Manifest;
public abstract class AbstractArchiveResource extends AbstractResource {
private final AbstractArchiveResourceSet archiveResourceSet;
- private final String base;
private final String baseUrl;
private final JarEntry resource;
private final String codeBaseUrl;
@@ -37,11 +36,9 @@ public abstract class AbstractArchiveRes
private Certificate[] certificates;
protected AbstractArchiveResource(AbstractArchiveResourceSet
archiveResourceSet,
- String webAppPath, String base, String baseUrl, JarEntry jarEntry,
- String codeBaseUrl) {
+ String webAppPath, String baseUrl, JarEntry jarEntry, String
codeBaseUrl) {
super(archiveResourceSet.getRoot(), webAppPath);
this.archiveResourceSet = archiveResourceSet;
- this.base = base;
this.baseUrl = baseUrl;
this.resource = jarEntry;
this.codeBaseUrl = codeBaseUrl;
@@ -65,7 +62,7 @@ public abstract class AbstractArchiveRes
}
protected final String getBase() {
- return base;
+ return archiveResourceSet.getBase();
}
protected final String getBaseUrl() {
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1655127&r1=1655126&r2=1655127&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResource.java Tue Jan
27 19:37:37 2015
@@ -33,9 +33,8 @@ public class JarResource extends Abstrac
private static final Log log = LogFactory.getLog(JarResource.class);
public JarResource(AbstractArchiveResourceSet archiveResourceSet, String
webAppPath,
- String base, String baseUrl, JarEntry jarEntry) {
- super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl, jarEntry,
- baseUrl);
+ String baseUrl, JarEntry jarEntry) {
+ super(archiveResourceSet, webAppPath, "jar:" + baseUrl, jarEntry,
baseUrl);
}
@Override
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1655127&r1=1655126&r2=1655127&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java Tue
Jan 27 19:37:37 2015
@@ -78,7 +78,7 @@ public class JarResourceSet extends Abst
@Override
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath, Manifest manifest) {
- return new JarResource(this, webAppPath, getBase(),
getBaseUrlString(), jarEntry);
+ return new JarResource(this, webAppPath, getBaseUrlString(), jarEntry);
}
//-------------------------------------------------------- Lifecycle
methods
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=1655127&r1=1655126&r2=1655127&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResource.java Tue
Jan 27 19:37:37 2015
@@ -36,8 +36,8 @@ public class JarWarResource extends Abst
private final String archivePath;
public JarWarResource(AbstractArchiveResourceSet archiveResourceSet,
String webAppPath,
- String base, String baseUrl, JarEntry jarEntry, String
archivePath) {
- super(archiveResourceSet, webAppPath, base, "jar:war:" + baseUrl +
"^/" + archivePath,
+ String baseUrl, JarEntry jarEntry, String archivePath) {
+ super(archiveResourceSet, webAppPath, "jar:war:" + baseUrl + "^/" +
archivePath,
jarEntry, "jar:" + baseUrl + "!/" + archivePath);
this.archivePath = archivePath;
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java?rev=1655127&r1=1655126&r2=1655127&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Tue Jan 27 19:37:37 2015
@@ -81,8 +81,7 @@ public class JarWarResourceSet extends A
@Override
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath, Manifest manifest) {
- return new JarWarResource(this, webAppPath, getBase(),
getBaseUrlString(),
- jarEntry, archivePath);
+ return new JarWarResource(this, webAppPath, getBaseUrlString(),
jarEntry, archivePath);
}
//-------------------------------------------------------- Lifecycle
methods
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
