[pkg-java] r11496 - in trunk/tomcat6/debian: . patches poms
Ludovic Claude
ludovicc-guest at alioth.debian.org
Tue Feb 2 22:57:34 UTC 2010
Author: ludovicc-guest
Date: 2010-02-02 22:57:33 +0000 (Tue, 02 Feb 2010)
New Revision: 11496
Removed:
trunk/tomcat6/debian/NEWS.Debian
trunk/tomcat6/debian/patches/fix_context_name.patch
Modified:
trunk/tomcat6/debian/README.Debian
trunk/tomcat6/debian/changelog
trunk/tomcat6/debian/control
trunk/tomcat6/debian/patches/deploy-webapps-build-xml.patch
trunk/tomcat6/debian/patches/jsp-api-OSGi.patch
trunk/tomcat6/debian/patches/series
trunk/tomcat6/debian/patches/servlet-api-OSGi.patch
trunk/tomcat6/debian/patches/var_loaders.patch
trunk/tomcat6/debian/poms/annotations-api.pom
trunk/tomcat6/debian/poms/catalina-ha.pom
trunk/tomcat6/debian/poms/catalina-tribes.pom
trunk/tomcat6/debian/poms/catalina.pom
trunk/tomcat6/debian/poms/jasper-el.pom
trunk/tomcat6/debian/poms/jasper.pom
trunk/tomcat6/debian/poms/juli.pom
trunk/tomcat6/debian/poms/tomcat-coyote.pom
trunk/tomcat6/debian/rules
trunk/tomcat6/debian/tomcat6-instance-create.1
trunk/tomcat6/debian/tomcat6.links
Log:
* New upstream version
* Bump up Standards-Version to 3.8.4
* Refresh patches deploy-webapps-build-xml.patch and var_loaders.patch
* Remove patch fix_context_name.patch as it has been applied upstream
* Fix the installation of servlet-api-2.5.jar: the jar
goes to /usr/share/java as in older versions (6.0.20-2)
and links to the jar are added to /usr/share/maven-repo
* Moved NEWS.Debian into README.Debian
* Add a link from /usr/share/doc/tomcat6-common/README.Debian to
/usr/share/doc/tomcat6/README.Debian to include a minimum of
documentation in the tomcat6 package and add some useful notes.
(Closes: #563937, #563939)
Deleted: trunk/tomcat6/debian/NEWS.Debian
===================================================================
--- trunk/tomcat6/debian/NEWS.Debian 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/NEWS.Debian 2010-02-02 22:57:33 UTC (rev 11496)
@@ -1,29 +0,0 @@
-tomcat6 (6.0.20-10) unstable; urgency=low
-
- * The tomcat6 package no longer uses the jsvc native service runner.
- Instead, by default, the init script invokes the catalina.sh
- script, and Tomcat does not attempt to open any server sockets on
- ports below 1024. If you configure your Tomcat to listen on one
- or more privileged ports (such as port 80 or port 443), then you
- may now enable authbind in your /etc/default/tomcat6 file. The
- authbind package can allow your Tomcat JVM user (a non-root user)
- to listen on privileged ports. Set AUTHBIND="yes" to enable it,
- and then configure your Tomcat to listen on any port number you
- wish. See the "man authbind" for information on configuring
- authbind.
- * The Tomcat security manager is now disabled by default. Previous
- versions of this package enabled the Tomcat security manager by
- default. A large number of users reported exceptions where the
- root cause was that the security manager was enabled by default.
- In nearly all of these cases, the users are unfamiliar with the
- Java security manager, and are not interested in trying to define
- security manager rules for their webapps -- they just want it to
- run. Disabling the security manager fixes it for them. Today,
- most Tomcat users run Tomcat with the security manager disabled.
- Those who intentionally enable it are the minority, and they tend
- to know how it works. If you are currently using the security
- manager, and would like to continue using it after upgrading to
- tomcat6-6.0.20-10 or higher, edit your /etc/default/tomcat6 file
- and set TOMCAT6_SECURITY="yes".
-
- -- Jason Brittain <jason.brittain at mulesoft.com> Thu, 28 Jan 2010 17:15:03 +0000
Modified: trunk/tomcat6/debian/README.Debian
===================================================================
--- trunk/tomcat6/debian/README.Debian 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/README.Debian 2010-02-02 22:57:33 UTC (rev 11496)
@@ -1,3 +1,57 @@
+Getting started:
+ * The server should be accessible at http://localhost:8080/ once installed.
+ * If you install tomcat6-admin, then Tomcat administration will be accessible
+ on http://localhost:8080/manager/, the default username is tomcat and
+ the password is also tomcat.
+ * Tomcat is NOT secured by default. Before exposing your Tomcat instance to
+ the internet, please change at least the passwords in
+ /etc/tomcat6/tomcat-users.xml and turn on Java security: edit your
+ /etc/default/tomcat6 file and set TOMCAT6_SECURITY="yes".
+ After you may need to change the policy files in /etc/tomcat6/policy.d/
+ if the application doesn't start or produces new Exceptions.
+ * To run more than one Tomcat instance on your server, install the package
+ tomcat6-user and run the tomcat6-instance-create utility.
+ * If you configure your Tomcat to listen on one
+ or more privileged ports (such as port 80 or port 443), then you
+ may now enable authbind in your /etc/default/tomcat6 file. The
+ authbind package can allow your Tomcat JVM user (a non-root user)
+ to listen on privileged ports. Set AUTHBIND="yes" to enable it,
+ and then configure your Tomcat to listen on any port number you
+ wish. See the "man authbind" for information on configuring
+ authbind.
+
+NEWS:
+
+tomcat6 (6.0.20-dfsg1-2) unstable; urgency=low
+
+ * The tomcat6 package no longer uses the jsvc native service runner.
+ Instead, by default, the init script invokes the catalina.sh
+ script, and Tomcat does not attempt to open any server sockets on
+ ports below 1024. If you configure your Tomcat to listen on one
+ or more privileged ports (such as port 80 or port 443), then you
+ may now enable authbind in your /etc/default/tomcat6 file. The
+ authbind package can allow your Tomcat JVM user (a non-root user)
+ to listen on privileged ports. Set AUTHBIND="yes" to enable it,
+ and then configure your Tomcat to listen on any port number you
+ wish. See the "man authbind" for information on configuring
+ authbind.
+ * The Tomcat security manager is now disabled by default. Previous
+ versions of this package enabled the Tomcat security manager by
+ default. A large number of users reported exceptions where the
+ root cause was that the security manager was enabled by default.
+ In nearly all of these cases, the users are unfamiliar with the
+ Java security manager, and are not interested in trying to define
+ security manager rules for their webapps -- they just want it to
+ run. Disabling the security manager fixes it for them. Today,
+ most Tomcat users run Tomcat with the security manager disabled.
+ Those who intentionally enable it are the minority, and they tend
+ to know how it works. If you are currently using the security
+ manager, and would like to continue using it after upgrading to
+ tomcat6-6.0.20-10 or higher, edit your /etc/default/tomcat6 file
+ and set TOMCAT6_SECURITY="yes".
+
+ -- Jason Brittain <jason.brittain at mulesoft.com> Thu, 28 Jan 2010 17:15:03 +0000
+
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:
Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/changelog 2010-02-02 22:57:33 UTC (rev 11496)
@@ -1,5 +1,22 @@
-tomcat6 (6.0.20-10) unstable; urgency=low
+tomcat6 (6.0.24-1) UNRELEASED; urgency=low
+ * New upstream version
+ * Bump up Standards-Version to 3.8.4
+ * Refresh patches deploy-webapps-build-xml.patch and var_loaders.patch
+ * Remove patch fix_context_name.patch as it has been applied upstream
+ * Fix the installation of servlet-api-2.5.jar: the jar
+ goes to /usr/share/java as in older versions (6.0.20-2)
+ and links to the jar are added to /usr/share/maven-repo
+ * Moved NEWS.Debian into README.Debian
+ * Add a link from /usr/share/doc/tomcat6-common/README.Debian to
+ /usr/share/doc/tomcat6/README.Debian to include a minimum of
+ documentation in the tomcat6 package and add some useful notes.
+ (Closes: #563937, #563939)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 31 Jan 2010 23:06:51 +0100
+
+tomcat6 (6.0.20-dfsg1-2) unstable; urgency=low
+
* JSVC is no longer used by the package. Instead, the init script invokes
the stock catalina.sh script.
* Authbind is now the standard method for binding Tomcat to ports lower
Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/control 2010-02-02 22:57:33 UTC (rev 11496)
@@ -7,7 +7,7 @@
Niels Thykier <niels at thykier.net>
Build-Depends: default-jdk, ant-optional, debhelper (>= 7)
Build-Depends-Indep: maven-repo-helper, libecj-java
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://tomcat.apache.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat6/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat6/
@@ -40,6 +40,7 @@
This package just contains the startup scripts for the system-wide daemon.
No documentation or web applications are included here, please install
the tomcat6-docs and tomcat6-examples packages if you want them.
+ Install the authbind package if you need to use Tomcat on ports 0-1024
Package: tomcat6-user
Architecture: all
Modified: trunk/tomcat6/debian/patches/deploy-webapps-build-xml.patch
===================================================================
--- trunk/tomcat6/debian/patches/deploy-webapps-build-xml.patch 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/patches/deploy-webapps-build-xml.patch 2010-02-02 22:57:33 UTC (rev 11496)
@@ -1,17 +1,15 @@
-Index: tomcat6-6.0.20/build.xml
-===================================================================
---- tomcat6-6.0.20.orig/build.xml 2009-05-14 01:15:28.000000000 +0200
-+++ tomcat6-6.0.20/build.xml 2009-06-05 23:35:46.000000000 +0200
-@@ -437,7 +437,7 @@
+--- a/build.xml
++++ b/build.xml
+@@ -494,7 +494,7 @@
building a tomcat release.</echo>
</target>
-
+
- <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+ <target name="deploy" depends="build-only,build-docs,warn.dbcp,deploy-webapps">
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
file="${tomcat-native.tar.gz}" />
-@@ -463,6 +463,13 @@
+@@ -530,6 +530,13 @@
</fileset>
</copy>
@@ -25,11 +23,11 @@
<!-- Copy other regular webapps -->
<copy todir="${tomcat.build}/webapps">
<fileset dir="webapps">
-@@ -576,10 +583,6 @@
+@@ -654,10 +661,6 @@
</fileset>
</txt2html>
-- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
-
Deleted: trunk/tomcat6/debian/patches/fix_context_name.patch
===================================================================
--- trunk/tomcat6/debian/patches/fix_context_name.patch 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/patches/fix_context_name.patch 2010-02-02 22:57:33 UTC (rev 11496)
@@ -1,86 +0,0 @@
-From: Mark Thomas <markt at apache.org>
-Subject: In config file, Service and engine names must match
-"
- That looks to be a side effect of the fix for 42707.
-
- Having the names the same won't cause any problems. In fact it helps make sure
- JMX works as expected.
-
- As has been said previously, we really need to combine service and engine. That
- is too big a change for 6.0.x but we should be able to do it for 7. For 6.0.x,
- the best we can do is add something to the docs.
-"
-
-This has been fixed in trunk and will be in 6.0.21
-
-Origin: upstream, http://svn.apache.org/viewvc?view=rev&revision=783305
-Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=47316
-
---- a/java/org/apache/catalina/connector/Connector.java
-+++ b/java/org/apache/catalina/connector/Connector.java
-@@ -263,7 +263,7 @@
- /**
- * Mapper listener.
- */
-- protected MapperListener mapperListener = new MapperListener(mapper);
-+ protected MapperListener mapperListener = new MapperListener(mapper, this);
-
-
- /**
---- a/java/org/apache/catalina/connector/MapperListener.java
-+++ b/java/org/apache/catalina/connector/MapperListener.java
-@@ -29,7 +29,6 @@
- import org.apache.catalina.ContainerEvent;
- import org.apache.catalina.ContainerListener;
- import org.apache.catalina.Host;
--import org.apache.catalina.ServerFactory;
- import org.apache.catalina.core.StandardContext;
- import org.apache.juli.logging.Log;
- import org.apache.juli.logging.LogFactory;
-@@ -62,6 +61,11 @@
- * Associated mapper.
- */
- protected Mapper mapper = null;
-+
-+ /**
-+ * Associated connector.
-+ */
-+ protected Connector connector = null;
-
- /**
- * MBean server.
-@@ -85,8 +89,9 @@
- /**
- * Create mapper listener.
- */
-- public MapperListener(Mapper mapper) {
-+ public MapperListener(Mapper mapper, Connector connector) {
- this.mapper = mapper;
-+ this.connector = connector;
- }
-
-
-@@ -329,9 +334,9 @@
- String name=objectName.getKeyProperty("host");
- if( name != null ) {
-
-- Host host = (Host) ServerFactory.getServer().findService(
-- domain).getContainer().findChild(name);
--
-+ Host host =
-+ (Host) connector.getService().getContainer().findChild(name);
-+
- String[] aliases = host.findAliases();
- mapper.addHost(name, aliases, objectName);
- host.addContainerListener(this);
-@@ -349,8 +354,8 @@
- throws Exception {
- String name=objectName.getKeyProperty("host");
- if( name != null ) {
-- Host host = (Host) ServerFactory.getServer().findService(
-- domain).getContainer().findChild(name);
-+ Host host =
-+ (Host) connector.getService().getContainer().findChild(name);
-
- mapper.removeHost(name);
- host.removeContainerListener(this);
Modified: trunk/tomcat6/debian/patches/jsp-api-OSGi.patch
===================================================================
--- trunk/tomcat6/debian/patches/jsp-api-OSGi.patch 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/patches/jsp-api-OSGi.patch 2010-02-02 22:57:33 UTC (rev 11496)
@@ -1,7 +1,7 @@
Description: Adds OSGi metadata needed by eclipse.
---- a/res/jsp-api.jar.manifest 2009-12-10 10:55:17.285283489 +0100
-+++ b/res/jsp-api.jar.manifest 2009-12-10 10:59:35.397771728 +0100
+--- a/res/META-INF/jsp-api.jar.manifest 2009-12-10 10:55:17.285283489 +0100
++++ b/res/META-INF/jsp-api.jar.manifest 2009-12-10 10:59:35.397771728 +0100
@@ -1,4 +1,16 @@
Manifest-version: 1.0
+Import-Package: javax.servlet; version=2.5,javax.servlet.http; version
Modified: trunk/tomcat6/debian/patches/series
===================================================================
--- trunk/tomcat6/debian/patches/series 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/patches/series 2010-02-02 22:57:33 UTC (rev 11496)
@@ -3,6 +3,5 @@
deploy-webapps-build-xml.patch
use-commons-dbcp.patch
var_loaders.patch
-fix_context_name.patch
servlet-api-OSGi.patch
jsp-api-OSGi.patch
Modified: trunk/tomcat6/debian/patches/servlet-api-OSGi.patch
===================================================================
--- trunk/tomcat6/debian/patches/servlet-api-OSGi.patch 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/patches/servlet-api-OSGi.patch 2010-02-02 22:57:33 UTC (rev 11496)
@@ -1,7 +1,7 @@
Description: Adds OSGi metadata needed by eclipse.
---- a/res/servlet-api.jar.manifest 2009-12-10 10:54:48.529282255 +0100
-+++ b/res/servlet-api.jar.manifest 2009-12-10 11:00:11.230145721 +0100
+--- a/res/META-INF/servlet-api.jar.manifest 2009-12-10 10:54:48.529282255 +0100
++++ b/res/META-INF/servlet-api.jar.manifest 2009-12-10 11:00:11.230145721 +0100
@@ -1,4 +1,13 @@
Manifest-version: 1.0
+Bundle-ManifestVersion: 2
Modified: trunk/tomcat6/debian/patches/var_loaders.patch
===================================================================
--- trunk/tomcat6/debian/patches/var_loaders.patch 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/patches/var_loaders.patch 2010-02-02 22:57:33 UTC (rev 11496)
@@ -4,8 +4,8 @@
# "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
+-common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar
++common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${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"
Modified: trunk/tomcat6/debian/poms/annotations-api.pom
===================================================================
--- trunk/tomcat6/debian/poms/annotations-api.pom 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/poms/annotations-api.pom 2010-02-02 22:57:33 UTC (rev 11496)
@@ -19,6 +19,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat</groupId>
<artifactId>annotations-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<description>Annotations Package</description>
</project>
\ No newline at end of file
Modified: trunk/tomcat6/debian/poms/catalina-ha.pom
===================================================================
--- trunk/tomcat6/debian/poms/catalina-ha.pom 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/poms/catalina-ha.pom 2010-02-02 22:57:33 UTC (rev 11496)
@@ -19,37 +19,37 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina-ha</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<description>Tomcat High Availability Implementation</description>
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>coyote</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>servlet-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tribes</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/tomcat6/debian/poms/catalina-tribes.pom
===================================================================
--- trunk/tomcat6/debian/poms/catalina-tribes.pom 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/poms/catalina-tribes.pom 2010-02-02 22:57:33 UTC (rev 11496)
@@ -19,13 +19,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat</groupId>
<artifactId>tribes</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<description>Tomcat Group Communication Package</description>
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/tomcat6/debian/poms/catalina.pom
===================================================================
--- trunk/tomcat6/debian/poms/catalina.pom 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/poms/catalina.pom 2010-02-02 22:57:33 UTC (rev 11496)
@@ -19,33 +19,33 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<description>Tomcat Servlet Engine Core Classes and Standard implementations</description>
<dependencies>
<!--
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>coyote</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
-->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>servlet-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>annotations-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/tomcat6/debian/poms/jasper-el.pom
===================================================================
--- trunk/tomcat6/debian/poms/jasper-el.pom 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/poms/jasper-el.pom 2010-02-02 22:57:33 UTC (rev 11496)
@@ -19,13 +19,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-el</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<description>Jasper Expression Language Impl</description>
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>el-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/tomcat6/debian/poms/jasper.pom
===================================================================
--- trunk/tomcat6/debian/poms/jasper.pom 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/poms/jasper.pom 2010-02-02 22:57:33 UTC (rev 11496)
@@ -19,49 +19,49 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<description>Tomcats JSP Parser</description>
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>servlet-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jsp-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>el-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-jdt</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper-el</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/tomcat6/debian/poms/juli.pom
===================================================================
--- trunk/tomcat6/debian/poms/juli.pom 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/poms/juli.pom 2010-02-02 22:57:33 UTC (rev 11496)
@@ -19,6 +19,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<description>Tomcat Core Logging Package</description>
</project>
Modified: trunk/tomcat6/debian/poms/tomcat-coyote.pom
===================================================================
--- trunk/tomcat6/debian/poms/tomcat-coyote.pom 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/poms/tomcat-coyote.pom 2010-02-02 22:57:33 UTC (rev 11496)
@@ -19,25 +19,25 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tomcat</groupId>
<artifactId>coyote</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<description>Tomcat Connectors and HTTP parser</description>
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>servlet-api</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.20</version>
+ <version>6.0.24</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: trunk/tomcat6/debian/rules
===================================================================
--- trunk/tomcat6/debian/rules 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/rules 2010-02-02 22:57:33 UTC (rev 11496)
@@ -89,9 +89,9 @@
dh_install --exclude=.bat --exclude=Thumbs.db
dh_link
mh_installpoms -plibservlet2.5-java
- mh_installjar -plibservlet2.5-java debian/poms/servlet-api.pom output/build/lib/servlet-api.jar /usr/share/java/servlet-api-2.5.jar
- mh_installjar -plibservlet2.5-java debian/poms/jsp-api.pom output/build/lib/jsp-api.jar /usr/share/java/jsp-api-2.1.jar
- mh_installjar -plibservlet2.5-java debian/poms/el-api.pom output/build/lib/el-api.jar /usr/share/java/el-api-2.1.jar
+ mh_installjar -plibservlet2.5-java -l -s debian/poms/servlet-api.pom output/build/lib/servlet-api.jar
+ mh_installjar -plibservlet2.5-java -l -s debian/poms/jsp-api.pom output/build/lib/jsp-api.jar
+ mh_installjar -plibservlet2.5-java -l -s debian/poms/el-api.pom output/build/lib/el-api.jar
chmod a+x debian/tomcat6-common/usr/share/tomcat6/bin/*.sh
chmod a+x debian/tomcat6-user/usr/bin/tomcat6-instance-create
chmod a+x debian/tomcat6-user/usr/share/tomcat6/skel/bin/*.sh
Modified: trunk/tomcat6/debian/tomcat6-instance-create.1
===================================================================
--- trunk/tomcat6/debian/tomcat6-instance-create.1 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/tomcat6-instance-create.1 2010-02-02 22:57:33 UTC (rev 11496)
@@ -1,4 +1,4 @@
-.TH "TOMCAT6-INSTANCE-CREATE" "1" "Dec 2008" "" ""
+.TH "TOMCAT6-INSTANCE-CREATE" "2" "Feb 2010" "" ""
.SH "NAME"
tomcat6\-instance\-create \- creates a Tomcat6 instance
.SH "SYNOPSIS"
Modified: trunk/tomcat6/debian/tomcat6.links
===================================================================
--- trunk/tomcat6/debian/tomcat6.links 2010-02-02 19:21:43 UTC (rev 11495)
+++ trunk/tomcat6/debian/tomcat6.links 2010-02-02 22:57:33 UTC (rev 11496)
@@ -1,3 +1,4 @@
/etc/tomcat6 /var/lib/tomcat6/conf
/var/cache/tomcat6 /var/lib/tomcat6/work
/var/log/tomcat6 /var/lib/tomcat6/logs
+/usr/share/doc/tomcat6-common/README.Debian.gz /usr/share/doc/tomcat6/README.Debian.gz
More information about the pkg-java-commits
mailing list