Author: markt Date: Thu Jul 2 19:46:03 2015 New Revision: 1688897 URL: http://svn.apache.org/r1688897 Log: Make the manifest of the exploded WAR available to resources extracted from that WAR.
Added: tomcat/tc8.0.x/trunk/test/webresources/dir1/META-INF/ - copied from r1688896, tomcat/trunk/test/webresources/dir1/META-INF/ Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/DirResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResource.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResourceSet.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 2 19:46:03 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,1687268,168734 0,1688563,1688841,1688885 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657 907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1 666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685739,1685744,1685772,1685816,1685826,1685891,1687268,168734 0,1688563,1688841,1688878,1688885,1688896 Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1688897&r1=1688896&r2=1688897&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java Thu Jul 2 19:46:03 2015 @@ -37,21 +37,12 @@ public abstract class AbstractArchiveRes private final HashMap<String,JarEntry> jarFileEntries = new HashMap<>(); private URL baseUrl; private String baseUrlString; - private Manifest manifest; private JarFile archive = null; private final Object archiveLock = new Object(); private long archiveUseCount = 0; - 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) { @@ -250,7 +241,7 @@ public abstract class AbstractArchiveRes if (jarEntry == null) { return new EmptyResource(root, path); } else { - return createArchiveResource(jarEntry, path, manifest); + return createArchiveResource(jarEntry, path, getManifest()); } } } else { Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java?rev=1688897&r1=1688896&r2=1688897&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractResourceSet.java Thu Jul 2 19:46:03 2015 @@ -16,6 +16,8 @@ */ package org.apache.catalina.webresources; +import java.util.jar.Manifest; + import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleState; import org.apache.catalina.WebResourceRoot; @@ -32,6 +34,7 @@ public abstract class AbstractResourceSe private String webAppMount; private boolean classLoaderOnly; private boolean staticOnly; + private Manifest manifest; protected static final StringManager sm = @@ -111,6 +114,14 @@ public abstract class AbstractResourceSe this.staticOnly = staticOnly; } + protected final void setManifest(Manifest manifest) { + this.manifest = manifest; + } + + protected final Manifest getManifest() { + return manifest; + } + //-------------------------------------------------------- Lifecycle methods @Override Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/DirResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/DirResourceSet.java?rev=1688897&r1=1688896&r2=1688897&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/DirResourceSet.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/DirResourceSet.java Thu Jul 2 19:46:03 2015 @@ -17,10 +17,12 @@ package org.apache.catalina.webresources; import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.Set; +import java.util.jar.Manifest; import org.apache.catalina.LifecycleException; import org.apache.catalina.WebResource; @@ -28,12 +30,16 @@ import org.apache.catalina.WebResourceRo import org.apache.catalina.WebResourceRoot.ResourceSetType; import org.apache.catalina.util.IOTools; import org.apache.catalina.util.ResourceSet; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** * Represents a {@link org.apache.catalina.WebResourceSet} based on a directory. */ public class DirResourceSet extends AbstractFileResourceSet { + private static final Log log = LogFactory.getLog(DirResourceSet.class); + /** * A no argument constructor is required for this to work with the digester. */ @@ -102,7 +108,7 @@ public class DirResourceSet extends Abst if (f.isDirectory() && path.charAt(path.length() - 1) != '/') { path = path + '/'; } - return new FileResource(root, path, f, isReadOnly()); + return new FileResource(root, path, f, isReadOnly(), getManifest()); } else { return new EmptyResource(root, path); } @@ -248,4 +254,22 @@ public class DirResourceSet extends Abst getBase(), File.separator, getInternalPath())); } } + + //-------------------------------------------------------- Lifecycle methods + @Override + protected void initInternal() throws LifecycleException { + super.initInternal(); + // Is this an exploded web application? + if (getWebAppMount().equals("")) { + // Look for a manifest + File mf = file("META-INF/MANIFEST.MF", true); + if (mf != null && mf.isFile()) { + try (FileInputStream fis = new FileInputStream(mf)) { + setManifest(new Manifest(fis)); + } catch (IOException e) { + log.warn(sm.getString("dirResourceSet.manifestFail", mf.getAbsolutePath()), e); + } + } + } + } } Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResource.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResource.java?rev=1688897&r1=1688896&r2=1688897&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResource.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResource.java Thu Jul 2 19:46:03 2015 @@ -43,9 +43,10 @@ public class FileResource extends Abstra private final File resource; private final String name; private final boolean readOnly; + private final Manifest manifest; public FileResource(WebResourceRoot root, String webAppPath, - File resource, boolean readOnly) { + File resource, boolean readOnly, Manifest manifest) { super(root,webAppPath); this.resource = resource; @@ -67,6 +68,7 @@ public class FileResource extends Abstra } this.readOnly = readOnly; + this.manifest = manifest; } @Override @@ -218,7 +220,7 @@ public class FileResource extends Abstra @Override public Manifest getManifest() { - return null; + return manifest; } @Override Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResourceSet.java?rev=1688897&r1=1688896&r2=1688897&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResourceSet.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/FileResourceSet.java Thu Jul 2 19:46:03 2015 @@ -84,7 +84,7 @@ public class FileResourceSet extends Abs if (f == null) { return new EmptyResource(root, path); } - return new FileResource(root, path, f, isReadOnly()); + return new FileResource(root, path, f, isReadOnly(), null); } if (path.charAt(path.length() - 1) != '/') { Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties?rev=1688897&r1=1688896&r2=1688897&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/LocalStrings.properties Thu Jul 2 19:46:03 2015 @@ -25,6 +25,7 @@ cache.backgroundEvictFail=The background cache.objectMaxSizeTooBig=The value of [{0}]kB for objectMaxSize is larger than the limit of maxSize/20 so has been reduced to [{1}]kB cache.objectMaxSizeTooBigBytes=The value specified for the maximum object size to cache [{0}]kB is greater than Integer.MAX_VALUE bytes which is the maximum size that can be cached. The limit will be set to Integer.MAX_VALUE bytes. +dirResourceSet.manifestFail=Failed to read manifest from [{0}] dirResourceSet.notDirectory=The directory specified by base and internal path [{0}]{1}[{2}] does not exist. dirResourceSet.writeExists=The target of the write already exists dirResourceSet.writeNpe=The input stream may not be null Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java?rev=1688897&r1=1688896&r2=1688897&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/webresources/AbstractTestResourceSet.java Thu Jul 2 19:46:03 2015 @@ -22,6 +22,7 @@ import java.io.InputStream; import java.net.URL; import java.util.HashSet; import java.util.Set; +import java.util.jar.Manifest; import org.junit.After; import org.junit.Assert; @@ -180,6 +181,7 @@ public abstract class AbstractTestResour optional.add(".svn"); // Files visible in some tests only optional.add(getMount() + ".ignore-me.txt"); + optional.add("META-INF"); for (String result : results) { Assert.assertTrue(result, @@ -273,6 +275,8 @@ public abstract class AbstractTestResour optional.add(getMount() + "/.svn/"); // Files visible in some tests only optional.add(getMount() + "/.ignore-me.txt"); + // Files visible in some configurations only + optional.add(getMount() + "/META-INF/"); for (String result : results) { Assert.assertTrue(result, @@ -500,6 +504,21 @@ public abstract class AbstractTestResour } } + + // ----------------------------------------------------------- getManifest() + + @Test + public final void testGetManifest() { + WebResource exists = resourceRoot.getResource(getMount() + "/d1/d1-f1.txt"); + boolean manifestExists = resourceRoot.getResource("/META-INF/MANIFEST.MF").exists(); + Manifest m = exists.getManifest(); + if (getMount().equals("") && manifestExists) { + Assert.assertNotNull(m); + } else { + Assert.assertNull(m); + } + } + // ------------------------------------------------------------ constructors Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1688897&r1=1688896&r2=1688897&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Jul 2 19:46:03 2015 @@ -45,6 +45,15 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 8.0.25 (markt)" rtext="in development"> + <subsection name="Catalina"> + <changelog> + <fix> + Make the WAR manifest file available for WebResource instances from an + unpacked WAR in the same way the manifest is available if the WAR is not + unpacked. (markt) + </fix> + </changelog> + </subsection> <subsection name="Other"> <changelog> <update> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org