[pkg-java] r5454 - in trunk/tomcat5.5/debian: . policy

[marcusb-guest at alioth.debian.org]

Author: marcusb-guest
Date: 2008-01-15 08:43:20 +0000 (Tue, 15 Jan 2008)
New Revision: 5454

Modified:
   trunk/tomcat5.5/debian/changelog
   trunk/tomcat5.5/debian/policy/04webapps.policy
Log:
Grant read permission to JULI for the (non-existing) logging.properties file in the example webapps, to prevent exceptions at startup.

Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog	2008-01-15 07:31:25 UTC (rev 5453)
+++ trunk/tomcat5.5/debian/changelog	2008-01-15 08:43:20 UTC (rev 5454)
@@ -1,12 +1,18 @@
 tomcat5.5 (5.5.25-6) UNRELEASED; urgency=low
 
+  [ Michael Koch ]
   * debian/rules: Don't file when files to delete don't exist.
     Closes: #458977
   * debian/tomcat5.5.init: Change directory to $CATALINA_BASE/temp before
     starting the daemon. Patch by David Pashley. Closes: #418826
 
- -- Michael Koch <konqueror at gmx.de>  Fri, 04 Jan 2008 09:44:23 +0100
+  [ Marcus Better ]
+  * debian/policy/04webapps.policy: Grant read permission to JULI for the
+    (non-existing) logging.properties file in the example webapps. Closes:
+    #460839.
 
+ -- Marcus Better <marcus at better.se>  Tue, 15 Jan 2008 09:41:25 +0100
+
 tomcat5.5 (5.5.25-5) unstable; urgency=low
 
   * debian/tomcat5.5.init: Check if tomcat-users.xml exists.

Modified: trunk/tomcat5.5/debian/policy/04webapps.policy
===================================================================
--- trunk/tomcat5.5/debian/policy/04webapps.policy	2008-01-15 07:31:25 UTC (rev 5453)
+++ trunk/tomcat5.5/debian/policy/04webapps.policy	2008-01-15 08:43:20 UTC (rev 5454)
@@ -54,3 +54,8 @@
     permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester";
     permission java.lang.RuntimePermission "defineClassInPackage.org.apache.tomcat.util.digester";
 };
+
+grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
+       permission java.io.FilePermission "/usr/share/tomcat5.5-webapps/jsp-examples/WEB-INF/classes/logging.properties", "read";
+       permission java.io.FilePermission "/usr/share/tomcat5.5-webapps/servlets-examples/WEB-INF/classes/logging.properties", "read";
+};