[jenkins] 01/05: jenkins-tomcat now targets Tomcat 8 instead of Tomcat 6

[Emmanuel Bourg]

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

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

commit ae4e59fcbc1caaee267aa8b1d97e5240a5d0d1e8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 8 10:04:41 2014 +0200

    jenkins-tomcat now targets Tomcat 8 instead of Tomcat 6
---
 debian/changelog               | 1 +
 debian/control                 | 6 +++---
 debian/jenkins-tomcat.dirs     | 2 +-
 debian/jenkins-tomcat.links    | 2 +-
 debian/jenkins-tomcat.postinst | 8 ++++----
 debian/jenkins-tomcat.postrm   | 2 ++
 debian/tomcat.policy           | 8 ++++----
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b0fba6..89266a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ jenkins (1.565.2-1) UNRELEASED; urgency=medium
     - Depend on libstapler-java >= 1.224
     - Depend on libstapler-adjunct-codemirror-java >= 1.3
     - Depend on jenkins-test-annotations >= 1.1
+  * jenkins-tomcat now targets Tomcat 8 instead of Tomcat 6
   * Fixed a build failure caused by the relocation of the Maven artifacts
     in groovy 1.8.6-4 (Closes: #759946)
   * Removed the sourceless and unused connection.swf file (Closes: #736792)
diff --git a/debian/control b/debian/control
index 1aa36b0..6e4140c 100644
--- a/debian/control
+++ b/debian/control
@@ -313,10 +313,10 @@ Description: Jenkins CI Command Line Interface
 
 Package: jenkins-tomcat
 Architecture: all
-Depends: jenkins-common (= ${binary:Version}), tomcat6, ${misc:Depends}
+Depends: jenkins-common (= ${binary:Version}), tomcat8, ${misc:Depends}
 Conflicts: jenkins
 Provides: jenkins
-Description: Jenkins CI on Tomcat 6
+Description: Jenkins CI on Tomcat 8
  Jenkins monitors executions of repeated jobs, such as building a software
  project or jobs run by cron. Among those things, current Jenkins focuses
  on the following two jobs:
@@ -334,4 +334,4 @@ Description: Jenkins CI on Tomcat 6
     Jenkins keeps those outputs and makes it easy for you to notice when
     something is wrong.
  .
- This package provides a Jenkins CI instance deployed on Apache Tomcat 6.
+ This package provides a Jenkins CI instance deployed on Apache Tomcat 8.
diff --git a/debian/jenkins-tomcat.dirs b/debian/jenkins-tomcat.dirs
index 4715c57..2f349e9 100644
--- a/debian/jenkins-tomcat.dirs
+++ b/debian/jenkins-tomcat.dirs
@@ -1,3 +1,3 @@
 /etc/jenkins/
-/etc/tomcat6/policy.d 
+/etc/tomcat8/policy.d
 /var/lib/jenkins
diff --git a/debian/jenkins-tomcat.links b/debian/jenkins-tomcat.links
index b887d30..86b64f0 100644
--- a/debian/jenkins-tomcat.links
+++ b/debian/jenkins-tomcat.links
@@ -1 +1 @@
-/etc/jenkins/jenkins-tomcat.xml /etc/tomcat6/Catalina/localhost/jenkins.xml
+/etc/jenkins/jenkins-tomcat.xml /etc/tomcat8/Catalina/localhost/jenkins.xml
diff --git a/debian/jenkins-tomcat.postinst b/debian/jenkins-tomcat.postinst
index 834794a..6e6c0fb 100644
--- a/debian/jenkins-tomcat.postinst
+++ b/debian/jenkins-tomcat.postinst
@@ -8,9 +8,9 @@ set -e
 case "$1" in
     configure)
 
-        chown -R tomcat6:tomcat6 /var/lib/jenkins
+        chown -R tomcat8:tomcat8 /var/lib/jenkins
 
-        ln -sf /etc/jenkins/tomcat.policy /etc/tomcat6/policy.d/05jenkins.policy
+        ln -sf /etc/jenkins/tomcat.policy /etc/tomcat8/policy.d/05jenkins.policy
 
     ;;
 
@@ -25,9 +25,9 @@ case "$1" in
 
 esac
 
-invoke-rc.d --quiet tomcat6 restart || {
+invoke-rc.d --quiet tomcat8 restart || {
     RESULT=$?
-    # Ignore if tomcat6 init script does not exist (yet)
+    # Ignore if tomcat8 init script does not exist (yet)
     if [ $RESULT != 100 ]; then
 	exit $RESULT
     fi
diff --git a/debian/jenkins-tomcat.postrm b/debian/jenkins-tomcat.postrm
index d5ba031..fccb115 100644
--- a/debian/jenkins-tomcat.postrm
+++ b/debian/jenkins-tomcat.postrm
@@ -6,10 +6,12 @@ case "$1" in
     remove)
 
         rm -f /etc/tomcat6/policy.d/05jenkins.policy
+        rm -f /etc/tomcat8/policy.d/05jenkins.policy
 
 	# Is there a way not to restart tomcat if it is due to be removed, too?
 	if [ -x /usr/sbin/invoke-rc.d ]; then
 	    invoke-rc.d tomcat6 restart || true
+	    invoke-rc.d tomcat8 restart || true
 	fi
 
     ;;
diff --git a/debian/tomcat.policy b/debian/tomcat.policy
index dd0e1d5..38ae418 100644
--- a/debian/tomcat.policy
+++ b/debian/tomcat.policy
@@ -1,4 +1,4 @@
-grant codeBase "file:/var/lib/tomcat6/webapps/jenkins/-" {
+grant codeBase "file:/var/lib/tomcat8/webapps/jenkins/-" {
   permission java.security.AllPermission;
 
 //  FIXME: These permissions don't work - the above is the Jenkins recommendation
@@ -12,9 +12,9 @@ grant codeBase "file:/var/lib/tomcat6/webapps/jenkins/-" {
 //  permission java.io.FilePermission "/usr/share/java", "read";
 //  permission java.io.FilePermission "/usr/share/java/-", "read";
 //  permission java.io.FilePermission "/usr/share/maven-repo/-", "read";
-//  permission java.io.FilePermission "/var/log/tomcat6/-", "read,write";
-//  permission java.io.FilePermission "/var/lib/tomcat6/webapps/jenkins/-", "read";
-//  permission java.io.FilePermission "/var/lib/tomcat6/temp/-", "read,write";
+//  permission java.io.FilePermission "/var/log/tomcat8/-", "read,write";
+//  permission java.io.FilePermission "/var/lib/tomcat8/webapps/jenkins/-", "read";
+//  permission java.io.FilePermission "/var/lib/tomcat8/temp/-", "read,write";
 //  permission java.io.FilePermission "/var/lib/jenkins", "read,write,delete";
 //  permission java.io.FilePermission "/var/lib/jenkins/-", "read,write,delete";
 //  permission java.io.FilePermission "/usr/share/jenkins/jenkins.war", "read";

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