Author: ludovicc-guest
Date: 2009-08-04 21:16:41 +0000 (Tue, 04 Aug 2009)
New Revision: 9624
Added:
trunk/tomcat6/debian/patches/var_loaders.patch
Modified:
trunk/tomcat6/debian/README.Debian
trunk/tomcat6/debian/changelog
trunk/tomcat6/debian/patches/series
trunk/tomcat6/debian/tomcat6.default
trunk/tomcat6/debian/tomcat6.dirs
trunk/tomcat6/debian/tomcat6.postinst
Log:
* Update ownership for files in /etc/tomcat6 and /var/lib/tomcat6/webapps.
The new owner is tomcat6:adm (Closes: #532284)
* Add additional directories for the common, server and shared classloader.
Directories are also compatible with Alfresco's packaging done for
Ubuntu. (Closes: #521318)
Modified: trunk/tomcat6/debian/README.Debian
===================================================================
--- trunk/tomcat6/debian/README.Debian 2009-08-04 20:56:54 UTC (rev 9623)
+++ trunk/tomcat6/debian/README.Debian 2009-08-04 21:16:41 UTC (rev 9624)
@@ -1,3 +1,15 @@
+Differences introduced in the tomcat6-6.0.20-5 release:
+- New folders have been created in /var/lib/tomcat6 to allow an administrator
to
+ add shared classes or libraries. The layout is as follow:
+ /var/lib/tomcat6/common - put there jar files to be loaded by the common
classloader
+ /var/lib/tomcat6/common/classes - put there classes to be loaded by the
common classloader
+ /var/lib/tomcat6/server - put there jar files to be loaded by the server
classloader
+ /var/lib/tomcat6/server/classes - put there classes to be loaded by the
server classloader
+ /var/lib/tomcat6/shared - put there jar files to be loaded by the shared
classloader
+ /var/lib/tomcat6/shared/classes - put there classes to be loaded by the
shared classloader
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Sat, 25 Jul 2009 11:15:00
+0100
+
Differences introduced in the tomcat6-6.0.18-0ubuntu4 release:
- The default JVM temporary directory (java.io.tmpdir), which originally was
Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog 2009-08-04 20:56:54 UTC (rev 9623)
+++ trunk/tomcat6/debian/changelog 2009-08-04 21:16:41 UTC (rev 9624)
@@ -9,6 +9,11 @@
* Change watch to download fresh sources from SVN.
Should fix wrong encoding in tomcat-i18n-fr/es.jar in the next upstream
version. (Closes: #522067)
+ * Update ownership for files in /etc/tomcat6 and /var/lib/tomcat6/webapps.
+ The new owner is tomcat6:adm (Closes: #532284)
+ * Add additional directories for the common, server and shared classloader.
+ Directories are also compatible with Alfresco's packaging done for
+ Ubuntu. (Closes: #521318)
-- Ludovic Claude <ludovic.cla...@laposte.net> Sat, 25 Jul 2009 11:15:00
+0100
Modified: trunk/tomcat6/debian/patches/series
===================================================================
--- trunk/tomcat6/debian/patches/series 2009-08-04 20:56:54 UTC (rev 9623)
+++ trunk/tomcat6/debian/patches/series 2009-08-04 21:16:41 UTC (rev 9624)
@@ -2,3 +2,4 @@
disable-apr-loading.patch
deploy-webapps-build-xml.patch
use-commons-dbcp.patch
+var_loaders.patch
Added: trunk/tomcat6/debian/patches/var_loaders.patch
===================================================================
--- trunk/tomcat6/debian/patches/var_loaders.patch
(rev 0)
+++ trunk/tomcat6/debian/patches/var_loaders.patch 2009-08-04 21:16:41 UTC
(rev 9624)
@@ -0,0 +1,29 @@
+--- a/conf/catalina.properties
++++ b/conf/catalina.properties
+@@ -44,7 +44,7 @@
+ # "foo/*.jar": Add all the JARs of the specified folder as class
+ # repositories
+ # "foo/bar.jar": Add bar.jar as a class repository
+-common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar
++common.loader=${catalina.home}/lib,${catalina.home}/lib/*.jar,/var/lib/tomcat6/common/classes,/var/lib/tomcat6/common/*.jar
+
+ #
+ # List of comma-separated paths defining the contents of the "server"
+@@ -57,7 +57,7 @@
+ # "foo/*.jar": Add all the JARs of the specified folder as class
+ # repositories
+ # "foo/bar.jar": Add bar.jar as a class repository
+-server.loader=
++server.loader=${catalina.home}/server/classes,${catalina.home}/server/*.jar,/var/lib/tomcat6/server/classes,/var/lib/tomcat6/server/*.jar
+
+ #
+ # List of comma-separated paths defining the contents of the "shared"
+@@ -71,7 +71,7 @@
+ # "foo/bar.jar": Add bar.jar as a class repository
+ # Please note that for single jars, e.g. bar.jar, you need the URL form
+ # starting with file:.
+-shared.loader=
++shared.loader=${catalina.home}/shared/classes,${catalina.home}/shared/*.jar,/var/lib/tomcat6/shared/classes,/var/lib/tomcat6/shared/*.jar
+
+ #
+ # String cache configuration.
Modified: trunk/tomcat6/debian/tomcat6.default
===================================================================
--- trunk/tomcat6/debian/tomcat6.default 2009-08-04 20:56:54 UTC (rev
9623)
+++ trunk/tomcat6/debian/tomcat6.default 2009-08-04 21:16:41 UTC (rev
9624)
@@ -15,6 +15,9 @@
# Arguments to pass to the Java virtual machine (JVM).
#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
+#JAVA_OPTS="${JAVA_OPTS} -Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n"
+
# 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
Modified: trunk/tomcat6/debian/tomcat6.dirs
===================================================================
--- trunk/tomcat6/debian/tomcat6.dirs 2009-08-04 20:56:54 UTC (rev 9623)
+++ trunk/tomcat6/debian/tomcat6.dirs 2009-08-04 21:16:41 UTC (rev 9624)
@@ -1,4 +1,7 @@
var/log/tomcat6
var/lib/tomcat6/webapps
+var/lib/tomcat6/common/classes
+var/lib/tomcat6/server/classes
+var/lib/tomcat6/shared/classes
var/cache/tomcat6
etc/tomcat6/Catalina/localhost
Modified: trunk/tomcat6/debian/tomcat6.postinst
===================================================================
--- trunk/tomcat6/debian/tomcat6.postinst 2009-08-04 20:56:54 UTC (rev
9623)
+++ trunk/tomcat6/debian/tomcat6.postinst 2009-08-04 21:16:41 UTC (rev
9624)
@@ -9,11 +9,10 @@
fi
chown -R tomcat6:adm /var/log/tomcat6 /var/cache/tomcat6
chmod 750 /var/log/tomcat6 /var/cache/tomcat6
- chgrp tomcat6 /etc/tomcat6/tomcat-users.xml
+ chown -Rh tomcat6:adm /etc/tomcat6/*
chmod 640 /etc/tomcat6/tomcat-users.xml
- chgrp tomcat6 /var/lib/tomcat6/webapps
+ chown -Rh tomcat6:adm /var/lib/tomcat6/webapps /var/lib/tomcat6/common
/var/lib/tomcat6/server /var/lib/tomcat6/shared
chmod 775 /var/lib/tomcat6/webapps
- chgrp tomcat6 /etc/tomcat6/Catalina /etc/tomcat6/Catalina/localhost
chmod 775 /etc/tomcat6/Catalina /etc/tomcat6/Catalina/localhost
;;
esac
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
