[jenkins] 02/03: Remove Context Resource symlinks directives as they don't work anymore in Tomcat 8 and are not required for Jenkins

[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 71ae0f030d7711e3e98d852c7584ea5e7a9a7429
Author: Yann Rouillard <yrouillard at octo.com>
Date:   Sat Nov 15 14:18:46 2014 +0000

    Remove Context Resource symlinks directives as they don't work anymore in Tomcat 8 and are not required for Jenkins
---
 debian/changelog          | 4 +++-
 debian/jenkins-tomcat.xml | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35c3db9..85d1e73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-jenkins (1.565.3-2.1) unstable; urgency=medium
+jenkins (1.565.3-3) unstable; urgency=medium
 
   * Team upload.
   * Added dependency on libcglib3-java to fix NoClassDefFoundError at runtime.
+  * Removed Context Resource symlinks directives as they don't work anymore in
+    Tomcat 8 and are not required for Jenkins (Closes: #769594)
 
  -- Yann Rouillard <yann at pleiades.fr.eu.org>  Sat, 15 Nov 2014 12:14:33 +0000
 
diff --git a/debian/jenkins-tomcat.xml b/debian/jenkins-tomcat.xml
index b0c3e4c..af42320 100644
--- a/debian/jenkins-tomcat.xml
+++ b/debian/jenkins-tomcat.xml
@@ -3,8 +3,6 @@
 -->
 <Context path="/jenkins" docBase="/usr/share/jenkins/jenkins.war"
    debug="0" privileged="true" allowLinking="true" crossContext="true">
-  <!-- make symlinks work in Tomcat -->
-  <Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" />
 
   <Environment name="JENKINS_HOME" type="java.lang.String" value="/var/lib/jenkins" override="true" />
 </Context>

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