Author: jboynes Date: Sat Mar 21 04:26:11 2015 New Revision: 1668193 URL: http://svn.apache.org/r1668193 Log: Update trunk to standard taglib 1.2.5
Added: tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar - copied, changed from r1668188, tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar - copied, changed from r1668188, tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar Removed: tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java?rev=1668193&r1=1668192&r2=1668193&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestStandardContextAliases.java Sat Mar 21 04:26:11 2015 @@ -89,12 +89,12 @@ public class TestStandardContextAliases ServletContext context = getServletContext(); // Check resources individually - URL url = context.getResource("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar"); + URL url = context.getResource("/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar"); if (url != null) { resp.getWriter().write("00-PASS\n"); } - url = context.getResource("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar"); + url = context.getResource("/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar"); if (url != null) { resp.getWriter().write("01-PASS\n"); } @@ -105,10 +105,10 @@ public class TestStandardContextAliases return; } - if (!libs.contains("/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar")) { + if (!libs.contains("/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar")) { return; } - if (!libs.contains("/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar")) { + if (!libs.contains("/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar")) { return; } Modified: tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java?rev=1668193&r1=1668192&r2=1668193&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java (original) +++ tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java Sat Mar 21 04:26:11 2015 @@ -100,9 +100,9 @@ public class TestTldScanner extends Tomc File webappDir = new File("webapps/examples"); Assert.assertFalse(callback.scanFoundNoTLDs()); - scan(callback, webappDir, "WEB-INF/lib/taglibs-standard-spec-1.2.3.jar"); + scan(callback, webappDir, "WEB-INF/lib/taglibs-standard-spec-1.2.5.jar"); Assert.assertTrue(callback.scanFoundNoTLDs()); - scan(callback, webappDir, "WEB-INF/lib/taglibs-standard-impl-1.2.3.jar"); + scan(callback, webappDir, "WEB-INF/lib/taglibs-standard-impl-1.2.5.jar"); Assert.assertTrue(callback.scanFoundNoTLDs()); } Copied: tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar (from r1668188, tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar) URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar?p2=tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar&p1=tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar&r1=1668188&r2=1668193&rev=1668193&view=diff ============================================================================== Binary files tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.3.jar (original) and tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar Sat Mar 21 04:26:11 2015 differ Copied: tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar (from r1668188, tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar) URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar?p2=tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar&p1=tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar&r1=1668188&r2=1668193&rev=1668193&view=diff ============================================================================== Binary files tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.3.jar (original) and tomcat/trunk/webapps/examples/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar Sat Mar 21 04:26:11 2015 differ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org