[pkg-java] r11180 - in trunk/tomcat6/debian: . policy

[Niels Thykier]

Author: nthykier-guest
Date: 2009-11-30 18:48:14 +0000 (Mon, 30 Nov 2009)
New Revision: 11180

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/control
   trunk/tomcat6/debian/policy/03catalina.policy
   trunk/tomcat6/debian/tomcat6.default
Log:
  * Updated 03catalina.policy to allow "setContextClassLoader".
    - Fixes a problem where Sun's JVM would fail to generate log-files.
    (Closes: LP: #410379)
  * Updated /etc/default/tomcat6:
    - Clarified that JAVA_OPTS are passed to jscv and not the JVM.
    - Updated the JSP_COMPILER to javac (jikes is not in Debian anymore).
    (Closes: LP: #440685)
  * Use default-jdk and default-jre-headless instead of openjdk in
    (Build-)Depends.
  * Added more alternatives for java implementations to the Depends of
    libservlet2.5-java.



Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-11-30 15:13:50 UTC (rev 11179)
+++ trunk/tomcat6/debian/changelog	2009-11-30 18:48:14 UTC (rev 11180)
@@ -6,6 +6,17 @@
     to avoid a security problem.
   * Added patches to install the OSGi metadata in some of the jars.
     (Closes: #558176)
+  * Updated 03catalina.policy to allow "setContextClassLoader".
+    - Fixes a problem where Sun's JVM would fail to generate log-files.
+    (Closes: LP: #410379)
+  * Updated /etc/default/tomcat6:
+    - Clarified that JAVA_OPTS are passed to jscv and not the JVM.
+    - Updated the JSP_COMPILER to javac (jikes is not in Debian anymore).
+    (Closes: LP: #440685)
+  * Use default-jdk and default-jre-headless instead of openjdk in
+    (Build-)Depends.
+  * Added more alternatives for java implementations to the Depends of
+    libservlet2.5-java.
 
  -- Niels Thykier <niels at thykier.net>  Sat, 28 Nov 2009 17:51:49 +0100
 
@@ -61,6 +72,8 @@
     in the new upstream webapp
   * postrm removes the extra directories created in /var/lib/tomcat6
     to hold shared and common classes or jars.
+  * Added commented out default options for enabling debug mode.
+    (Closes: LP: #375493)
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 05 Aug 2009 00:56:59 +0100
 

Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control	2009-11-30 15:13:50 UTC (rev 11179)
+++ trunk/tomcat6/debian/control	2009-11-30 18:48:14 UTC (rev 11180)
@@ -5,7 +5,7 @@
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Torsten Werner <twerner at debian.org>,
  Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>,
  Niels Thykier <niels at thykier.net>
-Build-Depends: openjdk-6-jdk, ant-optional, debhelper (>= 7), quilt
+Build-Depends: default-jdk, ant-optional, debhelper (>= 7), quilt
 Build-Depends-Indep: maven-repo-helper, libecj-java
 Standards-Version: 3.8.3
 Homepage: http://tomcat.apache.org
@@ -55,7 +55,7 @@
 
 Package: libtomcat6-java
 Architecture: all
-Depends: openjdk-6-jre-headless | java6-runtime-headless,
+Depends: default-jre-headless | java6-runtime-headless,
 	libecj-java,
 	libcommons-dbcp-java,
 	libcommons-pool-java,
@@ -73,7 +73,8 @@
 
 Package: libservlet2.5-java
 Architecture: all
-Depends: openjdk-6-jre-headless | java2-runtime-headless
+Depends: default-jre-headless | java2-runtime-headless |
+         java5-runtime-headless | java6-runtime-headless
 Description: Servlet 2.5 and JSP 2.1 Java API classes
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web

Modified: trunk/tomcat6/debian/policy/03catalina.policy
===================================================================
--- trunk/tomcat6/debian/policy/03catalina.policy	2009-11-30 15:13:50 UTC (rev 11179)
+++ trunk/tomcat6/debian/policy/03catalina.policy	2009-11-30 18:48:14 UTC (rev 11180)
@@ -12,6 +12,7 @@
         permission java.io.FilePermission "${catalina.base}${file.separator}logs", "read, write";
         permission java.io.FilePermission "${catalina.base}${file.separator}logs${file.separator}*", "read, write";
         permission java.lang.RuntimePermission "getClassLoader";
+        permission java.lang.RuntimePermission "setContextClassLoader";
         // To enable per context logging configuration, permit read access to the appropriate file.
         // Be sure that the logging configuration is secure before enabling such access
         // eg for the examples web application:

Modified: trunk/tomcat6/debian/tomcat6.default
===================================================================
--- trunk/tomcat6/debian/tomcat6.default	2009-11-30 15:13:50 UTC (rev 11179)
+++ trunk/tomcat6/debian/tomcat6.default	2009-11-30 18:48:14 UTC (rev 11180)
@@ -12,7 +12,8 @@
 # Default: /var/lib/tomcat6
 #CATALINA_BASE=/var/lib/tomcat6
 
-# Arguments to pass to the Java virtual machine (JVM).
+# Arguments to pass to jscv (*not* to the JVM as the name may suggest).
+# -D and -X arguments are however passed on to the JVM by jscv
 #JAVA_OPTS="-Djava.awt.headless=true -Xmx128M"
 
 # To enable remore debugging uncomment the following line. You will then be able to use a java debugger on port 8000
@@ -20,7 +21,7 @@
 
 # Java compiler to use for translating JavaServer Pages (JSPs). You can use all
 # compilers that are accepted by Ant's build.compiler property.
-#JSP_COMPILER=jikes
+#JSP_COMPILER=javac
 
 # Use the Java security manager? (yes/no, default: yes)
 # WARNING: Do not disable the security manager unless you understand