Access the Manifest directly from the archive resource set.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1655126 13f79535-47bb-0310-9956-ffa450edef68
apache · Jan 27, 2015 · 12e4fff · 12e4fff
1 parent 93d07dd
commit 12e4fff
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/java/org/apache/catalina/webresources/AbstractArchiveResource.java b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
@@ -27,23 +27,23 @@
 
 public abstract class AbstractArchiveResource extends AbstractResource {
 
+    private final AbstractArchiveResourceSet archiveResourceSet;
     private final String base;
     private final String baseUrl;
     private final JarEntry resource;
-    private final Manifest manifest;
     private final String codeBaseUrl;
     private final String name;
     private boolean readCerts = false;
     private Certificate[] certificates;
 
     protected AbstractArchiveResource(AbstractArchiveResourceSet archiveResourceSet,
             String webAppPath, String base, String baseUrl, JarEntry jarEntry,
-            Manifest manifest, String codeBaseUrl) {
+            String codeBaseUrl) {
         super(archiveResourceSet.getRoot(), webAppPath);
+        this.archiveResourceSet = archiveResourceSet;
         this.base = base;
         this.baseUrl = baseUrl;
         this.resource = jarEntry;
-        this.manifest = manifest;
         this.codeBaseUrl = codeBaseUrl;
 
         String resourceName = resource.getName();
@@ -204,7 +204,7 @@ public Certificate[] getCertificates() {
 
     @Override
     public Manifest getManifest() {
-        return manifest;
+        return archiveResourceSet.getManifest();
     }
 
     @Override

diff --git a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
@@ -42,6 +42,10 @@ protected final void setManifest(Manifest manifest) {
         this.manifest = manifest;
     }
 
+    protected final Manifest getManifest() {
+        return manifest;
+    }
+
     protected final void setBaseUrl(URL baseUrl) {
         this.baseUrl = baseUrl;
         if (baseUrl == null) {

diff --git a/java/org/apache/catalina/webresources/JarResource.java b/java/org/apache/catalina/webresources/JarResource.java
@@ -20,7 +20,6 @@
 import java.io.InputStream;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.jar.Manifest;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -34,9 +33,9 @@ public class JarResource extends AbstractArchiveResource {
     private static final Log log = LogFactory.getLog(JarResource.class);
 
     public JarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath,
-            String base, String baseUrl, JarEntry jarEntry, Manifest manifest) {
+            String base, String baseUrl, JarEntry jarEntry) {
         super(archiveResourceSet, webAppPath, base, "jar:" + baseUrl, jarEntry,
-                manifest, baseUrl);
+                baseUrl);
     }
 
     @Override

diff --git a/java/org/apache/catalina/webresources/JarResourceSet.java b/java/org/apache/catalina/webresources/JarResourceSet.java
@@ -78,8 +78,7 @@ public JarResourceSet(WebResourceRoot root, String webAppMount, String base,
     @Override
     protected WebResource createArchiveResource(JarEntry jarEntry,
             String webAppPath, Manifest manifest) {
-        return new JarResource(this, webAppPath, getBase(), getBaseUrlString(),
+        return new JarResource(this, webAppPath, getBase(), getBaseUrlString(), jarEntry);
-                jarEntry, manifest);
     }
 
     //-------------------------------------------------------- Lifecycle methods

diff --git a/java/org/apache/catalina/webresources/JarWarResource.java b/java/org/apache/catalina/webresources/JarWarResource.java
@@ -21,7 +21,6 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -37,9 +36,9 @@ public class JarWarResource extends AbstractArchiveResource {
     private final String archivePath;
 
     public JarWarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath,
-            String base, String baseUrl, JarEntry jarEntry, String archivePath, Manifest manifest) {
+            String base, String baseUrl, JarEntry jarEntry, String archivePath) {
         super(archiveResourceSet, webAppPath, base, "jar:war:" + baseUrl + "^/" + archivePath,
-                jarEntry, manifest, "jar:" + baseUrl + "!/" + archivePath);
+                jarEntry, "jar:" + baseUrl + "!/" + archivePath);
         this.archivePath = archivePath;
     }
 

diff --git a/java/org/apache/catalina/webresources/JarWarResourceSet.java b/java/org/apache/catalina/webresources/JarWarResourceSet.java
@@ -82,7 +82,7 @@ public JarWarResourceSet(WebResourceRoot root, String webAppMount,
     protected WebResource createArchiveResource(JarEntry jarEntry,
             String webAppPath, Manifest manifest) {
         return new JarWarResource(this, webAppPath, getBase(), getBaseUrlString(),
-                jarEntry, archivePath, manifest);
+                jarEntry, archivePath);
     }
 
     //-------------------------------------------------------- Lifecycle methods