Author: mkoch
Date: 2008-05-08 14:56:25 +0000 (Thu, 08 May 2008)
New Revision: 6430
Modified:
trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch
trunk/eclipse/debian/patches/eclipse-tomcat55.dpatch
Log:
update patch for eclipse 3.3
Modified: trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch 2008-05-08
14:55:19 UTC (rev 6429)
+++ trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch 2008-05-08
14:56:25 UTC (rev 6430)
@@ -23,65 +23,54 @@
--- source-tree/plugins/org.eclipse.tomcat/build.xml.orig 2006-07-05
12:47:26.000000000 -0400
+++ source-tree/plugins/org.eclipse.tomcat/build.xml 2006-07-05
12:50:49.000000000 -0400
-+@@ -58,7 +58,7 @@
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder"
value="${temp.folder}/"/>
- </antcall>
-- <zip
destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar"
basedir="${temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"
-filesonly="false" whenempty="skip" update="false"/>
-+ <zip
destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.jar"
basedir="${temp.folder}/org.eclipse.tomcat_5.5.17" filesonly="false"
-whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
-@@ -144,50 +144,56 @@
- <pathelement
path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
- <pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
- <pathelement
path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.jar"/>
+@@ -144,50 +144,64 @@
+ <pathelement
path="../org.apache.ant_1.7.0.v200706080842/lib/ant-swing.jar"/>
+ <pathelement
path="../org.apache.ant_1.7.0.v200706080842/lib/ant-trax.jar"/>
+ <pathelement
path="../org.apache.ant_1.7.0.v200706080842/lib/ant-weblogic.jar"/>
- <pathelement path="catalina.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/catalina.jar"/>
- <pathelement path="bootstrap.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/bootstrap.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/bootstrap.jar"/>
- <pathelement path="commons-beanutils.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/commons-beanutils.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-beanutils.jar"/>
- <pathelement path="commons-collections.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/commons-collections.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-collections.jar"/>
- <pathelement path="commons-digester.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/commons-digester.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-digester.jar"/>
- <pathelement path="commons-logging-api.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/commons-logging-api.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-logging-api.jar"/>
- <pathelement path="commons-modeler.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/commons-modeler.jar"/>
- <pathelement path="jakarta-regexp-1.3.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/jakarta-regexp-1.3.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jakarta-regexp-1.3.jar"/>
- <pathelement path="jasper-compiler.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/jasper-compiler.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jasper-compiler.jar"/>
- <pathelement path="jasper-runtime.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/jasper-runtime.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/jasper-runtime.jar"/>
- <pathelement path="mx4j-jmx.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/mx4j-jmx.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/mx4j-jmx.jar"/>
- <pathelement path="naming-common.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/naming-common.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-common.jar"/>
- <pathelement path="naming-factory.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/naming-factory.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-factory.jar"/>
- <pathelement path="naming-resources.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/naming-resources.jar"/>
- <pathelement path="servlet.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/servlet.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlet.jar"/>
- <pathelement path="servlets-common.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/servlets-common.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-common.jar"/>
- <pathelement path="servlets-default.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/servlets-default.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-default.jar"/>
- <pathelement path="servlets-invoker.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/servlets-invoker.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-invoker.jar"/>
- <pathelement path="servlets-manager.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/servlets-manager.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/servlets-manager.jar"/>
- <pathelement path="tomcat-coyote.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/tomcat-coyote.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-coyote.jar"/>
- <pathelement path="tomcat-http11.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http11.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-http11.jar"/>
- <pathelement path="tomcat-util.jar"/>
-- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/tomcat-util.jar"/>
+- <pathelement
path="${build.result.folder}/../org.eclipse.tomcat_4.1.230.v20070531/tomcat-util.jar"/>
+ <pathelement path="lib/catalina.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina.jar"/>
+ <pathelement path="lib/catalina-optional.jar"/>
@@ -90,20 +79,28 @@
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-beanutils.jar"/>
+ <pathelement path="lib/commons-collections.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-collections.jar"/>
++ <pathelement path="lib/commons-dbcp.jar"/>
++ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-dbcp.jar"/>
+ <pathelement path="lib/commons-digester.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester.jar"/>
+ <pathelement path="lib/commons-digester-rss.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-digester-rss.jar"/>
+ <pathelement path="lib/commons-el.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-el.jar"/>
++ <pathelement path="lib/commons-fileupload.jar"/>
++ <pathelement
path="lib/${build.result.folder}/../org.eclipse.tomcat/lib/commons-fileupload.jar"/>
++ <pathelement path="lib/commons-launcher.jar"/>
++ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-launcher.jar"/>
+ <pathelement path="lib/commons-logging-api.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-logging-api.jar"/>
+ <pathelement path="lib/commons-modeler.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-modeler.jar"/>
-+ <pathelement path="lib/jasper-compiler.jar"/>
-+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-compiler.jar"/>
-+ <pathelement path="lib/jasper-runtime.jar"/>
-+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
++ <pathelement path="lib/commons-pool.jar"/>
++ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/commons-pool.jar"/>
++ <pathelement path="lib/jasper5-compiler.jar"/>
++ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper5-compiler.jar"/>
++ <pathelement path="lib/jasper5-runtime.jar"/>
++ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/jasper5-runtime.jar"/>
+ <pathelement path="lib/jmx.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/jmx.jar"/>
+ <pathelement path="lib/mx4j.jar"/>
@@ -112,8 +109,8 @@
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-impl.jar"/>
+ <pathelement path="lib/mx4j-jmx.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-jmx.jar"/>
-+ <pathelement path="lib/jsp-api.jar"/>
-+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/jsp-api.jar"/>
++ <pathelement path="lib/jspapi.jar"/>
++ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/jspapi.jar"/>
+ <pathelement path="lib/naming-factory.jar"/>
+ <pathelement
path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-factory.jar"/>
+ <pathelement path="lib/naming-resources.jar"/>
@@ -135,72 +132,3 @@
</path>
<!-- compile the source code -->
<javac destdir="${temp.folder}/tomcatwrapper.jar.bin"
failonerror="${javacFailOnError}" verbose="${javacVerbose}"
debug="${javacDebugInfo}" includeAntRuntime="no"
bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}"
target="${bundleJavacTarget}" >
-@@ -224,37 +224,37 @@
- </target>
-
- <target name="gather.bin.parts" depends="init"
if="destination.temp.folder">
-- <mkdir
dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
-- <copy
todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"
failonerror="true" overwrite="false">
-+ <mkdir
dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17"/>
-+ <copy
todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17" failonerror="true"
overwrite="false">
- <fileset dir="${build.result.folder}"
includes="tomcatwrapper.jar" />
- </copy>
-- <copy
todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"
failonerror="true" overwrite="false">
-+ <copy
todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17" failonerror="true"
overwrite="false">
- <fileset dir="${basedir}"
includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,META-INF/,about_files/"
/>
- </copy>
-- <eclipse.versionReplacer
path="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"
version="4.1.130.v20060601"/>
-+ <eclipse.versionReplacer
path="${destination.temp.folder}/org.eclipse.tomcat_5.5.17" version="5.5.17"/>
- </target>
-
- <target name="build.zips" depends="init">
- </target>
-
- <target name="gather.sources" depends="init"
if="destination.temp.folder">
-- <mkdir
dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
-- <copy file="${build.result.folder}/tomcatwrappersrc.zip"
todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"
failonerror="false" overwrite="false"/>
-- <copy
todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"
failonerror="false" overwrite="false">
-+ <mkdir
dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17"/>
-+ <copy file="${build.result.folder}/tomcatwrappersrc.zip"
todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17"
failonerror="false" overwrite="false"/>
-+ <copy
todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17"
failonerror="false" overwrite="false">
- <fileset dir="${basedir}"
includes="about.html,*.license" />
- </copy>
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
-- <mkdir
dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
-- <copy
file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}"
todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"
failonerror="false" overwrite="false"/>
-+ <mkdir
dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17"/>
-+ <copy
file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}"
todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17"
failonerror="false" overwrite="false"/>
- </target>
-
- <target name="clean" depends="init" description="Clean the plug-in:
org.eclipse.tomcat of all the zips, jars and logs created.">
- <delete file="${build.result.folder}/tomcatwrapper.jar"/>
- <delete file="${build.result.folder}/tomcatwrappersrc.zip"/>
-- <delete
file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar"/>
-- <delete
file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"/>
-+ <delete
file="${plugin.destination}/org.eclipse.tomcat_5.5.17.jar"/>
-+ <delete
file="${plugin.destination}/org.eclipse.tomcat_5.5.17.zip"/>
- <delete dir="${temp.folder}"/>
- </target>
-
-@@ -277,7 +277,7 @@
- <delete>
- <fileset dir="${temp.folder}"
includes="**/*.bin${logExtension}" />
- </delete>
-- <zip
destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"
basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-+ <zip
destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.zip"
basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
---- source-tree/features/org.eclipse.platform/build.xml.orig 2007-03-21
00:28:21.000000000 +0100
-+++ source-tree/features/org.eclipse.platform/build.xml 2007-03-21
00:29:56.000000000 +0100
-@@ -376,7 +376,7 @@
- <copy
todir="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA"
failonerror="true" overwrite="false">
- <fileset dir="${basedir}"
includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html"
/>
- </copy>
-- <eclipse.idReplacer
featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml"
selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"
featureIds="org.eclipse.rcp,3.2.2.r322_v20070104-iwP0VLKnfFC923K,"
pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.2.R32x_v20061218,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.2.r322_v20070202,org.eclipse.help.webapp,3.2.2.R322_v20061114,org.eclipse.help.base,3.2.2.R322_v20061207,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.2.r322_v20070124,org.eclipse.platform,3.2.2.r322_v20070117b,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.2.M20061114,org.eclipse.team.cvs.core,3.2.2.M20061205,org.eclipse.team.cvs.ssh,3.2.1.M20061205,org.eclipse.team.cvs.ssh2,3.2.1.M20061205,org.eclipse.team.cvs.ui,3.2.2.M20061121,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.2.r322_v20070104,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.2.R322_v20061214,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.3.R32x_v20070118,org.eclipse.update.scheduler,3.2.2.R32x_v20061214,org.eclipse.update.ui,3.2.2.R32x_v20070111,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.2.R32x_v20061214,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/>
-+ <eclipse.idReplacer
featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml"
selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"
featureIds="org.eclipse.rcp,3.2.2.r322_v20070104-iwP0VLKnfFC923K,"
pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.2.R32x_v20061218,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.2.r322_v20070202,org.eclipse.help.webapp,3.2.2.R322_v20061114,org.eclipse.help.base,3.2.2.R322_v20061207,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.2.r322_v20070124,org.eclipse.platform,3.2.2.r322_v20070117b,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.2.M20061114,org.eclipse.team.cvs.core,3.2.2.M20061205,org.eclipse.team.cvs.ssh,3.2.1.M20061205,org.eclipse.team.cvs.ssh2,3.2.1.M20061205,org.eclipse.team.cvs.ui,3.2.2.M20061121,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,5.5.17,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.2.r322_v20070104,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.2.R322_v20061214,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.3.R32x_v20070118,org.eclipse.update.scheduler,3.2.2.R32x_v20061214,org.eclipse.update.ui,3.2.2.R32x_v20070111,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.2.R32x_v20061214,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/>
- <antcall target="rootFiles${os}_${ws}_${arch}"/>
- </target>
- <target name="rootFileswin32_win32_x86">
Modified: trunk/eclipse/debian/patches/eclipse-tomcat55.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-tomcat55.dpatch 2008-05-08
14:55:19 UTC (rev 6429)
+++ trunk/eclipse/debian/patches/eclipse-tomcat55.dpatch 2008-05-08
14:56:25 UTC (rev 6430)
@@ -20,22 +20,10 @@
exit 0
@DPATCH@
-diff -r -u source-tree.orig/plugins/org.eclipse.tomcat/build.properties
source-tree/plugins/org.eclipse.tomcat/build.properties
---- source-tree.orig/plugins/org.eclipse.tomcat/build.properties
2006-12-16 09:53:31.000000000 +0100
-+++ source-tree/plugins/org.eclipse.tomcat/build.properties 2006-12-16
10:04:09.000000000 +0100
-@@ -11,7 +11,7 @@
- bin.includes = conf/,\
- webapps/,\
- plugin.xml,\
-- *.jar,\
-+ lib/*.jar,\
- plugin.properties,\
- preferences.ini,\
- about.html,\
diff -r -u source-tree.orig/plugins/org.eclipse.tomcat/.classpath
source-tree/plugins/org.eclipse.tomcat/.classpath
---- source-tree.orig/plugins/org.eclipse.tomcat/.classpath 2006-12-16
09:53:31.000000000 +0100
-+++ source-tree/plugins/org.eclipse.tomcat/.classpath 2006-12-16
10:04:09.000000000 +0100
-@@ -1,28 +1,27 @@
+--- source-tree.orig/plugins/org.eclipse.tomcat/.classpath 9 May 2006
18:51:41 -0000 1.21
++++ source-tree/plugins/org.eclipse.tomcat/.classpath 16 Nov 2007 16:03:10
-0000
+@@ -1,28 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
@@ -61,170 +49,96 @@
- <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 exported="true" kind="lib" path="lib/catalina.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/catalina-optional.jar"/>
-+ <classpathentry exported="true" kind="lib" path="lib/commons-el.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/commons-modeler.jar"/>
-+ <classpathentry exported="true" kind="lib" path="lib/jmx.jar"/>
-+ <classpathentry exported="true" kind="lib" path="lib/jsp-api.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/naming-factory.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/naming-resources.jar"/>
-+ <classpathentry exported="true" kind="lib" path="lib/servlet-api.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/servlets-default.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/tomcat-coyote.jar"/>
-+ <classpathentry exported="true" kind="lib" path="lib/tomcat-http.jar"/>
-+ <classpathentry exported="true" kind="lib" path="lib/tomcat-util.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/commons-beanutils.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/commons-collections.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/commons-digester.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/commons-logging-api.jar"/>
-+ <classpathentry exported="true" kind="lib" path="lib/regexp.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/commons-digester-rss.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/jasper-compiler.jar"/>
-+ <classpathentry exported="true" kind="lib"
path="lib/jasper-runtime.jar"/>
++ <classpathentry exported="true" kind="lib" path="catalina.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="bootstrap.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="commons-beanutils.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib"
path="commons-collections.jar" sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="commons-digester.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib"
path="commons-logging-api.jar" sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="commons-modeler.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="mx4j-jmx.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="naming-factory.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="naming-resources.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="servlets-default.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="servlets-invoker.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="tomcat-coyote.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry exported="true" kind="lib" path="tomcat-util.jar"
sourcepath="D:/tomcat4.1.30src"/>
++ <classpathentry kind="lib" path="catalina-optional.jar"/>
++ <classpathentry kind="lib" path="commons-dbcp.jar"/>
++ <classpathentry kind="lib" path="commons-digester-rss.jar"/>
++ <classpathentry kind="lib" path="commons-el.jar"/>
++ <classpathentry kind="lib" path="commons-fileupload.jar"/>
++ <classpathentry kind="lib" path="commons-launcher.jar"/>
++ <classpathentry kind="lib" path="commons-pool.jar"/>
++ <classpathentry kind="lib" path="jasper5-compiler.jar"/>
++ <classpathentry kind="lib" path="jasper5-runtime.jar"/>
++ <classpathentry kind="lib" path="jspapi.jar"/>
++ <classpathentry kind="lib" path="mx4j.jar"/>
++ <classpathentry kind="lib" path="mx4j-impl.jar"/>
++ <classpathentry kind="lib" path="regexp.jar"/>
++ <classpathentry kind="lib" path="servletapi5.jar"/>
++ <classpathentry kind="lib" path="tomcat-http.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff -r -u source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF
source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF
---- source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF
2006-12-16 09:53:31.000000000 +0100
-+++ source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF
2006-12-16 10:04:09.000000000 +0100
-@@ -2,30 +2,30 @@
+--- source-tree.orig/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 31 May
2007 18:15:24 -0000 1.25
++++ source-tree/plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF 16 Nov
2007 16:03:10 -0000
+@@ -1,7 +1,7 @@
+ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
- Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
--Bundle-Version: 4.1.130.qualifier
-+Bundle-Version: 5.5.17.qualifier
+-Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
++Bundle-SymbolicName: org.eclipse.tomcat;singleton:=true
+ Bundle-Version: 4.1.230.qualifier
Bundle-ClassPath: tomcatwrapper.jar,
-- catalina.jar,
-- bootstrap.jar,
-- commons-beanutils.jar,
-- commons-collections.jar,
-- commons-digester.jar,
-- commons-logging-api.jar,
-- commons-modeler.jar,
+ catalina.jar,
+@@ -11,21 +11,28 @@
+ commons-digester.jar,
+ commons-logging-api.jar,
+ commons-modeler.jar,
- jakarta-regexp-1.3.jar,
- jasper-compiler.jar,
- jasper-runtime.jar,
-- mx4j-jmx.jar,
+ mx4j-jmx.jar,
- naming-common.jar,
-- naming-factory.jar,
-- naming-resources.jar,
+ naming-factory.jar,
+ naming-resources.jar,
- servlet.jar,
- servlets-common.jar,
-- servlets-default.jar,
-- servlets-invoker.jar,
+ servlets-default.jar,
+ servlets-invoker.jar,
- servlets-manager.jar,
-- tomcat-coyote.jar,
+ tomcat-coyote.jar,
- tomcat-http11.jar,
- tomcat-util.jar
-+ lib/catalina.jar,
-+ lib/catalina-optional.jar,
-+ lib/commons-beanutils.jar,
-+ lib/commons-collections.jar,
-+ lib/commons-digester.jar,
-+ lib/commons-digester-rss.jar,
-+ lib/commons-el.jar,
-+ lib/commons-logging-api.jar,
-+ lib/commons-modeler.jar,
-+ lib/jasper-compiler.jar,
-+ lib/jasper-runtime.jar,
-+ lib/mx4j-jmx.jar,
-+ lib/jsp-api.jar,
-+ lib/naming-factory.jar,
-+ lib/naming-resources.jar,
-+ lib/regexp.jar,
-+ lib/servlet-api.jar,
-+ lib/servlets-default.jar,
-+ lib/tomcat-coyote.jar,
-+ lib/tomcat-http.jar,
-+ lib/tomcat-util.jar,
-+ lib/servlets-invoker.jar
++ tomcat-util.jar,
++ catalina-optional.jar,
++ commons-dbcp.jar,
++ commons-digester-rss.jar,
++ commons-el.jar,
++ commons-fileupload.jar,
++ commons-launcher.jar,
++ commons-pool.jar,
++ jasper5-compiler.jar,
++ jasper5-runtime.jar,
++ jspapi.jar,
++ mx4j.jar,
++ mx4j-impl.jar,
++ regexp.jar,
++ servletapi5.jar,
++ tomcat-http.jar
Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-@@ -33,6 +33,74 @@
- org.apache.ant;bundle-version="[1.6.5,1.7.0)";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
- Eclipse-LazyStart: true
--Export-Package: org.eclipse.tomcat.internal;x-internal:=true,
-+Eclipse-BuddyPolicy: global
-+Export-Package: javax.management;x-internal:=true,
-+ javax.management.loading;x-internal:=true,
-+ javax.management.modelmbean;x-internal:=true,
-+ javax.management.monitor;x-internal:=true,
-+ javax.management.openmbean;x-internal:=true,
-+ javax.management.relation;x-internal:=true,
-+ javax.management.timer;x-internal:=true,
-+ javax.servlet;x-internal:=true,
-+ javax.servlet.http;x-internal:=true,
-+ javax.servlet.jsp;x-internal:=true,
-+ javax.servlet.jsp.tagext;x-internal:=true,
-+ mx4j;x-internal:=true,
-+ mx4j.loading;x-internal:=true,
-+ mx4j.log;x-internal:=true,
-+ mx4j.persist;x-internal:=true,
-+ mx4j.server;x-internal:=true,
-+ mx4j.server.interceptor;x-internal:=true,
-+ mx4j.timer;x-internal:=true,
-+ mx4j.util;x-internal:=true,
-+ org.apache.catalina;x-internal:=true,
-+ org.apache.catalina.connector;x-internal:=true,
-+ org.apache.catalina.core;x-internal:=true,
-+ org.apache.catalina.realm;x-internal:=true,
-+ org.apache.catalina.servlets;x-internal:=true,
-+ org.apache.commons.beanutils;x-internal:=true,
-+ org.apache.commons.beanutils.converters;x-internal:=true,
-+ org.apache.commons.beanutils.locale;x-internal:=true,
-+ org.apache.commons.beanutils.locale.converters;x-internal:=true,
-+ org.apache.commons.collections;x-internal:=true,
-+ org.apache.commons.collections.comparators;x-internal:=true,
-+ org.apache.commons.collections.iterators;x-internal:=true,
-+ org.apache.commons.digester;x-internal:=true,
-+ org.apache.commons.digester.rss;x-internal:=true,
-+ org.apache.commons.digester.xmlrules;x-internal:=true,
-+ org.apache.commons.logging;x-internal:=true,
-+ org.apache.commons.logging.impl;x-internal:=true,
-+ org.apache.commons.modeler;x-internal:=true,
-+ org.apache.commons.modeler.ant;x-internal:=true,
-+ org.apache.commons.modeler.mbeans;x-internal:=true,
-+ org.apache.commons.modeler.modules;x-internal:=true,
-+ org.apache.commons.modeler.util;x-internal:=true,
-+ org.apache.coyote;x-internal:=true,
-+ org.apache.coyote.http11;x-internal:=true,
-+ org.apache.coyote.http11.filters;x-internal:=true,
-+ org.apache.coyote.memory;x-internal:=true,
-+ org.apache.jasper;x-internal:=true,
-+ org.apache.jasper.compiler;x-internal:=true,
-+ org.apache.jasper.runtime;x-internal:=true,
-+ org.apache.jasper.servlet;x-internal:=true,
-+ org.apache.jasper.util;x-internal:=true,
-+ org.apache.jasper.xmlparser;x-internal:=true,
-+ org.apache.naming;x-internal:=true,
-+ org.apache.naming.factory;x-internal:=true,
-+ org.apache.naming.java;x-internal:=true,
-+ org.apache.naming.resources;x-internal:=true,
-+ org.apache.regexp;x-internal:=true,
-+ org.apache.tomcat.util;x-internal:=true,
-+ org.apache.tomcat.util.buf;x-internal:=true,
-+ org.apache.tomcat.util.collections;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.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;x-internal:=true,
- org.eclipse.tomcat.internal.extensions;x-internal:=true
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff -r -u
source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java
source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java
----
source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java
2006-12-16 09:53:31.000000000 +0100
-+++
source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java
2006-12-16 10:04:09.000000000 +0100
-@@ -69,15 +69,27 @@
+---
source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java
23 Feb 2006 22:51:14 -0000 1.9
++++
source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java
16 Nov 2007 16:03:10 -0000
+@@ -68,16 +68,27 @@
+
package org.eclipse.tomcat.internal;
-
+-
-import java.io.*;
-import java.util.*;
-
@@ -241,8 +155,8 @@
+import java.util.Locale;
+
+import javax.servlet.ServletException;
-+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
++import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import mx4j.log.Logger;
@@ -258,7 +172,7 @@
import org.eclipse.core.runtime.Platform;
-@@ -145,12 +157,12 @@
+@@ -145,12 +156,12 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
*/
@@ -274,7 +188,7 @@
ServletRequest sreq = (ServletRequest) request;
Throwable throwable =
-@@ -220,14 +232,11 @@
+@@ -220,14 +231,11 @@
throws IOException {
// Do nothing on non-HTTP responses
@@ -291,7 +205,7 @@
if (message == null)
message = ""; //$NON-NLS-1$
-@@ -373,9 +382,9 @@
+@@ -373,9 +381,9 @@
*/
protected void log(String message) {
@@ -303,7 +217,7 @@
else
System.out.println(this.toString() + ": " + message);
//$NON-NLS-1$
-@@ -390,9 +399,9 @@
+@@ -390,9 +398,9 @@
*/
protected void log(String message, Throwable throwable) {
@@ -316,8 +230,8 @@
System.out.println(this.toString() + ": " + message);
//$NON-NLS-1$
throwable.printStackTrace(System.out);
diff -r -u
source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
----
source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
2006-12-16 09:53:31.000000000 +0100
-+++
source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
2006-12-16 10:06:32.000000000 +0100
+---
source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
17 Apr 2006 15:24:57 -0000 1.46
++++
source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java
16 Nov 2007 16:03:10 -0000
@@ -4,7 +4,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -327,13 +241,11 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-@@ -17,23 +17,24 @@
+@@ -17,23 +17,22 @@
import java.net.UnknownHostException;
import java.util.ArrayList;
-import org.apache.catalina.Connector;
-+import mx4j.log.FileLogger;
-+
import org.apache.catalina.Context;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
@@ -357,7 +269,7 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
-@@ -56,6 +57,8 @@
+@@ -56,6 +55,8 @@
* should not be used
*/
public final static int SSL_DISABLED = -1;
@@ -366,7 +278,7 @@
private String hostAddress;
-@@ -76,7 +79,9 @@
+@@ -76,7 +77,9 @@
private Host host = null;
private Connector httpConnector = null;
@@ -376,7 +288,7 @@
// Con
private ArrayList contexts = new ArrayList();
-@@ -92,24 +97,34 @@
+@@ -92,24 +95,34 @@
* java.lang.String)
*/
public synchronized void start(int port, String hostAddress) throws
CoreException {
@@ -421,7 +333,7 @@
System.setProperty("catalina.home", home); //$NON-NLS-1$
String base = home;
System.setProperty("catalina.base", base); //$NON-NLS-1$
-@@ -120,14 +135,21 @@
+@@ -120,14 +133,21 @@
Realm realm = getRealm();
embedded.setRealm(realm);
}
@@ -445,7 +357,7 @@
// all request go to our only host
engine.setDefaultHost(host.getName());
-@@ -136,8 +158,9 @@
+@@ -136,8 +156,9 @@
((StandardHost) host)
.setErrorReportValveClass("org.eclipse.tomcat.internal.EclipseErrorReportValve");
//$NON-NLS-1$
}
@@ -456,7 +368,7 @@
// Install the assembled container hierarchy
PrintStream sysOut = System.out;
// reassign standard output to prevent Tomcat from writing
-@@ -150,7 +173,7 @@
+@@ -150,7 +171,7 @@
}
// Root context
@@ -465,7 +377,7 @@
// this line should be replaced once tomcat provides support
// for setting the working directory
if (root instanceof StandardContext) {
-@@ -159,20 +182,13 @@
+@@ -159,20 +180,13 @@
}
root.setLoader(embedded.createLoader(this.getClass()
.getClassLoader()));
@@ -490,7 +402,7 @@
if (this.port == -1) {
throw new CoreException(
new Status(
-@@ -184,51 +200,55 @@
+@@ -184,51 +198,55 @@
}
}
@@ -589,7 +501,7 @@
// add Connector to Tomcat
PrintStream sysErr = System.err;
-@@ -236,21 +256,16 @@
+@@ -236,21 +254,16 @@
// its version message there.
System.setErr(new PrintStream(new ByteArrayOutputStream()));
try {
@@ -614,7 +526,7 @@
// running = true;
TomcatPlugin.getDefault().setAppserver(this);
-@@ -307,82 +322,115 @@
+@@ -307,82 +320,115 @@
* @throws CoreException
*/
private void createSSLConnector(InetAddress iAddress, int sslport)
@@ -803,7 +715,7 @@
}
/**
-@@ -461,17 +509,16 @@
+@@ -461,17 +507,16 @@
*/
public synchronized void start(String webappName, IPath path, ClassLoader
customLoader)
throws CoreException {
@@ -823,7 +735,7 @@
String contextPath = webappName;
if (!contextPath.startsWith("/")) { //$NON-NLS-1$
contextPath = "/" + contextPath; //$NON-NLS-1$
-@@ -486,7 +533,6 @@
+@@ -486,7 +531,6 @@
WebAppClassLoader webappLoader = new
WebAppClassLoader(customLoader);
context.setLoader(embedded.createLoader(webappLoader));
@@ -831,16 +743,16 @@
host.addChild(context);
contexts.add(context);
} catch (Exception exc) {
-@@ -601,4 +647,4 @@
+@@ -601,4 +645,4 @@
return TomcatPlugin.getDefault().getStateLocation().append(webApp)
.toOSString();
}
-}
+}
-\ Kein Zeilenumbruch am Dateiende.
+\ No newline at end of file
diff -r -u
source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java
source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java
----
source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java
2006-12-16 09:53:31.000000000 +0100
-+++
source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java
2006-12-16 10:04:09.000000000 +0100
+---
source-tree.orig/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java
23 May 2005 03:58:20 -0000 1.24
++++
source-tree/plugins/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java
16 Nov 2007 16:03:10 -0000
@@ -24,13 +24,16 @@
public final static String PREF_ACCEPT_COUNT = "acceptCount";
//$NON-NLS-1$
public final static String PREF_MAX_PROCESSORS = "maxProcessors";
//$NON-NLS-1$
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
