Author: markt
Date: Tue Jul 5 11:24:21 2016
New Revision: 1751447
URL: http://svn.apache.org/viewvc?rev=1751447&view=rev
Log:
The resource JARs don't contain TLDs so don't scan for them during testing
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Tue Jul 5 11:24:21 2016
@@ -211,6 +211,7 @@ public class TestStandardContextResource
// app dir is relative to server home
StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
+ skipTldsForResourceJars(ctx);
Tomcat.addServlet(ctx, "getresource", new GetResourceServlet());
ctx.addServletMapping("/getresource", "getresource");
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Tue Jul
5 11:24:21 2016
@@ -153,7 +153,8 @@ public class TestStandardWrapper extends
Tomcat tomcat = getTomcatInstance();
File appDir = new File("test/webapp-fragments");
- tomcat.addWebapp(null, "", appDir.getAbsolutePath());
+ Context ctx = tomcat.addWebapp(null, "", appDir.getAbsolutePath());
+ skipTldsForResourceJars(ctx);
tomcat.start();
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java Tue
Jul 5 11:24:21 2016
@@ -73,7 +73,8 @@ public class TestContextConfig extends T
File appDir = new File("test/webapp-fragments");
// app dir is relative to server home
- tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+ Context ctx = tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
+ skipTldsForResourceJars(ctx);
tomcat.start();
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Tue Jul
5 11:24:21 2016
@@ -67,6 +67,8 @@ import org.apache.catalina.webresources.
import org.apache.coyote.http11.Http11NioProtocol;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.collections.CaseInsensitiveKeyMap;
+import org.apache.tomcat.util.scan.StandardJarScanFilter;
+import org.apache.tomcat.util.scan.StandardJarScanner;
/**
* Base test case that provides a Tomcat instance for each test - mainly so we
@@ -857,4 +859,11 @@ public abstract class TomcatBaseTest ext
return FileVisitResult.CONTINUE;
}});
}
+
+
+ public static void skipTldsForResourceJars(Context context) {
+ StandardJarScanner scanner = (StandardJarScanner)
context.getJarScanner();
+ StandardJarScanFilter filter = (StandardJarScanFilter)
scanner.getJarScanFilter();
+ filter.setTldSkip(filter.getTldSkip() + ",resources*.jar");
+ }
}
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
Tue Jul 5 11:24:21 2016
@@ -34,13 +34,14 @@ public class TestWarURLStreamHandlerInte
Tomcat tomcat = getTomcatInstance();
File docBase = new File("test/webresources/war-url-connection.war");
- Context context = tomcat.addWebapp("/test", docBase.getAbsolutePath());
+ Context ctx = tomcat.addWebapp("/test", docBase.getAbsolutePath());
+ skipTldsForResourceJars(ctx);
((StandardHost) tomcat.getHost()).setUnpackWARs(false);
tomcat.start();
- URL url = context.getServletContext().getResource("/index.html");
+ URL url = ctx.getServletContext().getResource("/index.html");
try {
url.toURI();
} catch (Exception e) {
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestCompiler.java Tue Jul 5
11:24:21 2016
@@ -28,6 +28,7 @@ import static org.junit.Assert.assertTru
import org.junit.Test;
+import org.apache.catalina.Context;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -173,7 +174,9 @@ public class TestCompiler extends Tomcat
Tomcat tomcat = getTomcatInstance();
File appDir = new File("test/webapp-fragments");
- tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+ Context ctx = tomcat.addWebapp(null, "/test",
appDir.getAbsolutePath());
+ skipTldsForResourceJars(ctx);
+
tomcat.start();
// No further tests required. The bug triggers an infinite loop on
Modified: tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java?rev=1751447&r1=1751446&r2=1751447&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java
(original)
+++ tomcat/trunk/test/org/apache/naming/resources/TestWarDirContext.java Tue
Jul 5 11:24:21 2016
@@ -112,6 +112,7 @@ public class TestWarDirContext extends T
StandardRoot root = new StandardRoot();
root.setCachingAllowed(true);
ctxt.setResources(root);
+ skipTldsForResourceJars(ctxt);
tomcat.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
