CVS tomcat5/debian/policy

[Wolfgang B??r]

Update of /cvsroot/pkg-java/tomcat5/debian/policy
In directory haydn:/tmp/cvs-serv25161/debian/policy

Modified Files:
	02debian.policy 03catalina.policy 10admin.policy 
Log Message:
tomcat5 (5.0.30-6) unstable; urgency=low

  * Move commons-fileupload jar from common/lib to server/lib
  * Copy fixed struts-config.xml during install over the old one.
  * Tomcat5 has a new context file handling. The xml files with the context of
    a webapp needs to be put into conf/[Engine name]/[Host name] whereas the 
    default engine which serves the admin webapp has to be called "Catalina":
    + Create conf/Catalina/localhost directory during install 
    + Deploy the context files for the webapps into this directory
  * Install the jsp/servlet examples (closes: #325508, #325507, #326126)
  * Added unzip to build-deps (needed to unzip example webapps)
  * Changed depends to j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe
  * Removed depends on j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe | java-compiler 
  * Updated *.policy files to match new jars and fixed typos
  * Disable commons-daemon copy/build - not available on all platforms
  * Removed classpath entry from MF and added jars directly to setclasspath.sh
  * Build documentation through commandline xslt processing


--- /cvsroot/pkg-java/tomcat5/debian/policy/02debian.policy	2005/03/25 15:03:27	1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/policy/02debian.policy	2005/09/11 11:00:51	1.2
@@ -2,17 +2,7 @@
 grant codeBase "file:/usr/share/java/-" {
   permission java.security.AllPermission;
 };
-grant codeBase "file:/usr/share/ant1.6/lib/-" {
-  permission java.security.AllPermission;
-};
-
-// These permissions apply the j2sdk1.3 package - it sets java.home to
-// "/usr/lib/j2re1.3" instead of "/usr/lib/j2sdk1.3"
-grant codeBase "file:/usr/lib/j2sdk1.3/lib/-" {
-  permission java.security.AllPermission;
-};
-
-grant codeBase "file:/usr/lib/j2sdk1.3/lib/ext/-" {
+grant codeBase "file:/usr/share/ant/lib/-" {
   permission java.security.AllPermission;
 };
 
--- /cvsroot/pkg-java/tomcat5/debian/policy/03catalina.policy	2005/03/25 15:03:27	1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/policy/03catalina.policy	2005/09/11 11:00:51	1.2
@@ -1,8 +1,28 @@
 // ========== CATALINA CODE PERMISSIONS =======================================
 
+// These permissions apply to the launcher code
+grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" {
+        permission java.security.AllPermission;
+};
+
+// These permissions apply to the daemon code
+grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
+        permission java.security.AllPermission;
+};
+
+// These permissions apply to the commons-logging API
+grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" {
+        permission java.security.AllPermission;
+};
+
 // These permissions apply to the server startup code
 grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
-  permission java.security.AllPermission;
+        permission java.security.AllPermission;
+};
+
+// These permissions apply to the JMX server
+grant codeBase "file:${catalina.home}/bin/jmx.jar" {
+        permission java.security.AllPermission;
 };
 
 // These permissions apply to the servlet API classes
@@ -18,13 +38,4 @@
   permission java.security.AllPermission;
 };
 
-// These permissions apply to the jasper page compiler.
-grant codeBase "file:${catalina.home}/shared/lib/jasper-compiler.jar" {
-  permission java.security.AllPermission;
-};
-
-// These permissions apply to the jasper JSP runtime
-grant codeBase "file:${catalina.home}/shared/lib/jasper-runtime.jar" {
-  permission java.security.AllPermission;                    
-};
 
--- /cvsroot/pkg-java/tomcat5/debian/policy/10admin.policy	2005/03/25 15:03:27	1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/policy/10admin.policy	2005/09/11 11:00:51	1.2
@@ -7,7 +7,7 @@
   permission java.security.AllPermission;  
 };
 
-grant codeBase "file:/usr/share/struts1.1/struts.jar" {
+grant codeBase "file:/usr/share/struts1.2/struts.jar" {
   permission java.security.AllPermission;
 };