Author: markt Date: Tue Jan 27 19:35:52 2015 New Revision: 1655123 URL: http://svn.apache.org/r1655123 Log: Expose the AbstractArchiveResourceSet to archive resources.
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=1655123&r1=1655122&r2=1655123&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:35:52 2015 @@ -25,8 +25,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.Manifest; -import org.apache.catalina.WebResourceRoot; - public abstract class AbstractArchiveResource extends AbstractResource { private final String base; @@ -38,10 +36,10 @@ public abstract class AbstractArchiveRes private boolean readCerts = false; private Certificate[] certificates; - protected AbstractArchiveResource(WebResourceRoot root, String webAppPath, - String base, String baseUrl, JarEntry jarEntry, + protected AbstractArchiveResource(AbstractArchiveResourceSet archiveResourceSet, + String webAppPath, String base, String baseUrl, JarEntry jarEntry, String internalPath, Manifest manifest, String codeBaseUrl) { - super(root, webAppPath); + super(archiveResourceSet.getRoot(), webAppPath); this.base = base; this.baseUrl = baseUrl; this.resource = jarEntry; 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=1655123&r1=1655122&r2=1655123&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:35:52 2015 @@ -22,7 +22,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.Manifest; -import org.apache.catalina.WebResourceRoot; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -34,10 +33,10 @@ public class JarResource extends Abstrac private static final Log log = LogFactory.getLog(JarResource.class); - public JarResource(WebResourceRoot root, String webAppPath, String base, - String baseUrl, JarEntry jarEntry, String internalPath, + public JarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath, + String base, String baseUrl, JarEntry jarEntry, String internalPath, Manifest manifest) { - super(root, webAppPath, base, "jar:" + baseUrl, jarEntry, internalPath, + super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl, jarEntry, internalPath, manifest, baseUrl); } 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=1655123&r1=1655122&r2=1655123&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:35:52 2015 @@ -78,7 +78,7 @@ public class JarResourceSet extends Abst @Override protected WebResource createArchiveResource(JarEntry jarEntry, String webAppPath, Manifest manifest) { - return new JarResource(getRoot(), webAppPath, getBase(), getBaseUrlString(), + return new JarResource(this, webAppPath, getBase(), getBaseUrlString(), jarEntry, getInternalPath(), manifest); } 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=1655123&r1=1655122&r2=1655123&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:35:52 2015 @@ -23,7 +23,6 @@ import java.util.jar.JarFile; import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import org.apache.catalina.WebResourceRoot; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -37,10 +36,10 @@ public class JarWarResource extends Abst private final String archivePath; - public JarWarResource(WebResourceRoot root, String webAppPath, String base, - String baseUrl, JarEntry jarEntry, String archivePath, + public JarWarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath, + String base, String baseUrl, JarEntry jarEntry, String archivePath, String internalPath, Manifest manifest) { - super(root, webAppPath, base, "jar:war:" + baseUrl + "^/" + archivePath, + super(archiveResourceSet, webAppPath, base, "jar:war:" + baseUrl + "^/" + archivePath, jarEntry, internalPath, manifest, "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=1655123&r1=1655122&r2=1655123&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:35:52 2015 @@ -81,7 +81,7 @@ public class JarWarResourceSet extends A @Override protected WebResource createArchiveResource(JarEntry jarEntry, String webAppPath, Manifest manifest) { - return new JarWarResource(getRoot(), webAppPath, getBase(), getBaseUrlString(), + return new JarWarResource(this, webAppPath, getBase(), getBaseUrlString(), jarEntry, archivePath, getInternalPath(), manifest); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org