[pkg-java] r10791 - in trunk/tomcat6/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sat Oct 10 19:42:28 UTC 2009
Author: drazzib
Date: 2009-10-10 19:42:28 +0000 (Sat, 10 Oct 2009)
New Revision: 10791
Added:
trunk/tomcat6/debian/libservlet2.5-java-doc.doc-base
trunk/tomcat6/debian/patches/fix_context_name.patch
Modified:
trunk/tomcat6/debian/changelog
trunk/tomcat6/debian/control
trunk/tomcat6/debian/copyright
trunk/tomcat6/debian/patches/series
Log:
* New patch fix_context_name.patch:
- Allow Service name != Engine name. Regression in fix for 42707.
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47316
- This has been fixed in trunk and will be in 6.0.21
* Register libservlet2.5-java-doc API with doc-base
* Fix short description of tomcat6-docs by using "documentation" suffix
Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog 2009-10-10 14:14:30 UTC (rev 10790)
+++ trunk/tomcat6/debian/changelog 2009-10-10 19:42:28 UTC (rev 10791)
@@ -1,3 +1,14 @@
+tomcat6 (6.0.20-7) unstable; urgency=low
+
+ * New patch fix_context_name.patch:
+ - Allow Service name != Engine name. Regression in fix for 42707.
+ Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47316
+ - This has been fixed in trunk and will be in 6.0.21
+ * Register libservlet2.5-java-doc API with doc-base
+ * Fix short description of tomcat6-docs by using "documentation" suffix
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 10 Oct 2009 21:41:55 +0200
+
tomcat6 (6.0.20-6) unstable; urgency=low
[ Ludovic Claude ]
Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control 2009-10-10 14:14:30 UTC (rev 10790)
+++ trunk/tomcat6/debian/control 2009-10-10 19:42:28 UTC (rev 10791)
@@ -2,13 +2,14 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-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>
+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>
Build-Depends: openjdk-6-jdk, ant-optional, debhelper (>= 7), quilt
Build-Depends-Indep: maven-repo-helper, libecj-java
Standards-Version: 3.8.3
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
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat6/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat6/
Package: tomcat6-common
Architecture: all
@@ -118,7 +119,7 @@
Section: doc
Architecture: all
Depends: tomcat6 (>= ${source:Version})
-Description: Servlet and JSP engine -- example web applications
+Description: Servlet and JSP engine -- documentation
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
specifications from Sun Microsystems, and provides a "pure Java" HTTP web
server environment for Java code to run. Tomcat 6 is the reference
Modified: trunk/tomcat6/debian/copyright
===================================================================
--- trunk/tomcat6/debian/copyright 2009-10-10 14:14:30 UTC (rev 10790)
+++ trunk/tomcat6/debian/copyright 2009-10-10 19:42:28 UTC (rev 10791)
@@ -132,7 +132,7 @@
On Debian GNU/Linux and Ubuntu systems, the complete text of the Apache 2.0
License can be found in the /usr/share/common-licenses/Apache-2.0 file.
-The Debian packaging is (C) 2008, Paul Cager <paul-debian at home.paulcager.org>
+The Debian packaging is Copyright (C) 2008, Paul Cager <paul-debian at home.paulcager.org>
and is licensed under the Apache License version 2.
Ubuntu full server stack repackaging is Copyright (C) 2008 Canonical Ltd.
Added: trunk/tomcat6/debian/libservlet2.5-java-doc.doc-base
===================================================================
--- trunk/tomcat6/debian/libservlet2.5-java-doc.doc-base (rev 0)
+++ trunk/tomcat6/debian/libservlet2.5-java-doc.doc-base 2009-10-10 19:42:28 UTC (rev 10791)
@@ -0,0 +1,10 @@
+Document: servlet25-api
+Title: Java Servlet 2.5 API Documentation
+Author: Apache Software Foundation
+Abstract: Javadoc documentation for Java Servlet 2.5 API.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libservlet2.5-java/api/index.html
+Files: /usr/share/doc/libservlet2.5-java/api/*
+
Added: trunk/tomcat6/debian/patches/fix_context_name.patch
===================================================================
--- trunk/tomcat6/debian/patches/fix_context_name.patch (rev 0)
+++ trunk/tomcat6/debian/patches/fix_context_name.patch 2009-10-10 19:42:28 UTC (rev 10791)
@@ -0,0 +1,86 @@
+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/series
===================================================================
--- trunk/tomcat6/debian/patches/series 2009-10-10 14:14:30 UTC (rev 10790)
+++ trunk/tomcat6/debian/patches/series 2009-10-10 19:42:28 UTC (rev 10791)
@@ -3,3 +3,4 @@
deploy-webapps-build-xml.patch
use-commons-dbcp.patch
var_loaders.patch
+fix_context_name.patch
More information about the pkg-java-commits
mailing list