- Update tomcat patches.
This commit is contained in:
Andrew Overholt
parent
764617c156
commit
eeaf79b13f
|
|
@ -1,6 +1,6 @@
|
|||
--- build.xml.orig 2006-07-05 12:47:26.000000000 -0400
|
||||
+++ build.xml 2006-07-05 12:50:49.000000000 -0400
|
||||
@@ -144,50 +144,56 @@
|
||||
@@ -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"/>
|
||||
|
|
@ -48,56 +48,64 @@
|
|||
- <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_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"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/catalina-optional.jar"/>
|
||||
+ <pathelement path="lib/commons-beanutils.jar"/>
|
||||
+ <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-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-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/jmx.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jmx.jar"/>
|
||||
+ <pathelement path="lib/mx4j.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j.jar"/>
|
||||
+ <pathelement path="lib/mx4j-impl.jar"/>
|
||||
+ <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/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"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-resources.jar"/>
|
||||
+ <pathelement path="lib/regexp.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/regexp.jar"/>
|
||||
+ <pathelement path="lib/servletapi5.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servletapi5.jar"/>
|
||||
+ <pathelement path="lib/servlets-default.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-default.jar"/>
|
||||
+ <pathelement path="lib/tomcat-coyote.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-coyote.jar"/>
|
||||
+ <pathelement path="lib/tomcat-http.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-http.jar"/>
|
||||
+ <pathelement path="lib/tomcat-util.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/tomcat-util.jar"/>
|
||||
+ <pathelement path="lib/servlets-invoker.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/servlets-invoker.jar"/>
|
||||
+ <pathelement path="catalina.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
|
||||
+ <pathelement path="catalina-optional.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina-optional.jar"/>
|
||||
+ <pathelement path="commons-beanutils.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-beanutils.jar"/>
|
||||
+ <pathelement path="commons-collections.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-collections.jar"/>
|
||||
+ <pathelement path="commons-dbcp.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-dbcp.jar"/>
|
||||
+ <pathelement path="commons-digester.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester.jar"/>
|
||||
+ <pathelement path="commons-digester-rss.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-digester-rss.jar"/>
|
||||
+ <pathelement path="commons-el.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-el.jar"/>
|
||||
+ <pathelement path="commons-fileupload.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-fileupload.jar"/>
|
||||
+ <pathelement path="commons-launcher.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-launcher.jar"/>
|
||||
+ <pathelement path="commons-logging-api.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging-api.jar"/>
|
||||
+ <pathelement path="commons-modeler.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
|
||||
+ <pathelement path="commons-pool.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-pool.jar"/>
|
||||
+ <pathelement path="jasper5-compiler.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper5-compiler.jar"/>
|
||||
+ <pathelement path="jasper5-runtime.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper5-runtime.jar"/>
|
||||
+ <pathelement path="jmx.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jmx.jar"/>
|
||||
+ <pathelement path="mx4j.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j.jar"/>
|
||||
+ <pathelement path="mx4j-impl.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j-impl.jar"/>
|
||||
+ <pathelement path="mx4j-jmx.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/mx4j-jmx.jar"/>
|
||||
+ <pathelement path="jspapi.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/jspapi.jar"/>
|
||||
+ <pathelement path="naming-factory.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-factory.jar"/>
|
||||
+ <pathelement path="naming-resources.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
|
||||
+ <pathelement path="regexp.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/regexp.jar"/>
|
||||
+ <pathelement path="servletapi5.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servletapi5.jar"/>
|
||||
+ <pathelement path="servlets-default.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-default.jar"/>
|
||||
+ <pathelement path="tomcat-coyote.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-coyote.jar"/>
|
||||
+ <pathelement path="tomcat-http.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http.jar"/>
|
||||
+ <pathelement path="tomcat-util.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-util.jar"/>
|
||||
+ <pathelement path="servlets-invoker.jar"/>
|
||||
+ <pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-invoker.jar"/>
|
||||
</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}" >
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
### Eclipse Workspace Patch 1.0
|
||||
#P org.eclipse.tomcat
|
||||
Index: .classpath
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/.classpath,v
|
||||
retrieving revision 1.21
|
||||
diff -u -r1.21 .classpath
|
||||
--- .classpath 9 May 2006 18:51:41 -0000 1.21
|
||||
+++ .classpath 4 Jul 2006 18:42:40 -0000
|
||||
@@ -1,28 +1,29 @@
|
||||
+++ .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"/>
|
||||
|
|
@ -31,55 +33,45 @@ diff -u -r1.21 .classpath
|
|||
- <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/mx4j.jar"/>
|
||||
+ <classpathentry exported="true" kind="lib" path="lib/mx4j-jmx.jar"/>
|
||||
+ <classpathentry exported="true" kind="lib" path="lib/mx4j-impl.jar"/>
|
||||
+ <classpathentry exported="true" kind="lib" path="lib/jspapi.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/servletapi5.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"/>
|
||||
Index: build.properties
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/build.properties,v
|
||||
retrieving revision 1.16
|
||||
diff -u -r1.16 build.properties
|
||||
--- build.properties 10 May 2006 17:51:19 -0000 1.16
|
||||
+++ build.properties 4 Jul 2006 18:42:40 -0000
|
||||
@@ -11,7 +11,7 @@
|
||||
bin.includes = conf/,\
|
||||
webapps/,\
|
||||
plugin.xml,\
|
||||
- *.jar,\
|
||||
+ lib/*.jar,\
|
||||
plugin.properties,\
|
||||
preferences.ini,\
|
||||
about.html,\
|
||||
Index: src/org/eclipse/tomcat/internal/TomcatPlugin.java
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java,v
|
||||
retrieving revision 1.24
|
||||
diff -u -r1.24 TomcatPlugin.java
|
||||
--- src/org/eclipse/tomcat/internal/TomcatPlugin.java 23 May 2005 03:58:20 -0000 1.24
|
||||
+++ src/org/eclipse/tomcat/internal/TomcatPlugin.java 4 Jul 2006 18:42:41 -0000
|
||||
+++ 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$
|
||||
|
|
@ -97,13 +89,115 @@ diff -u -r1.24 TomcatPlugin.java
|
|||
|
||||
private static TomcatPlugin plugin;
|
||||
// private static BundleContext bundleContext;
|
||||
Index: src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java,v
|
||||
retrieving revision 1.9
|
||||
diff -u -r1.9 EclipseErrorReportValve.java
|
||||
--- src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 23 Feb 2006 22:51:14 -0000 1.9
|
||||
+++ 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.*;
|
||||
-
|
||||
-import javax.servlet.*;
|
||||
-import javax.servlet.http.*;
|
||||
-
|
||||
-import org.apache.catalina.*;
|
||||
-import org.apache.catalina.util.*;
|
||||
-import org.apache.catalina.valves.*;
|
||||
+import java.io.IOException;
|
||||
+import java.io.PrintWriter;
|
||||
+import java.io.StringWriter;
|
||||
+import java.io.Writer;
|
||||
+import java.util.Locale;
|
||||
+
|
||||
+import javax.servlet.ServletException;
|
||||
+import javax.servlet.ServletResponse;
|
||||
+import javax.servlet.ServletRequest;
|
||||
+import javax.servlet.http.HttpServletResponse;
|
||||
+
|
||||
+import mx4j.log.Logger;
|
||||
+
|
||||
+import org.apache.catalina.Globals;
|
||||
+import org.apache.catalina.Valve;
|
||||
+import org.apache.catalina.connector.Request;
|
||||
+import org.apache.catalina.connector.Response;
|
||||
+import org.apache.catalina.util.RequestUtil;
|
||||
+import org.apache.catalina.util.StringManager;
|
||||
+import org.apache.catalina.valves.Constants;
|
||||
+import org.apache.catalina.valves.ValveBase;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
|
||||
|
||||
@@ -145,12 +156,12 @@
|
||||
* @exception IOException if an input/output error occurs
|
||||
* @exception ServletException if a servlet error occurs
|
||||
*/
|
||||
- public void invoke(Request request, Response response,
|
||||
- ValveContext context)
|
||||
+ public void invoke(Request request, Response response)
|
||||
throws IOException, ServletException {
|
||||
|
||||
// Perform the request
|
||||
- context.invokeNext(request, response);
|
||||
+ Valve nextValve = getNext();
|
||||
+ nextValve.invoke(request, response);
|
||||
|
||||
ServletRequest sreq = (ServletRequest) request;
|
||||
Throwable throwable =
|
||||
@@ -220,14 +231,11 @@
|
||||
throws IOException {
|
||||
|
||||
// Do nothing on non-HTTP responses
|
||||
- if (!(response instanceof HttpResponse))
|
||||
- return;
|
||||
- HttpResponse hresponse = (HttpResponse) response;
|
||||
if (!(response instanceof HttpServletResponse))
|
||||
return;
|
||||
HttpServletResponse hres = (HttpServletResponse) response;
|
||||
- int statusCode = hresponse.getStatus();
|
||||
- String message = RequestUtil.filter(hresponse.getMessage());
|
||||
+ int statusCode = response.getStatus();
|
||||
+ String message = RequestUtil.filter(response.getMessage());
|
||||
if (message == null)
|
||||
message = ""; //$NON-NLS-1$
|
||||
|
||||
@@ -373,9 +381,9 @@
|
||||
*/
|
||||
protected void log(String message) {
|
||||
|
||||
- Logger logger = container.getLogger();
|
||||
+ Logger logger = (Logger) container.getLogger();
|
||||
if (logger != null)
|
||||
- logger.log(this.toString() + ": " + message); //$NON-NLS-1$
|
||||
+ logger.info(this.toString() + ": " + message); //$NON-NLS-1$
|
||||
else
|
||||
System.out.println(this.toString() + ": " + message); //$NON-NLS-1$
|
||||
|
||||
@@ -390,9 +398,9 @@
|
||||
*/
|
||||
protected void log(String message, Throwable throwable) {
|
||||
|
||||
- Logger logger = container.getLogger();
|
||||
+ Logger logger = (Logger) container.getLogger();
|
||||
if (logger != null)
|
||||
- logger.log(this.toString() + ": " + message, throwable); //$NON-NLS-1$
|
||||
+ logger.info(this.toString() + ": " + message, throwable); //$NON-NLS-1$
|
||||
else {
|
||||
System.out.println(this.toString() + ": " + message); //$NON-NLS-1$
|
||||
throwable.printStackTrace(System.out);
|
||||
Index: src/org/eclipse/tomcat/internal/TomcatAppServer.java
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatAppServer.java,v
|
||||
retrieving revision 1.46
|
||||
diff -u -r1.46 TomcatAppServer.java
|
||||
--- src/org/eclipse/tomcat/internal/TomcatAppServer.java 17 Apr 2006 15:24:57 -0000 1.46
|
||||
+++ src/org/eclipse/tomcat/internal/TomcatAppServer.java 4 Jul 2006 18:42:41 -0000
|
||||
+++ 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
|
||||
|
|
@ -113,13 +207,11 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
* 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;
|
||||
|
|
@ -143,7 +235,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
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;
|
||||
|
|
@ -152,7 +244,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
|
||||
private String hostAddress;
|
||||
|
||||
@@ -76,7 +79,9 @@
|
||||
@@ -76,7 +77,9 @@
|
||||
private Host host = null;
|
||||
|
||||
private Connector httpConnector = null;
|
||||
|
|
@ -162,7 +254,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
// 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 {
|
||||
|
|
@ -207,7 +299,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
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);
|
||||
}
|
||||
|
|
@ -231,7 +323,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
|
||||
// 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$
|
||||
}
|
||||
|
|
@ -242,7 +334,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
// 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
|
||||
|
|
@ -251,7 +343,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
// 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()));
|
||||
|
|
@ -276,7 +368,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
if (this.port == -1) {
|
||||
throw new CoreException(
|
||||
new Status(
|
||||
@@ -184,51 +200,55 @@
|
||||
@@ -184,51 +198,55 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -375,7 +467,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
|
||||
// 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 {
|
||||
|
|
@ -400,7 +492,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
// running = true;
|
||||
TomcatPlugin.getDefault().setAppserver(this);
|
||||
|
||||
@@ -307,82 +322,115 @@
|
||||
@@ -307,82 +320,115 @@
|
||||
* @throws CoreException
|
||||
*/
|
||||
private void createSSLConnector(InetAddress iAddress, int sslport)
|
||||
|
|
@ -589,7 +681,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
}
|
||||
|
||||
/**
|
||||
@@ -461,17 +509,16 @@
|
||||
@@ -461,17 +507,16 @@
|
||||
*/
|
||||
public synchronized void start(String webappName, IPath path, ClassLoader customLoader)
|
||||
throws CoreException {
|
||||
|
|
@ -609,7 +701,7 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
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));
|
||||
|
|
@ -617,248 +709,64 @@ diff -u -r1.46 TomcatAppServer.java
|
|||
host.addChild(context);
|
||||
contexts.add(context);
|
||||
} catch (Exception exc) {
|
||||
@@ -601,4 +647,4 @@
|
||||
@@ -601,4 +645,4 @@
|
||||
return TomcatPlugin.getDefault().getStateLocation().append(webApp)
|
||||
.toOSString();
|
||||
}
|
||||
-}
|
||||
+}
|
||||
\ No newline at end of file
|
||||
Index: src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java,v
|
||||
retrieving revision 1.9
|
||||
diff -u -r1.9 EclipseErrorReportValve.java
|
||||
--- src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 23 Feb 2006 22:51:14 -0000 1.9
|
||||
+++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 4 Jul 2006 18:42:41 -0000
|
||||
@@ -69,15 +69,27 @@
|
||||
package org.eclipse.tomcat.internal;
|
||||
|
||||
|
||||
-import java.io.*;
|
||||
-import java.util.*;
|
||||
-
|
||||
-import javax.servlet.*;
|
||||
-import javax.servlet.http.*;
|
||||
-
|
||||
-import org.apache.catalina.*;
|
||||
-import org.apache.catalina.util.*;
|
||||
-import org.apache.catalina.valves.*;
|
||||
+import java.io.IOException;
|
||||
+import java.io.PrintWriter;
|
||||
+import java.io.StringWriter;
|
||||
+import java.io.Writer;
|
||||
+import java.util.Locale;
|
||||
+
|
||||
+import javax.servlet.ServletException;
|
||||
+import javax.servlet.ServletRequest;
|
||||
+import javax.servlet.ServletResponse;
|
||||
+import javax.servlet.http.HttpServletResponse;
|
||||
+
|
||||
+import mx4j.log.Logger;
|
||||
+
|
||||
+import org.apache.catalina.Globals;
|
||||
+import org.apache.catalina.Valve;
|
||||
+import org.apache.catalina.connector.Request;
|
||||
+import org.apache.catalina.connector.Response;
|
||||
+import org.apache.catalina.util.RequestUtil;
|
||||
+import org.apache.catalina.util.StringManager;
|
||||
+import org.apache.catalina.valves.Constants;
|
||||
+import org.apache.catalina.valves.ValveBase;
|
||||
import org.eclipse.core.runtime.Platform;
|
||||
|
||||
|
||||
@@ -145,12 +157,12 @@
|
||||
* @exception IOException if an input/output error occurs
|
||||
* @exception ServletException if a servlet error occurs
|
||||
*/
|
||||
- public void invoke(Request request, Response response,
|
||||
- ValveContext context)
|
||||
+ public void invoke(Request request, Response response)
|
||||
throws IOException, ServletException {
|
||||
|
||||
// Perform the request
|
||||
- context.invokeNext(request, response);
|
||||
+ Valve nextValve = getNext();
|
||||
+ nextValve.invoke(request, response);
|
||||
|
||||
ServletRequest sreq = (ServletRequest) request;
|
||||
Throwable throwable =
|
||||
@@ -220,14 +232,11 @@
|
||||
throws IOException {
|
||||
|
||||
// Do nothing on non-HTTP responses
|
||||
- if (!(response instanceof HttpResponse))
|
||||
- return;
|
||||
- HttpResponse hresponse = (HttpResponse) response;
|
||||
if (!(response instanceof HttpServletResponse))
|
||||
return;
|
||||
HttpServletResponse hres = (HttpServletResponse) response;
|
||||
- int statusCode = hresponse.getStatus();
|
||||
- String message = RequestUtil.filter(hresponse.getMessage());
|
||||
+ int statusCode = response.getStatus();
|
||||
+ String message = RequestUtil.filter(response.getMessage());
|
||||
if (message == null)
|
||||
message = ""; //$NON-NLS-1$
|
||||
|
||||
@@ -373,9 +382,9 @@
|
||||
*/
|
||||
protected void log(String message) {
|
||||
|
||||
- Logger logger = container.getLogger();
|
||||
+ Logger logger = (Logger) container.getLogger();
|
||||
if (logger != null)
|
||||
- logger.log(this.toString() + ": " + message); //$NON-NLS-1$
|
||||
+ logger.info(this.toString() + ": " + message); //$NON-NLS-1$
|
||||
else
|
||||
System.out.println(this.toString() + ": " + message); //$NON-NLS-1$
|
||||
|
||||
@@ -390,9 +399,9 @@
|
||||
*/
|
||||
protected void log(String message, Throwable throwable) {
|
||||
|
||||
- Logger logger = container.getLogger();
|
||||
+ Logger logger = (Logger) container.getLogger();
|
||||
if (logger != null)
|
||||
- logger.log(this.toString() + ": " + message, throwable); //$NON-NLS-1$
|
||||
+ logger.info(this.toString() + ": " + message, throwable); //$NON-NLS-1$
|
||||
else {
|
||||
System.out.println(this.toString() + ": " + message); //$NON-NLS-1$
|
||||
throwable.printStackTrace(System.out);
|
||||
Index: META-INF/MANIFEST.MF
|
||||
===================================================================
|
||||
RCS file: /cvsroot/eclipse/org.eclipse.tomcat/META-INF/MANIFEST.MF,v
|
||||
retrieving revision 1.21
|
||||
diff -u -r1.21 MANIFEST.MF
|
||||
--- META-INF/MANIFEST.MF 9 May 2006 20:26:52 -0000 1.21
|
||||
+++ META-INF/MANIFEST.MF 4 Jul 2006 18:42:40 -0000
|
||||
@@ -2,30 +2,32 @@
|
||||
retrieving revision 1.25
|
||||
diff -u -r1.25 MANIFEST.MF
|
||||
--- META-INF/MANIFEST.MF 31 May 2007 18:15:24 -0000 1.25
|
||||
+++ 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-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.jar,
|
||||
+ lib/mx4j-jmx.jar,
|
||||
+ lib/mx4j-impl.jar,
|
||||
+ lib/jspapi.jar,
|
||||
+ lib/naming-factory.jar,
|
||||
+ lib/naming-resources.jar,
|
||||
+ lib/regexp.jar,
|
||||
+ lib/servletapi5.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 +35,73 @@
|
||||
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,
|
||||
+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
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
|
|
|
|||
134
eclipse.spec
134
eclipse.spec
|
|
@ -1,6 +1,6 @@
|
|||
Epoch: 1
|
||||
|
||||
%define gcj_support 1
|
||||
%define gcj_support 0
|
||||
%define tomcatsharedir %{_datadir}/tomcat5
|
||||
%define tomcatlibdir %{_var}/lib/tomcat5
|
||||
%define eclipse_major 3
|
||||
|
|
@ -19,7 +19,7 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: Eclipse Public License
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
|
@ -337,7 +337,7 @@ pushd plugins/org.eclipse.tomcat
|
|||
%patch6 -p0
|
||||
%patch7 -p0
|
||||
popd
|
||||
sed --in-place "s/4.1.130/5.5.23/g" \
|
||||
sed --in-place "s/4.1.230/5.5.23/g" \
|
||||
features/org.eclipse.platform/build.xml \
|
||||
plugins/org.eclipse.tomcat/build.xml \
|
||||
plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF \
|
||||
|
|
@ -473,36 +473,35 @@ rm plugins/org.eclipse.tomcat/servlets-default.jar
|
|||
rm plugins/org.eclipse.tomcat/servlets-invoker.jar
|
||||
rm plugins/org.eclipse.tomcat/tomcat-coyote.jar
|
||||
rm plugins/org.eclipse.tomcat/tomcat-util.jar
|
||||
mkdir -p plugins/org.eclipse.tomcat/lib
|
||||
ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/lib/bootstrap.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina.jar plugins/org.eclipse.tomcat/lib/catalina.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina-optional.jar plugins/org.eclipse.tomcat/lib/catalina-optional.jar
|
||||
ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat/lib/jasper-compiler.jar
|
||||
ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/lib/jasper-runtime.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/lib/mx4j.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/lib/mx4j-impl.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/lib/mx4j-jmx.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-factory.jar plugins/org.eclipse.tomcat/lib/naming-factory.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-resources.jar plugins/org.eclipse.tomcat/lib/naming-resources.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-default.jar plugins/org.eclipse.tomcat/lib/servlets-default.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-invoker.jar plugins/org.eclipse.tomcat/lib/servlets-invoker.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-coyote.jar plugins/org.eclipse.tomcat/lib/tomcat-coyote.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-http.jar plugins/org.eclipse.tomcat/lib/tomcat-http.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-util.jar plugins/org.eclipse.tomcat/lib/tomcat-util.jar
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-beanutils
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-collections
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-dbcp
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-digester
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-digester-rss
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-el
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-fileupload
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-launcher
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-logging-api
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-modeler
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib commons-pool
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jspapi
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib regexp
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat/lib servletapi5
|
||||
ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-http.jar plugins/org.eclipse.tomcat/tomcat-http.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-beanutils
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-collections
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-dbcp
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-digester
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-digester-rss
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-el
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-fileupload
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-launcher
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-logging-api
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-modeler
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat commons-pool
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat jasper5-compiler
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat jasper5-runtime
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat jspapi
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat regexp
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat servletapi5
|
||||
## END TOMCAT ##
|
||||
|
||||
JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
|
||||
|
|
@ -518,6 +517,7 @@ ln -s %{_javadir}/junit4.jar plugins/org.junit4/junit.jar
|
|||
%if %{gcj_support}
|
||||
find plugins -type f -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
|
||||
%endif
|
||||
find plugins -type f -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
|
||||
|
||||
# the swt version is set to HEAD on ia64 but shouldn't be
|
||||
# get swt version
|
||||
|
|
@ -1013,36 +1013,41 @@ ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.7.0.v200706080842/li
|
|||
|
||||
## BEGIN TOMCAT ##
|
||||
TOMCATPLUGINVERSION=$(ls plugins | grep tomcat | sed 's/org.eclipse.tomcat_//')
|
||||
mkdir -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib
|
||||
ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/bootstrap.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina-optional.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina-optional.jar
|
||||
ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/jasper-compiler.jar
|
||||
ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/jasper-runtime.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j-impl.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j-jmx.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-factory.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-factory.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-resources.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-resources.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-default.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-default.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-invoker.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-invoker.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-coyote.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-coyote.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-http.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-http.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-util.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-util.jar
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-beanutils
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-collections
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-dbcp
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-digester
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-digester-rss
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-el
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-fileupload
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-launcher
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-logging-api
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-modeler
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-pool
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib jspapi
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib regexp
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib servletapi5
|
||||
for f in bootstrap catalina{,-optional} mx4j{,-impl,-jmx} \
|
||||
naming-{factory,resources} servlets-{default,invoker} \
|
||||
tomcat-{coyote,http,util} \
|
||||
commons-{beanutils,collections,dbcp,digester{,-rss},el,fileupload,launcher,logging-api,modeler,pool} \
|
||||
jasper5-{compiler,runtime} jspapi regexp servletapi5;
|
||||
do rm plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/$f.jar; done
|
||||
ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/bootstrap.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/catalina.jar
|
||||
ln -s %{_javadir}/tomcat5/catalina-optional.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/catalina-optional.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/mx4j.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/mx4j-impl.jar
|
||||
ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/mx4j-jmx.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-factory.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/naming-factory.jar
|
||||
ln -s %{_javadir}/tomcat5/naming-resources.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/naming-resources.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-default.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/servlets-default.jar
|
||||
ln -s %{_javadir}/tomcat5/servlets-invoker.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/servlets-invoker.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-coyote.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/tomcat-coyote.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-http.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/tomcat-http.jar
|
||||
ln -s %{_javadir}/tomcat5/tomcat-util.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/tomcat-util.jar
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-beanutils
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-collections
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-dbcp
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-digester
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-digester-rss
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-el
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-fileupload
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-launcher
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-logging-api
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-modeler
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION commons-pool
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION jasper5-compiler
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION jasper5-runtime
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION jspapi
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION regexp
|
||||
build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION servletapi5
|
||||
## END TOMCAT ##
|
||||
|
||||
JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty_5 | sed 's/org.mortbay.jetty_//')
|
||||
|
|
@ -1582,6 +1587,9 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Nov 16 2007 Andrew Overholt <overholt@redhat.com> 3.3.1.1-3
|
||||
- Update tomcat patches.
|
||||
|
||||
* Wed Nov 14 2007 Andrew Overholt <overholt@redhat.com> 3.3.1.1-2
|
||||
- Bump release to tag non-corrupted source zip.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue