[tomcat8] 02/02: Include the name of the distribution on the error pages

[Emmanuel Bourg]

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

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

commit ec9e2528966b48f5d33f6960b82fee4469c6ad6d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Feb 12 10:30:57 2014 +0100

    Include the name of the distribution on the error pages
---
 debian/changelog                                   |  5 +++--
 debian/control                                     |  1 +
 .../0019-add-distribution-to-error-page.patch      | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  4 ++++
 5 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38054da..148e076 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tomcat8 (8.0.3-1) UNRELEASED; urgency=low
+tomcat8 (8.0.3-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release (Closes: #722675)
@@ -12,6 +12,7 @@ tomcat8 (8.0.3-1) UNRELEASED; urgency=low
       the new javax prefix
     - Added the javax.websocket-api artifact to libservlet3.1-java
     - New build dependency on cglib, easymock and objenesis
+  * Added a patch to include the name of the distribution on the error pages
   * Use XZ compression for the upstream tarball
   * debian/control:
     - Replaced Sun Microsystems with Oracle in the packages descriptions
@@ -43,7 +44,7 @@ tomcat8 (8.0.3-1) UNRELEASED; urgency=low
   * Removed 0011-fix-classpath-lintian-warnings.patch and specified
     the classpath of jasper.jar in libtomcat8-java.manifest instead.
 
- -- Emmanuel Bourg <ebourg at apache.org>  Tue, 22 Oct 2013 10:11:08 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 12 Feb 2014 10:29:01 +0100
 
 tomcat7 (7.0.42-2) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
index 3aec5d5..83a6019 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends-Indep: javahelper,
                      libjakarta-taglibs-standard-java,
                      libjstl1.1-java,
                      libobjenesis-java,
+                     lsb-release,
                      maven-repo-helper
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/tomcat8.git
diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch
new file mode 100644
index 0000000..6fae3fc
--- /dev/null
+++ b/debian/patches/0019-add-distribution-to-error-page.patch
@@ -0,0 +1,26 @@
+Description: Adds the name of the distribution to the version of Tomcat
+ reported on the error pages (i.e. 'Apache Tomcat/8.0.x (Debian)')
+Author: Yolanda Robla <yolanda.robla at canonical.com>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/729840
+--- a/java/org/apache/catalina/util/ServerInfo.properties
++++ b/java/org/apache/catalina/util/ServerInfo.properties
+@@ -13,6 +13,6 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-server.info=Apache Tomcat/@VERSION@
++server.info=Apache Tomcat/@VERSION@ (@TOMCAT_DISTRIBUTION@)
+ server.number=@VERSION_NUMBER@
+ server.built=@VERSION_BUILT@
+\ No newline at end of file
+--- a/build.xml
++++ b/build.xml
+@@ -229,6 +229,7 @@
+     <filter token="YEAR" value="${year}"/>
+     <filter token="VERSION" value="${version}"/>
+     <filter token="VERSION_NUMBER" value="${version.number}"/>
++    <filter token="TOMCAT_DISTRIBUTION" value="${distribution.name}"/>
+     <filter token="VERSION_MAJOR" value="${version.major}"/>
+     <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
+     <filter token="VERSION_BUILT" value="${today} ${tstamp}"/>
diff --git a/debian/patches/series b/debian/patches/series
index 1a2679a..164a434 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 0015_disable_test_TestCometProcessor.patch
 0017-use-jdbc-pool-default.patch
 0018-fix-manager-webapp.patch
+0019-add-distribution-to-error-page.patch
diff --git a/debian/rules b/debian/rules
index 21e9219..e944f2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,9 @@ T_VER_BUILD := $(shell echo $(T_VER) | cut -d'.' -f3)
 RWLOC := debian/default_root
 RWFILES := $(RWLOC)/index.html $(RWLOC)/META-INF/context.xml
 
+# Add distribution.name as system property to grab it when showing version
+TOMCAT_DISTRIBUTION := "$(shell lsb_release -si)"
+
 ANT_ARGS := -Dcompile.debug=true \
 	-Djdt.jar=/usr/share/java/ecj.jar \
 	-Djunit.jar=/usr/share/java/junit4.jar \
@@ -40,6 +43,7 @@ ANT_ARGS := -Dcompile.debug=true \
 	-Dversion.minor="$(T_VER_MINOR)" \
 	-Dversion.build="$(T_VER_BUILD)" \
 	-Dversion.patch="0" \
+        -Ddistribution.name=$(TOMCAT_DISTRIBUTION) \
 	-Dversion.suffix="" \
 	-Dno.build.dbcp=true
 

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