CVS eclipse/debian/patches
Stephan Michels
tashiro-guest at haydn.debian.org
Mon Oct 24 19:47:46 UTC 2005
Update of /cvsroot/pkg-java/eclipse/debian/patches
In directory haydn:/tmp/cvs-serv21168/patches
Modified Files:
eclipse-tomcat5.dpatch
Added Files:
eclipse-disable-filelog.dpatch eclipse-disable-tomcat.dpatch
eclipse-gnuformatterjdtui.dpatch
eclipse-libswt-mozilla-classic.dpatch
eclipse-navtivepresentation.dpatch
eclipse-updatehomedir.dpatch
Removed Files:
z-eclipse-disable-filelog-notomcat.dpatch
z-eclipse-disable-filelog.dpatch z-tomcat-disabled.dpatch
Log Message:
Rebuild disable-filelog and tomcat patches.
Disable the disable-javadoc patch.
Add patch for gnuformatterjdtui, updatehomedir, libswt-mozilla-classic
and navtivepresentation.
--- /cvsroot/pkg-java/eclipse/debian/patches/eclipse-tomcat5.dpatch 2005/10/15 12:29:56 1.1
+++ /cvsroot/pkg-java/eclipse/debian/patches/eclipse-tomcat5.dpatch 2005/10/24 19:47:46 1.2
@@ -1,6 +1,8 @@
#! /bin/sh -e
##
-## DP: Debian specific patch, converted from eclipse-tomcat5.patch
+## DP: Fixes to compile the org.eclipse.tomcat plugins against Tomcat5
+## DP: instead of Tomcat4
+## DP: https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
@@ -11,481 +13,19 @@
fi
case "$1" in
-patch)
- patch $patch_opts -p0 < $0;;
+ patch $patch_opts -p0 < $0;;
-unpatch)
- patch $patch_opts -p0 -R < $0;;
+ patch $patch_opts -p0 -R < $0;;
*)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
esac
exit 0
@DPATCH@
-Index: .classpath
-===================================================================
-RCS file: /home/eclipse/org.eclipse.tomcat/.classpath,v
-retrieving revision 1.20
-diff -u -r1.20 .classpath
---- source-tree/plugins/org.eclipse.tomcat/.classpath 21 Apr 2005 23:31:58 -0000 1.20
-+++ source-tree/plugins/org.eclipse.tomcat/.classpath 14 Jun 2005 15:48:35 -0000
-@@ -1,29 +1,39 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <classpath>
- <classpathentry kind="src" path="src"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="catalina.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="bootstrap.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-beanutils.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-collections.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-digester.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-logging-api.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-modeler.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jakarta-regexp-1.3.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jasper-compiler.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jasper-runtime.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="mx4j-jmx.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-common.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-factory.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-resources.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlet.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-common.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-default.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-invoker.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-manager.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-coyote.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-http11.jar"/>
-- <classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-util.jar"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-+ <classpathentry kind="lib" path="bootstrap.jar"/>
-+ <classpathentry kind="lib" path="catalina.jar"/>
-+ <classpathentry kind="lib" path="catalina-optional.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-beanutils.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-collections.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-dbcp.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-digester.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-digester-rss.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-el.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-fileupload.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-launcher.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-logging.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-modeler.jar"/>
-+ <classpathentry kind="lib" path="jakarta-commons-pool.jar"/>
-+ <classpathentry kind="lib" path="jasper5-compiler.jar"/>
-+ <classpathentry kind="lib" path="jasper5-runtime.jar"/>
-+ <classpathentry kind="lib" path="jsp-api.jar"/>
-+ <classpathentry kind="lib" path="mx4j.jar"/>
-+ <classpathentry kind="lib" path="mx4j-impl.jar"/>
-+ <classpathentry kind="lib" path="mx4j-jmx.jar"/>
-+ <classpathentry kind="lib" path="naming-common.jar"/>
-+ <classpathentry kind="lib" path="naming-factory.jar"/>
-+ <classpathentry kind="lib" path="naming-java.jar"/>
-+ <classpathentry kind="lib" path="naming-resources.jar"/>
-+ <classpathentry kind="lib" path="servlet-api.jar"/>
-+ <classpathentry kind="lib" path="servlets-common.jar"/>
-+ <classpathentry kind="lib" path="servlets-default.jar"/>
-+ <classpathentry kind="lib" path="servlets-invoker.jar"/>
-+ <classpathentry kind="lib" path="tomcat-coyote.jar"/>
-+ <classpathentry kind="lib" path="tomcat-http11.jar"/>
-+ <classpathentry kind="lib" path="tomcat-util.jar"/>
-+ <classpathentry kind="lib" path="regexp.jar"/>
- <classpathentry kind="output" path="bin"/>
- </classpath>
-Index: about.html
-===================================================================
-RCS file: /home/eclipse/org.eclipse.tomcat/about.html,v
-retrieving revision 1.23
-diff -u -r1.23 about.html
---- source-tree/plugins/org.eclipse.tomcat/about.html 25 Feb 2005 18:17:04 -0000 1.23
-+++ source-tree/plugins/org.eclipse.tomcat/about.html 14 Jun 2005 19:13:47 -0000
-@@ -7,7 +7,7 @@
- <body lang="EN-US">
- <h2>About This Content</h2>
-
--<p>February 24, 2005</p>
-+<p>February 24, 2005 (modified June 14, 2005 with update to Tomcat 5.0.30)</p>
- <h3>License</h3>
-
- <p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-@@ -22,7 +22,7 @@
-
- <p>The Content includes items that have been sourced from third parties as follows:</p>
-
--<p><b>Tomcat 4.1.30</b></p>
-+<p><b>Tomcat 5.0.30</b></p>
- <p>The plug-in is based on software developed by The Apache Software Foundation as part of the Jakarta project. Therefore:</p>
-
- <blockquote>
-@@ -34,24 +34,31 @@
- <ul type="disc">
- <li>bootstrap.jar</li>
- <li>catalina.jar</li>
-- <li>commons-beanutils.jar</li>
-- <li>commons-collections.jar</li>
-- <li>commons-digester.jar</li>
-- <li>commons-logging.jar</li>
-- <li>commons-logging-api.jar</li>
-- <li>commons-modeler.jar</li>
-- <li>jakarta-regexp-1.3.jar</li>
-- <li>jasper-compiler.jar</li>
-- <li>jasper-runtime.jar</li>
-+ <li>catalina-optional.jar</li>
-+ <li>jakarta-commons-beanutils.jar</li>
-+ <li>jakarta-commons-collections.jar</li>
-+ <li>jakarta-commons-dbcp.jar</li>
-+ <li>jakarta-commons-digester.jar</li>
-+ <li>jakarta-commons-digester-rss.jar</li>
-+ <li>jakarta-commons-el.jar</li>
-+ <li>jakarta-commons-fileupload.jar</li>
-+ <li>jakarta-commons-launcher.jar</li>
-+ <li>jakarta-commons-logging.jar</li>
-+ <li>jakarta-commons-modeler.jar</li>
-+ <li>jakarta-commons-pool.jar</li>
-+ <li>jasper5-compiler.jar</li>
-+ <li>jasper5-runtime.jar</li>
-+ <li>mx4j.jar</li>
-+ <li>mx4j-impl.jar</li>
- <li>mx4j-jmx.jar</li>
- <li>naming-common.jar</li>
- <li>naming-factory.jar</li>
- <li>naming-resources.jar</li>
-- <li>servlet.jar</li>
-+ <li>regexp.jar</li>
-+ <li>servlet-api.jar</li>
- <li>servlets-common.jar</li>
- <li>servlets-default.jar</li>
- <li>servlets-invoker.jar</li>
-- <li>servlets-manager.jar</li>
- <li>tomcat-coyote.jar</li>
- <li>tomcat-http11.jar</li>
- <li>tomcat-util.jar</li>
-@@ -65,10 +72,10 @@
-
- <p>Tomcat is:</p>
-
--<blockquote>Copyright (c) 1999, 2000 The Apache Software Foundation. All rights reserved.</blockquote>
-+<blockquote>Copyright (c) 1999-2003 The Apache Software Foundation. All rights reserved.</blockquote>
-
--<p>Your use of the Tomcat code is subject to the terms and conditions of the Apache Software License 1.1 which is available at
--<a href="http://www.apache.org/licenses/LICENSE-1.1">http://www.apache.org/licenses/LICENSE-1.1</a>. More specifically:</p>
-+<p>Your use of the Tomcat code is subject to the terms and conditions of the Apache Software License 2.0 which is available at
-+<a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>. More specifically:</p>
- <blockquote>
- 1. Redistributions of source code must retain the above copyright notice, this list of<br>
- conditions and the following disclaimer.<br>
-@@ -106,11 +113,11 @@
-
- <p>Source code for Tomcat is available at <a href="http://jakarta.apache.org/tomcat/">http://jakarta.apache.org/tomcat/</a>.</p>
-
--<strong>MX4J 1.1.1</strong>
-+<strong>MX4J 2.1.0</strong>
-
--<p></p>Tomcat 4.1.30 includes mx4j-jmx.jar from MX4J 1.1.1. MX4J is:</p>
-+<p></p>Tomcat 5.0.30 includes mx4j.jar, mx4j-jmx.jar and mx4j-impl.jar from MX4J 2.1.0. MX4J is:</p>
-
--<blockquote>Copyright (c) 2001 MX4J. All rights reserved.</blockquote>
-+<blockquote>Copyright (c) 2001-2004 MX4J contributors. All rights reserved.</blockquote>
-
- <p>Your use of the MX4J code is subject to the terms and conditions of the MX4J License, Version 1.0, a copy of which is included
- with the Content in the file <a href="mx4j.license">mx4j.license</a>. More specifically: </p>
-Index: META-INF/MANIFEST.MF
-===================================================================
-RCS file: /home/eclipse/org.eclipse.tomcat/META-INF/MANIFEST.MF,v
-retrieving revision 1.14
-diff -u -r1.14 MANIFEST.MF
---- source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 19 May 2005 04:05:11 -0000 1.14
-+++ source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 14 Jun 2005 15:48:41 -0000
-@@ -2,30 +2,7 @@
- Bundle-ManifestVersion: 2
- Bundle-Name: %pluginName
- Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
--Bundle-Version: 4.1.30.1
--Bundle-ClassPath: tomcatwrapper.jar,
-- catalina.jar,
-- bootstrap.jar,
-- commons-beanutils.jar,
-- commons-collections.jar,
-- commons-digester.jar,
-- commons-logging-api.jar,
-- commons-modeler.jar,
-- jakarta-regexp-1.3.jar,
-- jasper-compiler.jar,
-- jasper-runtime.jar,
-- mx4j-jmx.jar,
-- naming-common.jar,
-- naming-factory.jar,
-- naming-resources.jar,
-- servlet.jar,
-- servlets-common.jar,
-- servlets-default.jar,
-- servlets-invoker.jar,
-- servlets-manager.jar,
-- tomcat-coyote.jar,
-- tomcat-http11.jar,
-- tomcat-util.jar
-+Bundle-Version: 5.0.30
- Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
- Bundle-Vendor: %providerName
- Bundle-Localization: plugin
-@@ -54,8 +31,6 @@
- mx4j.util;x-internal:=true,
- org.apache.catalina;x-internal:=true,
- org.apache.catalina.connector;x-internal:=true,
-- org.apache.catalina.connector.http;x-internal:=true,
-- org.apache.catalina.connector.http10;x-internal:=true,
- org.apache.catalina.realm;x-internal:=true,
- org.apache.catalina.servlets;x-internal:=true,
- org.apache.commons.beanutils;x-internal:=true,
-@@ -79,10 +54,9 @@
- org.apache.coyote.http11;x-internal:=true,
- org.apache.coyote.http11.filters;x-internal:=true,
- org.apache.coyote.memory;x-internal:=true,
-- org.apache.coyote.tomcat4;x-internal:=true,
-+ org.apache.coyote.tomcat5;x-internal:=true,
- org.apache.jasper;x-internal:=true,
- org.apache.jasper.compiler;x-internal:=true,
-- org.apache.jasper.logging;x-internal:=true,
- org.apache.jasper.runtime;x-internal:=true,
- org.apache.jasper.servlet;x-internal:=true,
- org.apache.jasper.util;x-internal:=true,
-@@ -96,14 +70,45 @@
- org.apache.tomcat.util.buf;x-internal:=true,
- org.apache.tomcat.util.collections;x-internal:=true,
- org.apache.tomcat.util.compat;x-internal:=true,
-- org.apache.tomcat.util.handler;x-internal:=true,
- org.apache.tomcat.util.http;x-internal:=true,
- org.apache.tomcat.util.http.mapper;x-internal:=true,
- org.apache.tomcat.util.log;x-internal:=true,
-- org.apache.tomcat.util.mx;x-internal:=true,
- org.apache.tomcat.util.net;x-internal:=true,
- org.apache.tomcat.util.net.jsse;x-internal:=true,
- org.apache.tomcat.util.res;x-internal:=true,
- org.apache.tomcat.util.threads;x-internal:=true,
- org.eclipse.tomcat.internal;x-internal:=true,
- org.eclipse.tomcat.internal.extensions;x-internal:=true
-+Bundle-ClassPath: tomcatwrapper.jar,
-+ bootstrap.jar,
-+ catalina.jar,
-+ catalina-optional.jar,
-+ jakarta-commons-beanutils.jar,
-+ jakarta-commons-collections.jar,
-+ jakarta-commons-dbcp.jar,
-+ jakarta-commons-digester.jar,
-+ jakarta-commons-digester-rss.jar,
-+ jakarta-commons-el.jar,
-+ jakarta-commons-fileupload.jar,
-+ jakarta-commons-launcher.jar,
-+ jakarta-commons-logging.jar,
-+ jakarta-commons-modeler.jar,
-+ jakarta-commons-pool.jar,
-+ jasper-compiler.jar,
-+ jasper-runtime.jar,
-+ jsp-api.jar,
-+ mx4j.jar,
-+ mx4j-impl.jar,
-+ mx4j-jmx.jar,
-+ naming-common.jar,
-+ naming-factory.jar,
-+ naming-java.jar,
-+ naming-resources.jar,
-+ regexp.jar,
-+ servlet-api.jar,
-+ servlets-common.jar,
-+ servlets-default.jar,
-+ servlets-invoker.jar,
-+ tomcat-coyote.jar,
-+ tomcat-http11.jar,
-+ tomcat-util.jar
-Index: src/org/eclipse/tomcat/internal/TomcatAppServer.java
-===================================================================
-RCS file: /home/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java,v
-retrieving revision 1.42
-diff -u -r1.42 TomcatAppServer.java
---- source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java 23 May 2005 03:58:30 -0000 1.42
-+++ source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java 14 Jun 2005 15:48:41 -0000
-@@ -30,8 +30,8 @@
- import org.apache.catalina.logger.FileLogger;
- import org.apache.catalina.realm.MemoryRealm;
- import org.apache.catalina.startup.Embedded;
--import org.apache.coyote.tomcat4.CoyoteConnector;
--import org.apache.coyote.tomcat4.CoyoteServerSocketFactory;
-+import org.apache.coyote.tomcat5.CoyoteConnector;
-+import org.apache.coyote.tomcat5.CoyoteServerSocketFactory;
- import org.eclipse.core.runtime.CoreException;
- import org.eclipse.core.runtime.IConfigurationElement;
- import org.eclipse.core.runtime.IExtension;
-@@ -120,9 +120,6 @@
- embedded.setRealm(realm);
- }
-
-- // start now, and then add all the contexts..
-- embedded.start();
--
- // Create a very basic container hierarchy
- engine = embedded.createEngine();
-
-@@ -136,18 +133,7 @@
- .setErrorReportValveClass("org.eclipse.tomcat.internal.EclipseErrorReportValve"); //$NON-NLS-1$
- }
- engine.addChild(host);
--
-- // Install the assembled container hierarchy
-- PrintStream sysOut = System.out;
-- // reassign standard output to prevent Tomcat from writing
-- // its version message there.
-- System.setOut(new PrintStream(new ByteArrayOutputStream()));
-- try {
-- embedded.addEngine(engine);
-- } finally {
-- System.setOut(sysOut);
-- }
--
-+
- // Root context
- Context root = embedded.createContext("", home + "/webapps/ROOT"); //$NON-NLS-1$ //$NON-NLS-2$
- // this line should be replaced once tomcat provides support
-@@ -156,12 +142,25 @@
- ((StandardContext) root)
- .setWorkDir(getWorkingDirectory("ROOT")); //$NON-NLS-1$
- }
-+
- root.setLoader(embedded.createLoader(this.getClass()
- .getClassLoader()));
- contexts.add(root);
- host.addChild(root);
--
-+
-+ // Install the assembled container hierarchy
-+ PrintStream sysOut = System.out;
-+ // reassign standard output to prevent Tomcat from writing
-+ // its version message there.
-+ System.setOut(new PrintStream(new ByteArrayOutputStream()));
-+ try {
-+ embedded.addEngine(engine);
-+ } finally {
-+ System.setOut(sysOut);
-+ }
-+
- InetAddress iAddress = null;
-+
- if (this.hostAddress != null) {
- try {
- iAddress = InetAddress.getByName(this.hostAddress);
-@@ -169,6 +168,7 @@
- // will default to all interfaces
- }
- }
-+
- updateSslPort(iAddress);
- if (this.port == 0) {
- this.port = SocketUtil.findUnusedLocalPort(iAddress); //$NON-NLS-1$
-@@ -183,9 +183,17 @@
- }
- }
-
-+ if (this.sslPort > 0) {
-+ createSSLConnector(iAddress, this.sslPort);
-+ }
-+
-+ // if null passed for hostAddress, use local host
-+ if (this.hostAddress == null) {
-+ this.hostAddress = "127.0.0.1"; //$NON-NLS-1$
-+ }
-+
[595 lines skipped]
More information about the pkg-java-commits
mailing list