Author: markt
Date: Tue Jul 5 13:53:40 2016
New Revision: 1751475
URL: http://svn.apache.org/viewvc?rev=1751475&view=rev
Log:
The resource JARs don't contain TLDs so don't scan for them during testing
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 5 13:53:40 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747
980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097,1751438
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747
980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750899,1750975,1750995,1751061,1751097,1751438,1751447
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1751475&r1=1751474&r2=1751475&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Tue Jul 5 13:53:40 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/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1751475&r1=1751474&r2=1751475&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
Tue Jul 5 13:53:40 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/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1751475&r1=1751474&r2=1751475&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TestContextConfig.java
Tue Jul 5 13:53:40 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/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1751475&r1=1751474&r2=1751475&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Tue Jul 5 13:53:40 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/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java?rev=1751475&r1=1751474&r2=1751475&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestWarURLStreamHandlerIntegration.java
Tue Jul 5 13:53:40 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/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java?rev=1751475&r1=1751474&r2=1751475&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TestCompiler.java Tue
Jul 5 13:53:40 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/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java?rev=1751475&r1=1751474&r2=1751475&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java
(original)
+++
tomcat/tc8.5.x/trunk/test/org/apache/naming/resources/TestWarDirContext.java
Tue Jul 5 13:53:40 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
