Author: remm Date: Sat Feb 28 09:18:35 2015 New Revision: 1662912 URL: http://svn.apache.org/r1662912 Log: Fix JSTL related test and add to skip list.
Modified: tomcat/tc8.0.x/trunk/conf/catalina.properties tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java Modified: tomcat/tc8.0.x/trunk/conf/catalina.properties URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/conf/catalina.properties?rev=1662912&r1=1662911&r2=1662912&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/conf/catalina.properties (original) +++ tomcat/tc8.0.x/trunk/conf/catalina.properties Sat Feb 28 09:18:35 2015 @@ -121,7 +121,7 @@ commons-beanutils*.jar,commons-codec*.ja commons-dbcp*.jar,commons-digester*.jar,commons-fileupload*.jar,\ commons-httpclient*.jar,commons-io*.jar,commons-lang*.jar,commons-logging*.jar,\ commons-math*.jar,commons-pool*.jar,\ -jstl.jar,\ +jstl.jar,taglibs-standard-spec-*.jar,\ geronimo-spec-jaxrpc*.jar,wsdl4j*.jar,\ ant.jar,ant-junit*.jar,aspectj*.jar,jmx.jar,h2*.jar,hibernate*.jar,httpclient*.jar,\ jmx-tools.jar,jta*.jar,log4j*.jar,mail*.jar,slf4j*.jar,\ Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1662912&r1=1662911&r2=1662912&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java Sat Feb 28 09:18:35 2015 @@ -86,12 +86,12 @@ public class TestStandardContextAliases ServletContext context = getServletContext(); // Check resources individually - URL url = context.getResource("/WEB-INF/lib/jstl.jar"); + URL url = context.getResource("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar"); if (url != null) { resp.getWriter().write("00-PASS\n"); } - url = context.getResource("/WEB-INF/lib/standard.jar"); + url = context.getResource("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar"); if (url != null) { resp.getWriter().write("01-PASS\n"); } @@ -102,10 +102,10 @@ public class TestStandardContextAliases return; } - if (!libs.contains("/WEB-INF/lib/jstl.jar")) { + if (!libs.contains("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar")) { return; } - if (!libs.contains("/WEB-INF/lib/standard.jar")) { + if (!libs.contains("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar")) { return; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org