[tomcat7] 07/08: Added a patch renaming the taglibs-standard-*.jar files used in the tests

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat7.

commit 94da337f3187d49dc24f8d50e3e3aac44c48504b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 6 17:09:15 2015 +0200

    Added a patch renaming the taglibs-standard-*.jar files used in the tests
---
 debian/changelog                                   |  1 +
 .../0025-standard-taglibs-compatibility.patch      | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1e73a4c..d84e038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ tomcat7 (7.0.61-1) UNRELEASED; urgency=medium
   * New upstream release
   * Refreshed the patches
   * Updated the test certificates
+  * Added a patch renaming the taglibs-standard-*.jar files used in the tests
   * debian/rules: export JAVA_HOME to fix a build failure
   * debian/orig-tar.sh: Exclude the taglibs-standard-*.jar files
     from the upstream tarball
diff --git a/debian/patches/0025-standard-taglibs-compatibility.patch b/debian/patches/0025-standard-taglibs-compatibility.patch
new file mode 100644
index 0000000..0230965
--- /dev/null
+++ b/debian/patches/0025-standard-taglibs-compatibility.patch
@@ -0,0 +1,33 @@
+Description: Changes the name of the standard taglibs jars used in the tests to the ones available in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/test/org/apache/catalina/core/TestStandardContextAliases.java
++++ b/test/org/apache/catalina/core/TestStandardContextAliases.java
+@@ -80,12 +80,12 @@
+             ServletContext context = getServletContext();
+ 
+             // Check resources individually
+-            URL url = context.getResource("/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar");
++            URL url = context.getResource("/WEB-INF/lib/jstl.jar");
+             if (url != null) {
+                 resp.getWriter().write("00-PASS\n");
+             }
+ 
+-            url = context.getResource("/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar");
++            url = context.getResource("/WEB-INF/lib/standard.jar");
+             if (url != null) {
+                 resp.getWriter().write("01-PASS\n");
+             }
+@@ -96,10 +96,10 @@
+                 return;
+             }
+ 
+-            if (!libs.contains("/WEB-INF/lib/taglibs-standard-spec-1.2.5.jar")) {
++            if (!libs.contains("/WEB-INF/lib/jstl.jar")) {
+                 return;
+             }
+-            if (!libs.contains("/WEB-INF/lib/taglibs-standard-impl-1.2.5.jar")) {
++            if (!libs.contains("/WEB-INF/lib/standard.jar")) {
+                 return;
+             }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fa00aa3..e15f218 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 0021-add-simple-instance-manager.patch
 0022-update-test-certificates.patch
 0024-disable-unit-tests-depending-on-network-access.path
+0025-standard-taglibs-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git