Author: markt
Date: Tue Mar 25 19:13:04 2014
New Revision: 1581470
URL: http://svn.apache.org/r1581470
Log:
Fix extension validation for the new resources implementation
Modified:
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1581470&r1=1581469&r2=1581470&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Tue Mar
25 19:13:04 2014
@@ -157,20 +157,16 @@ public final class ExtensionValidator {
}
}
- // Primarily used for error reporting
- String jarName = null;
- WebResource[] jars = resources.listResources("/WEB-INF/lib");
- for (WebResource jar : jars) {
- jarName = jar.getName();
- if (jarName.toLowerCase(Locale.ENGLISH).endsWith(".jar") &&
- jar.isFile()) {
-
- Manifest jmanifest = jar.getManifest();
- if (jmanifest != null) {
- ManifestResource mre = new ManifestResource(jarName,
- jmanifest, ManifestResource.APPLICATION);
- appManifestResources.add(mre);
- }
+ WebResource[] manifestResources =
+ resources.getClassLoaderResources("/META-INF/MANIFEST.MF");
+ for (WebResource manifestResource : manifestResources) {
+ if (manifestResource.isFile()) {
+ // Primarily used for error reporting
+ String jarName = manifestResource.getURL().toExternalForm();
+ Manifest jmanifest = new
Manifest(manifestResource.getInputStream());
+ ManifestResource mre = new ManifestResource(jarName,
+ jmanifest, ManifestResource.APPLICATION);
+ appManifestResources.add(mre);
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1581470&r1=1581469&r2=1581470&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 25 19:13:04 2014
@@ -44,6 +44,16 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+<section name="Tomcat 8.0.6 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Fix extension validation which was broken by refactoring for new
+ resources implementation. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 8.0.5 (markt)">
<subsection name="Catalina">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
