Author: markt
Date: Tue Jan 27 19:37:03 2015
New Revision: 1655126
URL: http://svn.apache.org/r1655126
Log:
Access the Manifest directly from the archive resource set.
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResource.java
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.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=1655126&r1=1655125&r2=1655126&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:03 2015
@@ -27,10 +27,10 @@ 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 Manifest manifest;
private final String codeBaseUrl;
private final String name;
private boolean readCerts = false;
@@ -38,12 +38,12 @@ public abstract class AbstractArchiveRes
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 abstract class AbstractArchiveRes
@Override
public Manifest getManifest() {
- return manifest;
+ return archiveResourceSet.getManifest();
}
@Override
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1655126&r1=1655125&r2=1655126&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
Tue Jan 27 19:37:03 2015
@@ -42,6 +42,10 @@ public abstract class AbstractArchiveRes
this.manifest = manifest;
}
+ protected final Manifest getManifest() {
+ return manifest;
+ }
+
protected final void setBaseUrl(URL baseUrl) {
this.baseUrl = baseUrl;
if (baseUrl == null) {
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=1655126&r1=1655125&r2=1655126&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:03 2015
@@ -20,7 +20,6 @@ import java.io.IOException;
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 Abstrac
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
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=1655126&r1=1655125&r2=1655126&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:03 2015
@@ -78,8 +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, manifest);
+ return new JarResource(this, webAppPath, getBase(),
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=1655126&r1=1655125&r2=1655126&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:03 2015
@@ -21,7 +21,6 @@ import java.io.InputStream;
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 Abst
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;
}
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=1655126&r1=1655125&r2=1655126&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:03 2015
@@ -82,7 +82,7 @@ public class JarWarResourceSet extends A
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath, Manifest manifest) {
return new JarWarResource(this, webAppPath, getBase(),
getBaseUrlString(),
- jarEntry, archivePath, manifest);
+ jarEntry, archivePath);
}
//-------------------------------------------------------- Lifecycle
methods
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
