svn commit: r1742250 - in /tomcat/trunk/java/org/apache/tomcat: Jar.java util/scan/AbstractInputStreamJar.java util/scan/JarFileUrlJar.java

[ma...@apache.org]

Author: markt
Date: Wed May  4 11:07:28 2016
New Revision: 1742250

URL: http://svn.apache.org/viewvc?rev=1742250&view=rev
Log:
Add getManifest() to Jar

Modified:
    tomcat/trunk/java/org/apache/tomcat/Jar.java
    tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
    tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java

Modified: tomcat/trunk/java/org/apache/tomcat/Jar.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/Jar.java?rev=1742250&r1=1742249&r2=1742250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/Jar.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/Jar.java Wed May  4 11:07:28 2016
@@ -19,6 +19,7 @@ package org.apache.tomcat;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.jar.Manifest;
 
 import org.apache.tomcat.util.scan.JarFactory;
 
@@ -117,6 +118,15 @@ public interface Jar extends AutoCloseab
     String getURL(String entry);
 
     /**
+     * Obtain the manifest for the JAR file.
+     *
+     * @return The manifest for this JAR file.
+     *
+     * @throws IOException If an I/O error occurs trying to obtain the manifest
+     */
+    Manifest getManifest() throws IOException;
+
+    /**
      * Resets the internal pointer used to track JAR entries to the beginning of
      * the JAR.
      *

Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java?rev=1742250&r1=1742249&r2=1742250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java Wed May  4 11:07:28 2016
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.jar.JarEntry;
+import java.util.jar.Manifest;
 
 import org.apache.tomcat.Jar;
 
@@ -119,6 +120,13 @@ public abstract class AbstractInputStrea
     }
 
 
+    @Override
+    public Manifest getManifest() throws IOException {
+        reset();
+        return jarInputStream.getManifest();
+    }
+
+
     @Override
     public void reset() throws IOException {
         closeStream();

Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java?rev=1742250&r1=1742249&r2=1742250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java Wed May  4 11:07:28 2016
@@ -25,6 +25,7 @@ import java.net.URL;
 import java.util.Enumeration;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import java.util.jar.Manifest;
 import java.util.zip.ZipEntry;
 
 import org.apache.tomcat.Jar;
@@ -146,6 +147,12 @@ public class JarFileUrlJar implements Ja
     }
 
     @Override
+    public Manifest getManifest() throws IOException {
+        return jarFile.getManifest();
+    }
+
+
+    @Override
     public void reset() throws IOException {
         entries = null;
         entry = null;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org