From db03349ee402d20d655c0d42d20901865151ae2f Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Sep 25 2008 13:10:51 +0000 Subject: - resolves bug 461860 - CVS is going to remove unused, but packed, patches (I kept them localy) --- diff --git a/.cvsignore b/.cvsignore index d68376b..01acc54 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,7 +1,7 @@ -eclipse-fileinitializerapp.tar.bz2 -org.fedoraproject.ide.feature-1.0.0.zip ecf-filetransfer-v20080611-1715.tar.bz2 +eclipse-3.4.0-testframework.tar.bz2 +eclipse-ecj-gcj.tar.bz2 +eclipse-fileinitializerapp.tar.bz2 eclipse-sourceBuild-srcIncluded-3.4.zip +org.fedoraproject.ide.feature-1.0.0.zip org.fedoraproject.ide.platform-3.4.0-1.zip -eclipse-ecj-gcj.tar.bz2 -eclipse-3.4.0-testframework.tar.bz2 diff --git a/eclipse-17vmgenerate16bytecode.patch b/eclipse-17vmgenerate16bytecode.patch deleted file mode 100644 index c5bcd83..0000000 --- a/eclipse-17vmgenerate16bytecode.patch +++ /dev/null @@ -1,18 +0,0 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.jdt.core -Index: model/org/eclipse/jdt/core/JavaCore.java -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v -retrieving revision 1.577 -diff -u -r1.577 JavaCore.java ---- model/org/eclipse/jdt/core/JavaCore.java 1 Jun 2007 13:52:19 -0000 1.577 -+++ model/org/eclipse/jdt/core/JavaCore.java 26 Sep 2007 19:30:44 -0000 -@@ -4662,7 +4662,7 @@ - case ClassFileConstants.MAJOR_VERSION_1_7: - options.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_7); - options.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_7); -- options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_7); -+ options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_6); - options.put(JavaCore.COMPILER_PB_ASSERT_IDENTIFIER, JavaCore.ERROR); - options.put(JavaCore.COMPILER_PB_ENUM_IDENTIFIER, JavaCore.ERROR); - options.put(JavaCore.COMPILER_CODEGEN_INLINE_JSR_BYTECODE, JavaCore.ENABLED); diff --git a/eclipse-build.patch b/eclipse-build.patch deleted file mode 100644 index d999138..0000000 --- a/eclipse-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: eclipse/buildConfigs/sdk/srcBuild/build.xml -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.xml,v -retrieving revision 1.9 -diff -u -r1.9 build.xml ---- build.xml 11 May 2006 20:51:39 -0000 1.9 -+++ build.xml 26 May 2006 23:06:38 -0000 -@@ -95,6 +95,15 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/eclipse-buildagainstxulrunner.patch b/eclipse-buildagainstxulrunner.patch deleted file mode 100644 index 31ee2bf..0000000 --- a/eclipse-buildagainstxulrunner.patch +++ /dev/null @@ -1,25 +0,0 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.swt -Index: Eclipse_SWT_PI/gtk/library/build.sh -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_PI/gtk/library/build.sh,v -retrieving revision 1.46 -diff -u -r1.46 build.sh ---- Eclipse_SWT_PI/gtk/library/build.sh 22 Oct 2007 21:18:51 -0000 1.46 -+++ Eclipse_SWT_PI/gtk/library/build.sh 9 Apr 2008 19:45:37 -0000 -@@ -103,8 +103,14 @@ - export MOZILLA_INCLUDES - export MOZILLA_LIBS - MAKE_MOZILLA=make_mozilla -+ elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then -+ MOZILLA_INCLUDES=`pkg-config --cflags libxul` -+ MOZILLA_LIBS=`pkg-config --libs libxul` -+ export MOZILLA_INCLUDES -+ export MOZILLA_LIBS -+ MAKE_MOZILLA=make_mozilla - else -- echo "Mozilla/XPCOM or Firefox/XPCOM libraries not found:" -+ echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or xulrunner/XPCOM" - echo " *** Mozilla embedding support will not be compiled." - fi - fi \ No newline at end of file diff --git a/eclipse-ecj-rpmdebuginfo.patch b/eclipse-ecj-rpmdebuginfo.patch deleted file mode 100644 index f3a13f8..0000000 --- a/eclipse-ecj-rpmdebuginfo.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java.orig 2006-02-07 13:50:13.000000000 -0500 -+++ plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java 2006-02-07 13:55:29.000000000 -0500 -@@ -2405,6 +2405,28 @@ - this.times = new long[this.repetitions]; - this.timesCounter = 0; - } -+ { -+ // If we're building an RPM, force full debugging info to -+ // be generated, no matter what options have been passed -+ // by Ant. This is something of a kludge, but it is far -+ // better than the alternative, which is having class -+ // files with debug info mysteriously missing. -+ -+ String RpmPackageName = System.getenv("RPM_PACKAGE_NAME"); -+ String RpmArch = System.getenv("RPM_ARCH"); -+ String RpmBuildRoot = System.getenv("RPM_BUILD_ROOT"); -+ if (RpmPackageName != null && RpmArch != null && RpmBuildRoot != null) { -+ this.options.put( -+ CompilerOptions.OPTION_LocalVariableAttribute, -+ CompilerOptions.GENERATE); -+ this.options.put( -+ CompilerOptions.OPTION_LineNumberAttribute, -+ CompilerOptions.GENERATE); -+ this.options.put( -+ CompilerOptions.OPTION_SourceFileAttribute, -+ CompilerOptions.GENERATE); -+ } -+ } - } - - private void addNewEntry(final int InsideClasspath, final int InsideSourcepath, ArrayList bootclasspaths, ArrayList classpaths,ArrayList sourcepathClasspaths, String currentClasspathName, ArrayList currentRuleSpecs, int mode, String customEncoding) { diff --git a/eclipse-idreplace.patch b/eclipse-idreplace.patch deleted file mode 100644 index 4273ae7..0000000 --- a/eclipse-idreplace.patch +++ /dev/null @@ -1,34 +0,0 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.pde.build -Index: src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java,v -retrieving revision 1.31.4.2 -diff -u -r1.31.4.2 IdReplaceTask.java ---- src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java 20 Aug 2007 15:02:51 -0000 1.31.4.2 -+++ src_ant/org/eclipse/pde/internal/build/tasks/IdReplaceTask.java 2 Oct 2007 18:06:52 -0000 -@@ -243,7 +243,7 @@ - } - - startVersionId++; -- String replacementVersion = null; -+ String replacementVersion = ""; - Version v = new Version(new String(versionId)); - String lookupKey = new String(elementId) + ':' + v.getMajor() + '.' + v.getMinor() + '.' + v.getMicro(); - if (isPlugin) { -@@ -251,13 +251,14 @@ - } else { - replacementVersion = (String) featureIds.get(lookupKey); - } -+ int change = 0; - if (replacementVersion == null) { - System.err.println("Could not find " + new String(elementId)); //$NON-NLS-1$ - } else { - buffer.replace(startVersionId, endVersionId, replacementVersion); - contentChanged = true; -+ change = endVersionId - startVersionId - replacementVersion.length(); - } -- int change = endVersionId - startVersionId - replacementVersion.length(); - startElement = (endElementId > endVersionId) ? endElementId - change: endVersionId - change; - } - diff --git a/eclipse-launcher-double-free-bug.patch b/eclipse-launcher-double-free-bug.patch deleted file mode 100644 index 0c24961..0000000 --- a/eclipse-launcher-double-free-bug.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- library/eclipse.c.orig 2007-06-25 15:57:02.000000000 -0400 -+++ library/eclipse.c 2007-08-03 15:23:02.000000000 -0400 -@@ -529,6 +530,7 @@ - } - displayMessage( title, errorMsg ); - free( errorMsg ); -+ errorMsg = NULL; - } - free( title ); - break; diff --git a/eclipse-launcher-set-install-dir-and-shared-config.patch b/eclipse-launcher-set-install-dir-and-shared-config.patch deleted file mode 100644 index cd8b78d..0000000 --- a/eclipse-launcher-set-install-dir-and-shared-config.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: library/eclipse.c -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/eclipse.c,v -retrieving revision 1.20 -diff -u -r1.20 eclipse.c ---- library/eclipse.c 8 Feb 2007 16:57:15 -0000 1.20 -+++ library/eclipse.c 1 Mar 2007 03:44:19 -0000 -@@ -330,8 +330,9 @@ - - /* Define the required VM arguments (all platforms). */ - static _TCHAR* cp = NULL; --static _TCHAR* cpValue = NULL; --static _TCHAR** reqVMarg[] = { &cp, &cpValue, NULL }; /* required VM args */ -+static _TCHAR* cpValue = NULL; -+static _TCHAR* sharedConfigurationDir = _T_ECLIPSE("-Dosgi.sharedConfiguration.area=/usr/lib/eclipse/configuration"); -+static _TCHAR** reqVMarg[] = { &sharedConfigurationDir, &cp, &cpValue, NULL }; /* required VM args */ - static _TCHAR** userVMarg = NULL; /* user specific args for the Java VM */ - static _TCHAR** eeVMarg = NULL; /* vm args specified in ee file */ - static int nEEargs = 0; -@@ -915,20 +916,12 @@ - */ - _TCHAR* getProgramDir( ) - { -- _TCHAR* ch; - _TCHAR* programDir; -+ _TCHAR* temp = _T_ECLIPSE("/usr/share/eclipse/"); - -- programDir = malloc( (_tcslen( program ) + 1) * sizeof(_TCHAR) ); -- _tcscpy( programDir, program ); -- ch = _tcsrchr( programDir, dirSeparator ); -- if (ch != NULL) -- { -- *(ch+1) = _T_ECLIPSE('\0'); -- return programDir; -- } -- -- free( programDir ); -- return NULL; -+ programDir = malloc( (_tcslen( temp + 1 )) * sizeof(_TCHAR) ); -+ _tcscpy( programDir, temp ); -+ return programDir; - } - - static _TCHAR* findStartupJar(){ -Index: library/gtk/make_linux.mak -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.equinox.executable/library/gtk/make_linux.mak,v -retrieving revision 1.10 -diff -u -r1.10 make_linux.mak ---- library/gtk/make_linux.mak 7 Feb 2007 18:13:48 -0000 1.10 -+++ library/gtk/make_linux.mak 1 Mar 2007 03:44:19 -0000 -@@ -43,7 +43,7 @@ - DLL = $(PROGRAM_LIBRARY) - LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl - LFLAGS = -shared -fpic -Wl,--export-dynamic --CFLAGS = -O -s -Wall\ -+CFLAGS = -O -s -Wall -g \ - -fpic \ - -DLINUX \ - -DMOZILLA_FIX \ diff --git a/eclipse-libupdatebuild2.patch b/eclipse-libupdatebuild2.patch deleted file mode 100644 index b570a02..0000000 --- a/eclipse-libupdatebuild2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.update.core.linux/src/build.xml.orig 2006-01-27 15:35:35.000000000 -0500 -+++ plugins/org.eclipse.update.core.linux/src/build.xml 2006-01-27 15:36:07.000000000 -0500 -@@ -5,7 +5,7 @@ - - - -- -+ - - - diff --git a/eclipse-memorypermsizeandjvmcrash.patch b/eclipse-memorypermsizeandjvmcrash.patch index ce331d9..4957cf8 100644 --- a/eclipse-memorypermsizeandjvmcrash.patch +++ b/eclipse-memorypermsizeandjvmcrash.patch @@ -1,13 +1,6 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.platform-feature -Index: gtk/eclipse.ini -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.platform-feature/gtk/eclipse.ini,v -retrieving revision 1.3 -diff -u -r1.3 eclipse.ini ---- gtk/eclipse.ini 3 Jun 2008 20:55:37 -0000 1.3 -+++ gtk/eclipse.ini 31 Jul 2008 00:28:29 -0000 -@@ -4,4 +4,10 @@ +--- gtk/eclipse.ini 2008-06-18 02:52:18.000000000 +0200 ++++ gtk/eclipse.ini.patched 2008-09-25 13:38:03.000000000 +0200 +@@ -4,4 +4,12 @@ org.eclipse.platform 256m -vmargs -Xms40m @@ -18,4 +11,6 @@ diff -u -r1.3 eclipse.ini +-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding, +-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate +-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding ++-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile ++-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles +-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins diff --git a/eclipse-swt-mozprofile.patch b/eclipse-swt-mozprofile.patch deleted file mode 100644 index 7b4965e..0000000 --- a/eclipse-swt-mozprofile.patch +++ /dev/null @@ -1,63 +0,0 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.swt -Index: Eclipse_SWT_Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java,v -retrieving revision 1.10 -diff -u -r1.10 AppFileLocProvider.java ---- Eclipse_SWT_Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java 23 Aug 2007 17:10:46 -0000 1.10 -+++ Eclipse_SWT_Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java 14 May 2008 18:08:48 -0000 -@@ -12,7 +12,7 @@ - - import java.util.Vector; - --import org.eclipse.swt.internal.C; -+import org.eclipse.swt.internal.*; - import org.eclipse.swt.internal.mozilla.*; - - class AppFileLocProvider { -@@ -119,6 +119,19 @@ - - void setProfilePath (String path) { - profilePath = path; -+ if (!Compatibility.fileExists (path, "")) { //$NON-NLS-1$ -+ int /*long*/[] result = new int /*long*/[1]; -+ nsEmbedString pathString = new nsEmbedString (path); -+ int rc = XPCOM.NS_NewLocalFile (pathString.getAddress (), true, result); -+ if (rc != XPCOM.NS_OK) Mozilla.error (rc); -+ if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NULL_POINTER); -+ pathString.dispose (); -+ -+ nsILocalFile file = new nsILocalFile (result [0]); -+ rc = file.Create (nsILocalFile.DIRECTORY_TYPE, 0700); -+ if (rc != XPCOM.NS_OK) Mozilla.error (rc); -+ file.Release (); -+ } - } - - /* nsIDirectoryServiceProvider2 */ -Index: Eclipse_SWT/common_j2se/org/eclipse/swt/internal/Compatibility.java -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT/common_j2se/org/eclipse/swt/internal/Compatibility.java,v -retrieving revision 1.28 -diff -u -r1.28 Compatibility.java ---- Eclipse_SWT/common_j2se/org/eclipse/swt/internal/Compatibility.java 10 Oct 2007 18:36:05 -0000 1.28 -+++ Eclipse_SWT/common_j2se/org/eclipse/swt/internal/Compatibility.java 14 May 2008 18:08:48 -0000 -@@ -99,6 +99,17 @@ - } - - /** -+ * Answers whether the indicated file exists or not. -+ * -+ * @param parent the file's parent directory -+ * @param child the file's name -+ * @return true if the file exists -+ */ -+public static boolean fileExists(String parent, String child) { -+ return new File (parent, child).exists(); -+} -+ -+/** - * Answers the most positive (i.e. closest to positive infinity) - * integer value which is less than the number obtained by dividing - * the first argument p by the second argument q. diff --git a/eclipse-swttools.patch b/eclipse-swttools.patch deleted file mode 100644 index e0ffb0c..0000000 --- a/eclipse-swttools.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- build.xml.orig 2007-02-22 10:14:59.000000000 -0500 -+++ build.xml 2007-03-01 10:38:05.000000000 -0500 -@@ -228,6 +228,11 @@ - - - -+ -+ -+ -+ -+ - - - diff --git a/eclipse-tomcat55-build.patch b/eclipse-tomcat55-build.patch deleted file mode 100644 index e3dd17f..0000000 --- a/eclipse-tomcat55-build.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- build.xml.orig 2006-07-05 12:47:26.000000000 -0400 -+++ build.xml 2006-07-05 12:50:49.000000000 -0400 -@@ -144,50 +144,64 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/eclipse-tomcat55.patch b/eclipse-tomcat55.patch deleted file mode 100644 index 8a7ac0b..0000000 --- a/eclipse-tomcat55.patch +++ /dev/null @@ -1,772 +0,0 @@ -### 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 16 Nov 2007 16:03:10 -0000 -@@ -1,28 +1,35 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -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 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$ - public final static String PREF_MIN_PROCESSORS = "minProcessors"; //$NON-NLS-1$ -+ public final static String DISABLE_UPLOAD_TIMEOUT = "disableUploadTimeout"; //$NON-NLS-1$ - - public final static String PREF_SSL_PORT = "sslPort"; //$NON-NLS-1$ - public final static String PREF_SSL_PROTOCOL = "sslProtocol"; //$NON-NLS-1$ -+ public final static String PREF_SSL_PROTOCOLS = "sslProtocols"; //$NON-NLS-1$ - public final static String PREF_SSL_SCHEME = "sslScheme"; //$NON-NLS-1$ - public final static String PREF_SSL_ALGORITHM = "sslAlgorithm"; //$NON-NLS-1$ - public final static String PREF_KEY_STORE_FILE = "keyStoreFile"; //$NON-NLS-1$ - public final static String PREF_KEY_STORE_PASSWORD = "keyStorePassword"; //$NON-NLS-1$ -+ public final static String PREF_CLIENT_AUTHENTICATION = "clientauth"; //$NON-NLS-1$ - - 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 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 - * http://www.eclipse.org/legal/epl-v10.html -- * -+ * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -@@ -17,23 +17,22 @@ - import java.net.UnknownHostException; - import java.util.ArrayList; - --import org.apache.catalina.Connector; - import org.apache.catalina.Context; - import org.apache.catalina.Engine; - import org.apache.catalina.Host; -+import org.apache.catalina.Lifecycle; - import org.apache.catalina.LifecycleEvent; - import org.apache.catalina.LifecycleException; - import org.apache.catalina.LifecycleListener; - import org.apache.catalina.Realm; -+import org.apache.catalina.connector.Connector; - import org.apache.catalina.core.StandardContext; - import org.apache.catalina.core.StandardHost; --import org.apache.catalina.logger.FileLogger; - import org.apache.catalina.realm.MemoryRealm; - import org.apache.catalina.startup.Embedded; --import org.apache.coyote.tomcat4.CoyoteConnector; --import org.apache.coyote.tomcat4.CoyoteServerSocketFactory; -+import org.apache.coyote.http11.Http11Protocol; -+import org.apache.tomcat.util.net.jsse.JSSEImplementation; - import org.eclipse.core.runtime.CoreException; --import org.eclipse.core.runtime.FileLocator; - import org.eclipse.core.runtime.IConfigurationElement; - import org.eclipse.core.runtime.IExtension; - import org.eclipse.core.runtime.IExtensionPoint; -@@ -56,6 +55,8 @@ - * should not be used - */ - public final static int SSL_DISABLED = -1; -+ -+ private final static String NULL = null; - - private String hostAddress; - -@@ -76,7 +77,9 @@ - private Host host = null; - - private Connector httpConnector = null; -+ private boolean hasConnection = false; - private Connector sslConnector = null; -+ private boolean hasSSLConnection = false; - // Con - private ArrayList contexts = new ArrayList(); - -@@ -92,24 +95,34 @@ - * java.lang.String) - */ - public synchronized void start(int port, String hostAddress) throws CoreException { -- this.hostAddress = hostAddress; -+ // if null passed for hostAddress, use local host -+ if (hostAddress == null) { -+ this.hostAddress = "127.0.0.1"; //$NON-NLS-1$ -+ } else { -+ this.hostAddress = hostAddress; -+ } -+ InetAddress iAddress = null; -+ -+ //Defaults to LOCALHOST -+ try{ -+ iAddress = InetAddress.getByName(this.hostAddress); -+ } catch (UnknownHostException uhe) { -+ // will default to all interfaces -+ } -+ -+ String hostname = iAddress.getHostName(); -+ - this.port = port; -- - if (isStarted) { - return; - } - isStarted = true; - try { -- FileLogger logger = new FileLogger(); -- logger.setDirectory(TomcatPlugin.getDefault().getStateLocation() -- .toOSString()); -- embedded = new Embedded(logger, new MemoryRealm()); -- embedded.setDebug(0); -- embedded.setLogger(logger); -+ embedded = new Embedded(new MemoryRealm()); - URL installURL = TomcatPlugin.getDefault().getBundle() - .getEntry("/"); //$NON-NLS-1$ -- URL resolvedURL = FileLocator.resolve(installURL); -- String home = FileLocator.toFileURL(resolvedURL).getFile(); -+ URL resolvedURL = Platform.resolve(installURL); -+ String home = Platform.asLocalURL(resolvedURL).getFile(); - System.setProperty("catalina.home", home); //$NON-NLS-1$ - String base = home; - System.setProperty("catalina.base", base); //$NON-NLS-1$ -@@ -120,14 +133,21 @@ - Realm realm = getRealm(); - embedded.setRealm(realm); - } -- -+ //the embedded application is now started by using embedded.start() -+ embedded.addLifecycleListener(new LifecycleListener(){ -+ public void lifecycleEvent(LifecycleEvent event) { -+ if (Lifecycle.START_EVENT.equals(event.getType())) -+ running = true; -+ } -+ -+ }); - // start now, and then add all the contexts.. - embedded.start(); - - // Create a very basic container hierarchy - engine = embedded.createEngine(); - -- host = embedded.createHost("localhost", home + "/webapps"); //$NON-NLS-1$ //$NON-NLS-2$ -+ host = embedded.createHost(hostname, home + "webapps"); //$NON-NLS-1$ - - // all request go to our only host - engine.setDefaultHost(host.getName()); -@@ -136,8 +156,9 @@ - ((StandardHost) host) - .setErrorReportValveClass("org.eclipse.tomcat.internal.EclipseErrorReportValve"); //$NON-NLS-1$ - } -+ - engine.addChild(host); -- -+ - // Install the assembled container hierarchy - PrintStream sysOut = System.out; - // reassign standard output to prevent Tomcat from writing -@@ -150,7 +171,7 @@ - } - - // Root context -- Context root = embedded.createContext("", home + "/webapps/ROOT"); //$NON-NLS-1$ //$NON-NLS-2$ -+ Context root = embedded.createContext("", home + "webapps/ROOT"); //$NON-NLS-1$ //$NON-NLS-2$ - // this line should be replaced once tomcat provides support - // for setting the working directory - if (root instanceof StandardContext) { -@@ -159,20 +180,13 @@ - } - root.setLoader(embedded.createLoader(this.getClass() - .getClassLoader())); -- contexts.add(root); -+ - host.addChild(root); -- -- InetAddress iAddress = null; -- if (this.hostAddress != null) { -- try { -- iAddress = InetAddress.getByName(this.hostAddress); -- } catch (UnknownHostException uhe) { -- // will default to all interfaces -- } -- } -+ contexts.add(root); -+ - updateSslPort(iAddress); - if (this.port == 0) { -- this.port = SocketUtil.findUnusedLocalPort(iAddress); -+ this.port = SocketUtil.findUnusedLocalPort(iAddress); - if (this.port == -1) { - throw new CoreException( - new Status( -@@ -184,51 +198,55 @@ - } - } - -- // Create Connector -- Connector connector = embedded.createConnector(null, this.port, -- false); -- // Override defaults on CoyoteConnector -- if (connector instanceof CoyoteConnector) { -- CoyoteConnector connectorImpl = (CoyoteConnector) connector; -- if (iAddress != null) { -- // bug in Embedded that incorrectly sets host on connector. -- // pass null when creating connector, and set host here if -- // it is specified -- connectorImpl.setAddress(iAddress.getHostAddress()); -- } -- Preferences pref = TomcatPlugin.getDefault() -- .getPluginPreferences(); -- int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT); -- if (acceptCount > 0) { -- connectorImpl.setAcceptCount(acceptCount); -- } -- int maxProcessors = pref -- .getInt(TomcatPlugin.PREF_MAX_PROCESSORS); -- if (maxProcessors > 0) { -- connectorImpl.setMaxProcessors(maxProcessors); -- } -- int minProcessors = pref -- .getInt(TomcatPlugin.PREF_MIN_PROCESSORS); -- if (minProcessors > 0) { -- connectorImpl.setMinProcessors(minProcessors); -- } -- if (this.sslPort > 0) { -- connectorImpl.setRedirectPort(this.sslPort); -- connectorImpl.setEnableLookups(true); -- connectorImpl.setConnectionTimeout(20000); -- connectorImpl.setUseURIValidationHack(false); -- connectorImpl.setDisableUploadTimeout(true); -+ // Create Connector -+ Connector connector = embedded.createConnector(iAddress.getHostAddress(), this.port,false);; -+ -+ Preferences pref = TomcatPlugin.getDefault() -+ .getPluginPreferences(); -+ /** -+ * To extend additional properties, make use of org.apache.tomcat.util.IntrospectionUtils -+ * A Connector will initialize a protocolhandler defaults to org.apache.coyote.http11.Http11Protocol -+ * format : connector.setProperty("STRING_PROP_NAME","STRING_PROP_VALUE"); -+ * -+ */ -+ -+ int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT); -+ if (acceptCount > 0) { -+ connector.setProperty("backlog",""+acceptCount); //$NON-NLS-1$ //$NON-NLS-2$ -+ } -+ -+ int maxProcessors = pref -+ .getInt(TomcatPlugin.PREF_MAX_PROCESSORS); -+ if (maxProcessors > 0) { -+ connector.setProperty("maxThreads",""+maxProcessors); //$NON-NLS-1$ //$NON-NLS-2$ -+ } -+ -+ int minProcessors = pref -+ .getInt(TomcatPlugin.PREF_MIN_PROCESSORS); -+ if (minProcessors > 0) { -+ connector.setProperty("minSpareThreads",""+minProcessors); //$NON-NLS-1$ //$NON-NLS-2$ -+ } -+ -+ if (this.sslPort > 0) { -+ connector.setRedirectPort(this.sslPort); -+ connector.setEnableLookups(true); -+ connector.setProperty("soTimeout",""+20000); //$NON-NLS-1$ //$NON-NLS-2$ -+ //connector.setUseURIValidationHack(false); no longer available -+ connector.setUseBodyEncodingForURI(false); -+ String disableUploadTimeout = pref.getString(TomcatPlugin.DISABLE_UPLOAD_TIMEOUT); -+ if ((disableUploadTimeout != null) && (!("".equals(disableUploadTimeout.trim())))) { //$NON-NLS-1$ -+ connector.setProperty("disableUploadTimeout", disableUploadTimeout); //$NON-NLS-1$ - } -- // connectorImpl.setDebug(0); -- // If there is problem in embedded.addConnector() -- // there is no exception, so add a listener -- connectorImpl.addLifecycleListener(new LifecycleListener() { -- public void lifecycleEvent(LifecycleEvent event) { -- if ("start".equals(event.getType())) //$NON-NLS-1$ -- running = true; -- } -- }); - } -+ // connectorImpl.setDebug(0); -+ // If there is problem in embedded.addConnector() -+ // there is no exception, so add a listener -+ connector.addLifecycleListener(new LifecycleListener() { -+ public void lifecycleEvent(LifecycleEvent event) { -+ if (Lifecycle.START_EVENT.equals(event.getType())) -+ hasConnection = true; -+ } -+ }); - - // add Connector to Tomcat - PrintStream sysErr = System.err; -@@ -236,21 +254,16 @@ - // its version message there. - System.setErr(new PrintStream(new ByteArrayOutputStream())); - try { -- embedded.addConnector(connector); -- httpConnector = connector; -+ this.httpConnector = connector; -+ embedded.addConnector(this.httpConnector); -+ httpConnector.start(); - } finally { - System.setErr(sysErr); - } -- - if (this.sslPort > 0) { - createSSLConnector(iAddress, this.sslPort); - } - -- // if null passed for hostAddress, use local host -- if (this.hostAddress == null) { -- this.hostAddress = "127.0.0.1"; //$NON-NLS-1$ -- } -- - // running = true; - TomcatPlugin.getDefault().setAppserver(this); - -@@ -307,82 +320,115 @@ - * @throws CoreException - */ - private void createSSLConnector(InetAddress iAddress, int sslport) -- throws CoreException { -+ throws CoreException { -+ - // Create Connector -- this.sslConnector = embedded.createConnector(null, sslport, false); -- // Override defaults on CoyoteConnector -- if (this.sslConnector instanceof CoyoteConnector) { -- CoyoteConnector connectorImpl = (CoyoteConnector) this.sslConnector; -- if (iAddress != null) { -- // bug in Embedded that incorrectly sets host on connector. -- // pass null when creating connector, and set host here if -- // it is specified -- connectorImpl.setAddress(iAddress.getHostAddress()); -- } -- Preferences pref = TomcatPlugin.getDefault().getPluginPreferences(); -- int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT); -- if (acceptCount > 0) { -- connectorImpl.setAcceptCount(acceptCount); -- } -- int maxProcessors = pref.getInt(TomcatPlugin.PREF_MAX_PROCESSORS); -- if (maxProcessors > 0) { -- connectorImpl.setMaxProcessors(maxProcessors); -- } -- int minProcessors = pref.getInt(TomcatPlugin.PREF_MIN_PROCESSORS); -- if (minProcessors > 0) { -- connectorImpl.setMinProcessors(minProcessors); -- } -- connectorImpl.setUseURIValidationHack(false); -- connectorImpl.setDisableUploadTimeout(true); -- connectorImpl.setSecure(true); -- String scheme = pref.getString(TomcatPlugin.PREF_SSL_SCHEME); -- if ((scheme != null) && (!("".equals(scheme.trim())))) { //$NON-NLS-1$ -- connectorImpl.setScheme(scheme); -- } -- connectorImpl.setEnableLookups(true); -- CoyoteServerSocketFactory factory = new CoyoteServerSocketFactory(); -- factory.setClientAuth(false); -- String protocol = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOL); -- if ((protocol != null) && (!("".equals(protocol.trim())))) { //$NON-NLS-1$ -- factory.setProtocol(protocol); -- } -- String algorithm = pref.getString(TomcatPlugin.PREF_SSL_ALGORITHM); -- if ((algorithm != null) && (!("".equals(algorithm.trim())))) { //$NON-NLS-1$ -- factory.setAlgorithm(algorithm); -- } -- String keyStoreFile = pref -- .getString(TomcatPlugin.PREF_KEY_STORE_FILE); -- if ((keyStoreFile != null) && (!("".equals(keyStoreFile.trim())))) { //$NON-NLS-1$ -- factory.setKeystoreFile(keyStoreFile); -- } -- String keyStorePassword = pref -- .getString(TomcatPlugin.PREF_KEY_STORE_PASSWORD); -- if ((keyStorePassword != null) -- && (!("".equals(keyStorePassword.trim())))) { //$NON-NLS-1$ -- factory.setKeystorePass(keyStorePassword); -- } -- connectorImpl.setFactory(factory); -- connectorImpl.setDebug(0); -- // If there is problem in embedded.addConnector() -- // there is no exception, so add a listener -- connectorImpl.addLifecycleListener(new LifecycleListener() { -- public void lifecycleEvent(LifecycleEvent event) { -- if ("start".equals(event.getType())) //$NON-NLS-1$ -- running = true; -- } -- }); -- } -+ //Defaults to local if IAddress is null -+ Connector connector = embedded.createConnector(iAddress.getHostAddress(), this.port,false); - -- // add Connector to Tomcat -- PrintStream sysErr = System.err; -- // reassign standard error to prevent Coyote from writing -- // its version message there. -- System.setErr(new PrintStream(new ByteArrayOutputStream())); -- try { -- embedded.addConnector(this.sslConnector); -- } finally { -- System.setErr(sysErr); -+ //--------------------create the Protocol-----------------------// -+ Preferences pref = TomcatPlugin.getDefault().getPluginPreferences(); -+ /** -+ * To extend additional properties, make use of org.apache.tomcat.util.IntrospectionUtils -+ * A Connector will initialize a protocolhandler which initialize a SSLImplementation which initialize -+ * a ServerSocketFactory -+ * format : connector.setProperty("STRING_PROP_NAME","STRING_PROP_VALUE"); -+ * -+ */ -+ //----------------configure connector -------------------------------// -+ // by looking at the code, it seems like the protocol go in first -+ String protocol = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOL); -+ if ((protocol != null) && (!("".equals(protocol.trim())))) { //$NON-NLS-1$ -+ connector.setProperty("protocol",protocol); //$NON-NLS-1$ -+ } -+ String protocols = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOLS); -+ if ((protocols != null) && (!("".equals(protocols.trim())))) { //$NON-NLS-1$ -+ connector.setProperty("protocols",protocols); //$NON-NLS-1$ -+ } -+ String protocolClassName = Http11Protocol.class.getName(); -+ connector.setProtocol(protocolClassName); -+ -+ String JSSEImplementationName = JSSEImplementation.class.getName(); -+ connector.setProperty("sslImplementation",JSSEImplementationName); //$NON-NLS-1$ -+ -+ String disableUploadTimeout = pref.getString(TomcatPlugin.DISABLE_UPLOAD_TIMEOUT); -+ if ((disableUploadTimeout != null) && (!("".equals(disableUploadTimeout.trim())))) { //$NON-NLS-1$ -+ connector.setProperty("disableUploadTimeout", disableUploadTimeout); //$NON-NLS-1$ -+ } -+ -+ String algorithm = pref.getString(TomcatPlugin.PREF_SSL_ALGORITHM); -+ if ((algorithm != null) && (!("".equals(algorithm.trim())))) { //$NON-NLS-1$ -+ connector.setProperty("algorithm", algorithm); //$NON-NLS-1$ -+ } -+ int maxProcessors = pref.getInt(TomcatPlugin.PREF_MAX_PROCESSORS); -+ if (maxProcessors > 0) { -+ //connector.setMaxProcessors(maxProcessors); -+ connector.setProperty("maxThreads",""+maxProcessors); //$NON-NLS-1$ //$NON-NLS-2$ -+ } -+ int minProcessors = pref.getInt(TomcatPlugin.PREF_MIN_PROCESSORS); -+ if (minProcessors > 0) { -+ //connector.setMinProcessors(minProcessors); -+ connector.setProperty("minSpareThreads",""+minProcessors); //$NON-NLS-1$ //$NON-NLS-2$ -+ } -+ //this is making use of org.apache.tomcat.util.IntrospectionUtils -+ connector.setProperty("disableUploadTimeout",""+true); //$NON-NLS-1$ //$NON-NLS-2$ -+ String clientauth = pref.getString(TomcatPlugin.PREF_CLIENT_AUTHENTICATION); -+ if ((clientauth != null) && (!("".equals(clientauth.trim())))) { //$NON-NLS-1$ -+ connector.setProperty("clientauth",clientauth); //$NON-NLS-1$ -+ } -+ -+ int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT); -+ if (acceptCount > 0) { -+ connector.setProperty("backlog",""+acceptCount); //$NON-NLS-1$ //$NON-NLS-2$ -+ } -+ -+ String keyStoreFile = pref -+ .getString(TomcatPlugin.PREF_KEY_STORE_FILE); -+ if ((keyStoreFile != null) && (!("".equals(keyStoreFile.trim())))) { //$NON-NLS-1$ -+ connector.setProperty("keystore", keyStoreFile); //$NON-NLS-1$ -+ } -+ String keyStorePassword = pref -+ .getString(TomcatPlugin.PREF_KEY_STORE_PASSWORD); -+ if ((keyStorePassword != null) -+ && (!("".equals(keyStorePassword.trim())))) { //$NON-NLS-1$ -+ connector.setProperty("keypass", keyStorePassword); //$NON-NLS-1$ -+ } -+ //connector.setUseURIValidationHack(false); --no longer avaliable, hope they fixed the bug -+ connector.setUseBodyEncodingForURI(false); -+ // connector.setSecure(true); ---setting ssLImplementation set secure to true -+ String scheme = pref.getString(TomcatPlugin.PREF_SSL_SCHEME); -+ if ((scheme != null) && (!("".equals(scheme.trim())))) { //$NON-NLS-1$ -+ connector.setScheme(scheme); -+ } -+ connector.setEnableLookups(true); -+ -+ //connector.setFactory(factory); --no longer needed, now handled by SSLImplemenatation -+ // If there is problem in embedded.addConnector() -+ // there is no exception, so add a listener -+ connector.addLifecycleListener(new LifecycleListener() { -+ public void lifecycleEvent(LifecycleEvent event) { -+ if (Lifecycle.START_EVENT.equals(event.getType())||Lifecycle.PERIODIC_EVENT.equals(event.getType())) -+ hasSSLConnection = true; -+ } -+ }); -+ // add Connector to Tomcat -+ PrintStream sysErr = (PrintStream) System.err; -+ // reassign standard error to prevent Coyote from writing -+ // its version message there. -+ System.setErr(new PrintStream(new ByteArrayOutputStream())); -+ try{ -+ sslConnector = connector; -+ embedded.addConnector(this.sslConnector); -+ sslConnector.start(); -+ } catch(LifecycleException e){ -+ TomcatPlugin -+ .logError( -+ "Exception occurred while establishing secure connection.", //$NON-NLS-1$ -+ e); - } -+ finally { -+ System.setErr(sysErr); -+ } - } - - /** -@@ -461,17 +507,16 @@ - */ - public synchronized void start(String webappName, IPath path, ClassLoader customLoader) - throws CoreException { -- -+ - if (!isStarted) { - start(port, hostAddress); -- } -+ } - if (!running) { - throw new CoreException(new Status(IStatus.ERROR, - TomcatPlugin.PLUGIN_ID, IStatus.OK, NLS.bind( - TomcatResources.TomcatAppServer_addingWebapp, - webappName, path.toOSString()), null)); - } -- - String contextPath = webappName; - if (!contextPath.startsWith("/")) { //$NON-NLS-1$ - contextPath = "/" + contextPath; //$NON-NLS-1$ -@@ -486,7 +531,6 @@ - - WebAppClassLoader webappLoader = new WebAppClassLoader(customLoader); - context.setLoader(embedded.createLoader(webappLoader)); -- - host.addChild(context); - contexts.add(context); - } catch (Exception exc) { -@@ -601,4 +645,4 @@ - return TomcatPlugin.getDefault().getStateLocation().append(webApp) - .toOSString(); - } --} -+} -\ No newline at end of file -Index: META-INF/MANIFEST.MF -=================================================================== -RCS file: /cvsroot/eclipse/org.eclipse.tomcat/META-INF/MANIFEST.MF,v -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-Version: 4.1.230.qualifier - Bundle-ClassPath: tomcatwrapper.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, -- naming-common.jar, - naming-factory.jar, - naming-resources.jar, -- servlet.jar, -- servlets-common.jar, - servlets-default.jar, - servlets-invoker.jar, -- servlets-manager.jar, - tomcat-coyote.jar, -- tomcat-http11.jar, -- tomcat-util.jar -+ 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 diff --git a/eclipse.in b/eclipse.in deleted file mode 100644 index 5288e7d..0000000 --- a/eclipse.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -exec @LIBDIR@/eclipse/eclipse \ - ${1+"$@"} diff --git a/eclipse.spec b/eclipse.spec index fc1d9bc..88f2b80 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -22,7 +22,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 23%{?dist} +Release: 24%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -119,6 +119,7 @@ Patch26: %{name}-launcher-fix-java-home.patch # JVM crash: # http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6614100 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=214092 +# https://bugzilla.redhat.com/show_bug.cgi?id=461860 (mnowak) Patch29: %{name}-memorypermsizeandjvmcrash.patch Patch31: %{name}-ia64-packaging.patch @@ -1515,6 +1516,10 @@ fi %{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Thu Sep 25 2008 Michal Nowak 3.4.0-24 +- exclude parts of eclipse-pydev from JIT compilation +- Resolves: bug 461860 + * Tue Sep 02 2008 Andrew Overholt 3.4.0-23 - Use icu4j in its new place. diff --git a/import.log b/import.log new file mode 100644 index 0000000..5e4482d --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +eclipse-3_4_0-24_fc10:HEAD:eclipse-3.4.0-24.fc10.src.rpm:1222346507 diff --git a/pre320changelog.txt b/pre320changelog.txt deleted file mode 100644 index 44b09bb..0000000 --- a/pre320changelog.txt +++ /dev/null @@ -1,767 +0,0 @@ -* Fri Jul 14 2006 Andrew Overholt 3.1.2-1jpp_16fc -- Try >= instead of = for the -devel package requirements to facilitate our - -devel to -sdk rename (to match upstream) with 3.2.0. - -* Tue May 30 2006 Ben Konrath 3.1.2-1jpp_15fc -- Bump release. - -* Mon May 29 2006 Ben Konrath 3.1.2-1jpp_14fc -- Add pde.build-add-package-build.patch to add generic releng scripts. -- Move doc.isv plugins to devel packages and require java-javadoc on devel - packages. -- Add pde-runtime subpackage - needed for PHPeclipse package. -- Update libswt mozilla patch for mozilla 1.7.13. -- Add swt patch to fix rh#191536, e.o#98371. - -* Tue Mar 07 2006 Andrew Overholt 3.1.2-1jpp_13fc -- One more small help fix (include tomcatwrapper.jar o.e.tomcat manifest). - -* Fri Mar 03 2006 Andrew Overholt 3.1.2-1jpp_12fc -- Only build with a native ecj on x86{,_64} - -* Tue Feb 28 2006 Andrew Overholt 3.1.2-1jpp_12fc -- Update to tomcat 5.5 (e.o#98371). -- Don't build on ppc64 until we get the tomcat situation straightened out. - -* Fri Feb 17 2006 Igor Foox - 1:3.1.2-1jpp_10fc -- Added patch for ppc64. - -* Fri Feb 17 2006 Igor Foox - 1:3.1.2-1jpp_9fc -- Try build on ppc64. - -* Fri Feb 17 2006 Andrew Overholt - 1:3.1.2-1jpp_8fc -- Try build on ppc64 (rh#172172, rh#181846). - -* Fri Feb 10 2006 Jesse Keating - 1:3.1.2-1jpp_7fc -- bump again for double-long bug on ppc(64) - -* Fri Feb 10 2006 Ben Konrath 3.1.2-1jpp_6fc -- Update the rebuild-sdk-features script to use the 3.1 updatesite (rh#180387, rh#180768). -- Make platform/feature.xml reference the tomcat5 plugin. - -* Thu Feb 09 2006 Andrew Overholt 3.1.2-1jpp_4fc.FC4 -- Always generate debug info when building RPMs (Andrew Haley). -- Slightly modify swt-gtk symlinks (rh#180000). - -* Mon Feb 06 2006 Andrew Overholt 3.1.2-1jpp_4fc -- Add an swt-gtk.jar and fix symlink to point to correct jar (rh#180000). -- Link against generic libjawt.so (rh#158755). -- Re-add patch to use built launcher. - -* Sat Feb 4 2006 Ben Konrath 3.1.2-1jpp_3fc -- Update efj patches to match what has been committed to HEAD. - -* Fri Feb 3 2006 Igor Foox 3.1.2-1jpp_2fc -- Updated launcher script. - -* Tue Jan 31 2006 Andrew Overholt 3.1.2-1jpp_1fc -- 3.1.2. -- Remove unnecessary patches. - -* Tue Jan 31 2006 Karsten Hopp -- BuildRequire: unzip - -* Thu Jan 05 2006 Andrew Overholt 3.1.1-1jpp_1fc.FC4.12 -- Rebuild with new gjdoc (rh#161147). - -* Wed Jan 04 2006 Andrew Overholt 3.1.1-1jpp_15fc -- Use natively-compiled ecj during build. -- Change about_files to be i386 and x86_64 only (will patch file upstream). - -* Mon Dec 19 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.11 -- Update patch for offline javadoc linking. -- Rebuild with new gjdoc (rh#161147). - -* Tue Dec 13 2005 Igor Foox 3.1.1-1jpp_1fc.FC4.10 -- New version of launcher path (rh#175454). - -* Mon Dec 12 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.9 -- Use ecj from 3.1.1 (rh#175380). -- Remove ecj options patch as it is in ecj from 3.1.1. -- New version of launcher patch (rh#175454) - ifoox. - -* Fri Dec 09 2005 Ben Konrath -- update updatehomedir-core.patch to remove unused code - -* Wed Dec 07 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.8 -- Add patch for launcher following symlinks (rh#168726, e.o#79592) - ifoox. -- Remove launcher script. - -* Mon Dec 05 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.7 -- Add eclipse-rcp-devel as a requirement of eclipse-platform-devel - (rh#161267). -- Updated splash screen (thanks to Diana Fong) (rh#170580). -- Include and use rebuild-sdk-features (rh#173589). - -* Fri Dec 02 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.7 -- Update EFJ patch (e.o#75333). -- Update update-site-in-home-dir patch (e.o#90630) - bkonrath. - -* Mon Nov 29 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.6 -- Rebuild with new gcc (4.0.2) (rh#146463, rh#151919, rh#158137, rh#163079, - rh#161483 <-- hooray for Andrew Haley!). -- All jars now natively-compiled. -- Patch org.eclipse.help.webapp jasper classpath. -- Import work done by Debian Eclipse packagers: - - Add Fedora version in Eclipse about dialog. - - Update eclipse-javadoc.patch to match Debian's disable-filelog patch. - - Remove buildDoc patches and add helpindexbuilder patch (e.o#114001). -- Add BuildRequires for libgnome{,ui}-devel (rh#171532). - -* Wed Nov 02 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.5 -- Remove native compilation for o.e.team.cvs.core (rh#163079). - -* Fri Oct 28 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.4 -- Add patch to use built launcher (e.o#83454). - -* Thu Oct 27 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.3 -- Really fix browser issue on x86_64 (rh#168040). - -* Tue Oct 25 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.2 -- Make non-gcj builds not noarch (rh#171711). - -* Fri Oct 21 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.1 -- Back-port 3.1.1 to FC4. -- Use native /usr/bin/ecj. - -* Wed Oct 12 2005 Andrew Overholt 3.1.1-1jpp_2fc -- Add JavaModelCache overflow patch (e.o#111299). - -* Tue Oct 11 2005 Andrew Overholt 3.1.1-1jpp_1fc -- 3.1.1. -- Patch around gij failing for the doc plug-in generation. -- Make /usr/bin/ecj a script (allows all jvms to call it). - -* Sat Oct 08 2005 Andrew Overholt 3.1.0_fc-15 -- Bump mozilla requirement. -- Re-enable org.eclipse.ui.forms_3.1.0.jar.so, org.eclipse.osgi_3.1.0.jar.so, - and org.eclipse.ui.workbench_3.1.0.jar.so (rh#146463, rh#158137, rh#151919) -- Add patch for /etc/gre64.conf (for 64-bit systems, rh#168040, e.o#109253). -- Remove MOZILLA_FIVE_HOME magic from eclipse.script. -- Remove jdtCompilerAdapter.jar due to aot-compile-rpm smarts. -- Bump gcc and java-gcj-compat requirements. -- Remove lucene-1.4.3-src.zip (rh#170343). - -* Wed Aug 24 2005 Andrew Overholt 3.1.0_fc-14 -- /usr/lib -> %{_libdir} in eclipse.script (rh#159031). - -* Tue Aug 23 2005 Andrew Overholt 3.1.0_fc-13 -- Bump mozilla requirement. - -* Thu Jul 28 2005 Gary Benson 3.1.0_fc-12 -- Allow leading separators in classpaths (e.o#105430). -- Clear away ant-jmf entirely. - -* Wed Jul 27 2005 Andrew Overholt 3.1.0_fc-11 -- Bump release for FC4 update. -- Remove ant-jmf from exclude list. - -* Mon Jul 25 2005 Andrew Overholt 3.1.0_fc-10 -- Change mozilla BuildRequirement to be equals and not greater-than or equals - since we need the exact version for our patches. -- Bump mozilla requirements and patches to 1.7.10. -- Bump release due to FC4 update still not being released. -- Add ant-jmf to exclude list. - -* Thu Jul 21 2005 Andrew Overholt 3.1.0_fc-9 -- Bump release for FC4 update. -- Bump gcc requirement to that available in FC4 updates. - -* Tue Jul 19 2005 Andrew Overholt 3.1.0_fc-8 -- Bring in work done on rawhide: -- Update to use java-gcj-compat and not java-1.4.2-gcj-compat. -- Keep mozilla requirement off ppc64. -- Remove lots of jiggery-pokery with native compilation and use gbenson's new - aot-compile. -- Re-work files sections appropriately. -- Downgrade gcc requirement so we can build for FC4 in advance of gcc update. -- Bump release for FC4 update. - -* Tue Jul 05 2005 Andrew Overholt 3.1.0_fc-3 -- Bump release for FC4 update. - -* Mon Jul 04 2005 Andrew Overholt 3.1.0_fc-2 -- Remove remaining pre-built ant jars (but don't symlink to ant.jar until we - have ant 1.6.5 - rh#162444). -- Bump requirement on gcc to get fixes for rh#158614 and gcc#21637. -- Add patch to not try to link to external javadocs and include the javadoc - output in the build output. -- Add build and runtime requirement on ant-javamail (I'm not sure how we missed - this previously). - -* Mon Jul 4 2005 Gary Benson 3.1.0_fc-2 -- Disable classpath access rules introduced in e.o#92398 (rh#162177). - -* Tue Jun 28 2005 Andrew Overholt 3.1.0_fc-1 -- Import 3.1. -- Update splash screen. - -* Sun Jun 26 2005 Andrew Overholt 3.1.0_fc-0.RC4.1 -- Import 3.1 RC4. -- Remove activeHelpSample.jar building patch as it's now fixed upstream. -- Add patch to remove references to cairo since we don't have it in FC4. -- Add about.html and about_files to eclipse-platform.install (x86 & x86_64). -- Add patch to create public compare API (jpound - e.o#98707). -- Add patch from Robin Green to not look for firefox libxpcom.so (rh#161658). -- Symlink lucene jars (rh#159939). - -* Fri Jun 24 2005 Andrew Overholt 3.1.0_fc-0.RC3.3 -- Add rcp requirement for platform (rh#161267). -- Add un-owned osgi directories to libswt and platform. - -* Tue Jun 21 2005 Andrew Overholt 3.1.0_fc-0.RC3.2 -- Use SWT bundle ID for SWT %files list (determine in %%install). - -* Mon Jun 20 2005 Andrew Overholt 3.1.0_fc-0.RC3.1 -- Import 3.1RC3. -- Use FileInitializer (e.o#90535) - this should eliminate .sos in ~/.eclipse. -- Add eclipse-filenamepatterns.txt ("*.so" currently) for above. -- Symlink JNI libraries. - -* Fri Jun 17 2005 Andrew Overholt 3.1.0_fc-0.RC2.2 -- Update to new naming scheme for resulting gzipped tarball. -- Add patch to not generate help indices (it seems to hang). - -* Thu Jun 16 2005 Andrew Overholt 3.1.0_fc-0.RC2.1 -- Import 3.1RC2. -- Add RCP sub-package. Unsure about its dependencies ATM. - -* Tue Jun 14 2005 Andrew Overholt 3.1.0_fc-0.M7.9 -- Add tomcat5 patch and symlinks. - -* Thu May 26 2005 Andrew Overholt 3.1.0_fc-0.M7.8 -- Fix ant jar removal (gbenson). - -* Wed May 25 2005 Andrew Overholt 3.1.0_fc-0.M7.7 -- Fix ecj symlink in /usr/share/java (rh#158734). - -* Sun May 22 2005 Andrew Overholt 3.1.0_fc-0.M7.4 -- Remove compilation of jdt.ui jar.so on ppc. - -* Sat May 21 2005 Ben Konrath 3.1.0_fc-0.M7.3 -- Add ecj-options patch to bootstrap source. -- Make embedded browser widget work (Robin Green). -- Bump required version of java-gcj-compat to the latest (-40jpp_24rh). -- Use -lgcjawt when building with gcj. - -* Wed May 18 2005 Ben Konrath 3.1.0_fc-0.M7.2 -- Disable org.eclipse.osgi_3.1.0.jar.so. -- Add ecj-options patch, remove ecj-extdirs patch. - -* Wed May 18 2005 Ben Konrath 3.1.0_fc-0.M7.1 -- Update to 3.1M7. -- Add file initializer patch. -- Temporarily remove s390{,x} patches. -- Update GNU formatter ui patch. -- Add ECJ ext dirs patch. - -* Tue May 17 2005 Andrew Overholt 3.1.0_fc-0.M6.19 -- Add Epoch on eclipse-platform. -- Use %%{_bindir} in post and postun scripts. - -* Tue May 17 2005 Ben Konrath 3.1.0_fc-0.M6.18 -- Add Epoch to jsch requires. - -* Mon May 16 2005 Ben Konrath 3.1.0_fc-0.M6.17 -- Update libswt-mozilla patches and require mozilla 1.7.8. - -* Fri May 13 2005 Andrew Overholt -- Use %%{ix86} macro in ExclusiveArch rather than i386 (jorton). - -* Wed May 11 2005 Ben Konrath -- Add jsch >= 0.1.18-1jpp. -- Remove Fedora specific part of junit version. -- Temporarily disable org.eclipse.ui.forms_3.1.0.jar.so (rh#146463). - -* Mon May 09 2005 Ben Konrath 3.1.0_fc-0.M6.16 -- Add Requires junit >= 3.8.1-3jpp_4fc to JDT. -- Add -g to gcj calls. - -* Thu May 05 2005 Andrew Overholt 3.1.0_fc-0.M6.15 -- Rebuild with new gjdoc (rh#152049). - -* Wed May 4 2005 Ben Konrath -- Re-enable jdt.ui/jdt.jar.so and require gcj 4.0.0-2 (rh#151296). - -* Mon May 2 2005 Ben Konrath 3.1.0_fc-0.M6.14 -- Replace temporary patch to debug.ui with upstream patch to swt (rh#155853). - -* Sat Apr 30 2005 Ben Konrath 3.1.0_fc-0.M6.13 -- Add patch to temporarily stop an NPE in debug.ui (rh#155853). - -* Thu Apr 28 2005 Phil Muldoon -- Allow multiple optional arguments in eclipse-copy-platform.sh - -* Wed Apr 27 2005 Andrew Overholt -- Include epoch in mozilla BuildRequires. -- Remove last remaining gij-specific option from eclipse.script. - -* Wed Apr 27 2005 Jeremy Katz 3.1.0_fc-0.M6.12 -- silence %%post - -* Sun Apr 24 2005 Andrew Overholt 3.1.0_fc-0.M6.11 -- Re-add osgi.jar.so since gcj fix is in our gcc RPMs. -- Bump gcc requirements accordingly. -- Add gcc-c++ to BuildRequires (for SWT Mozilla). -- Add specific java-1.4.2-gcj-compat nvr requirement (rh#151866). - -* Fri Apr 22 2005 Aaron Luchko 3.1.0_fc-0.M6.10 -- Import archived projects (e.o#82988) - -* Fri Apr 22 2005 Andrew Overholt -- Add Requires(post,postun): java-1.4.2-gcj-compat for each sub-package and use - full path (Joe Orton). -- Make /usr/bin/eclipse executable again (rh#155715). -- Bump jsch version. - -* Thu Apr 21 2005 Andrew Overholt 3.1.0_fc-0.M6.9 -- Use upstream icons (not RHDS ones) (rh#146484). -- Add plugin directories to %files sections. -- Rework %files sections a bit. -- Fix SWT symlink (bkonrath). -- Temporarily remove jdt.ui/jdt.jar.so. - -* Thu Apr 21 2005 Ben Konrath 3.1.0_fc-0.M6.8 -- Fix updatesite patch. -- Temporarily remove org.eclipse.ui.workbench_3.1.0.jar.so (r.c#151919) - -* Mon Apr 18 2005 Andrew Overholt 3.1.0_fc-0.M6.7 -- Add %if %%{gcj_support} blocks. -- Add %%{_libdir}/%%{name}/plugins to native %files section of each sub-rpm. -- Add GNU-style JDT code formatting option (e.o#91770). -- Add patch to install plugins from update site in home dir (e.o#90630). -- Change gcc-java requirements to libgcj as gcj-dbtool is now in the latter. - -* Mon Apr 18 2005 Ben Konrath 3.1.0_fc-0.M6.6 -- Bump version number. - -* Mon Apr 18 2005 Ben Konrath 3.1.0_fc-0.M6.5 -- Update mozilla patch. - -* Sat Apr 16 2005 Ben Konrath 3.1.0_fc-0.M6.4 -- Update to 3.1M6. -- Change bootstrap procedure to match the upstream method. -- Remove patches that were fixed upstream. -- Add efj wrapper script. - -* Wed Apr 13 2005 Ben Konrath 3.1.0_fc-0.M5.20 -- Fix the bootstrap patch (the ecj jar was missing some files). - -* Tue Apr 12 2005 Andrew Overholt 3.1.0_fc-0.M5.19 -- Add Requires(post,postun): java-1.4.2-gcj-compat for rebuild-gcj-db (Joe - Orton). -- Add ecj binary. - -* Wed Apr 06 2005 Andrew Overholt 3.1.0_fc-0.M5.18 -- Fix typo in gcj db building loops. -- Add -O1 to x86_64 jar.so compilation. -- Add EFJ (Eclipse Formatter for Java) patches (bkonrath) (e.o#75333). -- Add patch to build swttools.jar (e.o#90364). -- Symlink out to ant-jsch now that we have that. - -* Mon Apr 04 2005 Andrew Overholt 3.1.0_fc-0.M5.17 -- Actually insert .jar-.jar.so combinations into sub-dbs. - -* Thu Mar 31 2005 Andrew Overholt 3.1.0_fc-0.M5.16 -- Fix eclipse.script to not leave a sh process around (Joe Orton) -- Use proper sub-dbs. -- Don't compile jars that are symlinked from elsewhere. -- Add jar-so combinations to .db based on .jar.so existence (not .jar). -- Rename sub-dbs to be eclipse-*.db. -- Use rebuild-gcj-db script. - -* Mon Mar 28 2005 Christopher Aillon -- rebuilt - -* Fri Mar 25 2005 Christopher Aillon 3.1.0_fc-0.M5.14 -- Update the GTK+ theme icon cache on (un)install - -* Fri Mar 18 2005 Andrew Overholt 3.1.0_fc-0.M5.13 -- Re-add compilation of resources.jar. -- Backport bootstrapping patch. -- Add Requires: java-1.4.2-gcj-compat. -- Modified find patch courtesy Ziga Mahkovec (RH#149927#). -- Compile with -O2 on ppc as well. -- Add jsch, jakarta-commons-modeler, and mx4j symlinking. -- Make use of gcj-dbtool -f to create databases in install. -- Use system-wide classmap.db. -- Remove *.jarswithnativelibs from files sections. -- Update mozilla dependency. - -* Mon Mar 07 2005 Ben Konrath 3.1.0_fc-0.M5.12 -- Add activeHelpSample.jar patch. -- Change to Fedora M-build splash screen. -- Add find patch courtesy Ziga Mahkovec (RH#149927#) -- Build native stuff with -O2 on i386. - -* Mon Mar 07 2005 Andrew Overholt 3.1.0_fc-0.M5.11 -- Add s390 and s390x patches. -- Don't build for them, though, due to gcc bug and Eclipse building issue. -- Add xorg-x11-devel BuildRequires. - -* Fri Mar 04 2005 Andrew Overholt 3.1.0_fc-0.M5.10 -- Add proper mozilla version. -- Don't build eclipseAdaptor.jar.so in order to work around plugin building - problems. - -* Thu Mar 03 2005 Andrew Overholt 3.1.0_fc-0.M5.9 -- Add patch to build libswt-mozilla. -- Build libswt-awt. -- Add 64-bit swt lib list. - -* Tue Mar 01 2005 Andrew Overholt 3.1.0_fc-0.M5.8 -- Add ppc. -- Add patch to copy over icon for unsupported (upstream) platforms but don't - include the source for the launcher. -- gcc4 -> gcc changes. -- Add swt-cairo to 64-bit platforms' %files. - -* Fri Feb 25 2005 Andrew Overholt 3.1.0_fc-0.M5.7 -- Add tar args patch (e.o #86571). -- New build bootstrapping patches. - -* Fri Feb 25 2005 Andrew Overholt 3.1.0_fc-0.M5.6 -- Re-work how we do the gcj-dbtool magic. -- Don't remove ant-netrexx (need to find an RPM if we can). - -* Sun Feb 20 2005 Andrew Overholt 1:3.1_fc-0.M5.5 -- Build for just i386 and x86_64 for now due to upstream gcc bugs. - -* Sun Feb 20 2005 Andrew Overholt 1:3.1_fc-0.M5.1 -- New 3.1M5a build using upstream build method. -- Re-organize sub-packages (ecj, platform, platform-devel, jdt, jdt-devel, pde, - pde-devel, fold gtk2 package into platform). -- Move jface and org.eclipse.text into libswt3-gtk2. -- Bring in JPackage symlinks for packages we have in Fedora (David Walluck) and - put in %%prep. -- Work around x86_64 filename differences. -- Remove xerces, xalan, and xml-commons-apis requirement (and LD_PRELOAD from - script). -- Bootstrap build. -* Tue Jan 18 2005 Andrew Overholt 3.1-0.M4.21 -- explicitly require java-1.4.2-gcj4-compat-devel - -* Mon Jan 17 2005 Andrew Overholt 3.1-0.M4.20 -- add ppc64 - -* Mon Jan 17 2005 Andrew Overholt 3.1-0.M4.19 -- more 64-bit platform and launching script fixes -- add ppc - -* Sat Jan 15 2005 Andrew Overholt 3.1-0.M4.18 -- script path fixes -- x86_64 fixes - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.17 -- sed typo - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.15 -- fix /usr/share -> /usr/lib error in launcher script -- only add to the db those jar-so combinations that we've compiled - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.12 -- typos in %files - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.11 -- remove ppc for now - -* Fri Jan 14 2005 Andrew Overholt 3.1-0.M4.10 -- make PDE depend upon JDT -- move precompiled db to %{_libdir}/eclipse -- modify launching script to use compiled .sos -- rename compiled .sos to be .jar.so instead of .so -- for now, do dbtool adding in platform install - -* Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.9 -- add ppc -- add launcher and swt patches - -* Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.7 -- make jdtcore*.jar part of eclipse-ecj - -* Wed Jan 12 2005 Andrew Overholt 3.1-0.M4.6 -- use installed java-devel rpm instead of bootstrapping one - -* Tue Jan 11 2005 Andrew Overholt 3.1-0.M4.5 -- fix when we set JAVA_HOME variable - -* Tue Jan 11 2005 Andrew Overholt 3.1-0.M4.2 -- fix typos - -* Tue Jan 11 2005 Andrew Overholt 3.1-0.M4.1 -- fix versioning and release to upgrade cleanly - -* Tue Jan 11 2005 Andrew Overholt 3.1.M4-9 -- add Provides: ecj for eclipse-ecj - -* Tue Jan 11 2005 Andrew Overholt 3.1.M4-9 -- update patches - -* Tue Jan 11 2005 Andrew Overholt 3.1.M4-5 -- import all necessary patches - -* Mon Jan 10 2005 Andrew Overholt 3.1.M4-4 -- fix /usr/lib -> %{_datadir} to be /usr/lib -> %{_libdir} in - %{_bindir}/eclipse - -* Mon Jan 10 2005 Andrew Overholt 3.1.M4-3 -- add xerces - -* Mon Jan 10 2005 Andrew Overholt 3.1.M4-2 -- fold ecj-native into ecj -- add FIXMEs for necessary work -- add xml .jar->.so compilations so we can work without gnujaxp -- modify launching script to take this into account - -* Wed Jan 05 2005 Andrew Overholt 3.1.M4-1 -- new upstream milestone build -- re-organize sub-rpms - -* Mon Dec 20 2004 Andrew Overholt 3.0.1-4 -- build ecj first and use it to build the rest -- add %selfbuild to toggle between builds with java-gcj-compat style and other - JREs -- fold scripts into platform - -* Mon Nov 22 2004 Ben Konrath 3.0.1-3 -- split cvs-permission-bits.patch in two -- bug fix for cvs-permission-bits.patch - -* Fri Oct 29 2004 Ben Konrath 3.0.1-2 -- add symlink for releng plugins that rely on o.e.pde.build_3.0.0 - -* Fri Oct 29 2004 Ben Konrath 3.0.1-1 -- updated to Eclipse 3.0.1 -- updated jnigen patch -- removed some debugging print statements -- updated Red Hat documentaion sources -- added Red Hat documentation pdf -- remove commented ftp-webdav stuff as it will be in it's own spec file - -* Tue Oct 04 2004 Aaron Luchko 3.0.0-26 -- Changed the splash screen from a bmp to a png and fixed -- copyright date - -* Mon Aug 31 2004 Aaron Luchko 3.0.0-25 -- Building docs after the main build using headless eclise - to build the extension points - -* Mon Aug 16 2004 Ben Konrath 3.0.0-24 -- Add cvs permission bits patch - -* Wed Aug 04 2004 Elliot Lee 3.0.0-23 -- Unblock hack no longer needed. - -* Mon Jul 26 2004 Jeremy Handcock 3.0.0-22 -- Update Red Hat documentation sources - -* Thu Jul 22 2004 Tom Tromey 3.0.0-21 -- Set eclipse_arch for ppc -- Tell build about real platform -- Make swt.gtk install directory - -* Thu Jul 22 2004 Jeremy Handcock 3.0.0-20 -- Don't build on ppc64 -- Change Requires and BuildRequires to java >= 1.4.2 -- eclipse-platform package obsoletes old eclipse package - -* Wed Jul 21 2004 Jeremy Handcock 3.0.0-19 -- Update copy-platform with patch from Keith Seitz - -* Tue Jul 20 2004 Tom Tromey 3.0.0-18 -- Allow copy-platform to copy non-core parts as well - -* Tue Jul 20 2004 Jeremy Handcock 3.0.0-17 -- Update Red Hat documentation sources - -* Tue Jul 20 2004 Ben Konrath 3.0.0-16 -- Add patch for welcome screen - -* Mon Jul 19 2004 Tom Tromey 3.0.0-15 -- Don't require IBM JDK -- Don't build AWT/SWT interaction code - -* Fri Jul 16 2004 Tom Tromey 3.0.0-14 -- Install copy-platform correctly - -* Fri Jul 16 2004 Tom Tromey 3.0.0-13 -- Removed debugging code -- Added copy-platform script - -* Thu Jul 15 2004 Jeremy Handcock 3.0.0-12 -- Add Red Hat-specific documentation - -* Thu Jul 15 2004 Tom Tromey 3.0.0-12 -- Fixed provides/requires versioning buglets - -* Wed Jul 14 2004 Tom Tromey 3.0.0-11 -- Unblock signals before running ant - -* Wed Jul 14 2004 Tom Tromey 3.0.0-10 -- Added some debugging code - -* Tue Jul 13 2004 Jeremy Handcock 3.0.0-9 -- Add help server patch to prevent outside access - -* Fri Jul 9 2004 Tom Tromey 3.0.0-9 -- Handle libswt*.so correctly - -* Wed Jul 8 2004 Tom Tromey 3.0.0-9 -- Reworked 64 bit platform support -- org.eclipse.swt.tools now included in standard zip file -- Removed alternatives -- Added platform launcher patch - -* Thu Jul 8 2004 Jeremy Handcock 3.0.0-9 -- Don't BuildRequires: junit -- Don't symlink against JPackage jars; use eclipse.org ones instead - -* Tue Jul 6 2004 Tom Tromey 3.0.0-8 -- Work around "ppc64pseries" arch oddity -- Add classic-ant hack - -* Wed Jun 30 2004 Tom Tromey 3.0.0-7 -- Only install one desktop file; check it; updated contents - -* Tue Jun 29 2004 Tom Tromey 3.0.0-6 -- Require IBM JDK -- Only build on our platforms - -* Mon Jun 28 2004 Tom Tromey 3.0.0-5 -- Inlined libswt install source -- Special case for ia64 Xtst directory - -* Fri Jun 25 2004 Tom Tromey 3.0.0-4 -- Added patch for Mozilla build; disabled though -- Updated to 3.0 final - -* Thu Jun 24 2004 Tom Tromey 3.0.0-3 -- Removed more Motif code -- Updated to use more jpackage macros - -* Tue Jun 22 2004 Tom Tromey 3.0.0-2 -- Updated to Eclipse 3.0RC3 - -* Mon May 24 2004 Tom Tromey 3.0.0-1 -- Updated to Eclipse 3.0M8 -- Removed Motif build -- Removed some non-Red Hat code -- Added Red Hat artwork -- Build on non-x86 architectures - -* Sun Apr 25 2004 Ville Skyttä - 0:2.1.3-2jpp -- Fix "patch -p" levels. -- More coverage for failonerror and non-verbosity during build. - -* Fri Apr 23 2004 David Walluck 0:2.1.3-1jpp -- remove patches that were fixed upstream since the last release -- eclipse-pde now requires eclipse-source (thanks Michael Reinsch) -- add patch to allow compilation on recent GTK+ versions - (thanks Rudi Chiarito) -- include %%{_libdir}/libswt-gnome-gtk-%%{swt_version}.so in gtk2 - package - -* Sun Nov 16 2003 David Walluck 0:2.1.2-6jpp -- 2.1.2 public release -- %{_datadir}/%{name}/plugins is now used for plugins, and you must - move any plugins that you have manually installed into - %{_libdir}/%{name}/plugins to the new location. The new location is - not expected to change - -* Sat Nov 15 2003 David Walluck 0:2.1.2-5jpp -- apply patch from Ville to remove some motif conditional parts -- apply patch from Ville for .desktop -- make platform own %%{_libdir}/%{name} - -* Fri Nov 14 2003 David Walluck 0:2.1.2-4jpp -- have platform package provide and obsolete sdk package -- fold javac package back into jdt package - -* Tue Nov 11 2003 David Walluck 0:2.1.2-3jpp -- /usr/bin/mozilla is now required by eclipse-ui and not eclipse-platform -- make libswt2 required by motif and gtk subpackages -- disable motif by default (unsupported) -- motif and gtk related files are now fully separated from other packages - -* Mon Nov 10 2003 Ville Skyttä - 0:2.1.2-2jpp -- Don't use the Mandrake-specific %%mklibname macro. -- Update freedesktop.org desktop entry categories. -- Try to look up the QT dir in portable fashion. -- Refactor refactor-rename patch into two due to spaces in pathnames. -- Fix $RPM_OPT_FLAGS handling. -- Untabify specfile. - -* Sat Nov 08 2003 David Walluck 0:2.1.2-1jpp -- 2.1.2 - -* Thu Nov 06 2003 David Walluck 0:2.1.1-4jpp -- use versioned dirs -- add pde, javac, and motif subpackages and remove sdk subpackage -- patches from Debian -- fail build on error -- add libswt (GTK, Motif) packages - -* Sun Sep 21 2003 David Walluck 0:2.1.1-3jpp -- apply new patch for non-working rename action from Michael Reinsch -- build for Mandrake 9.2 with Sun JDK 1.4.2 - -* Thu Aug 21 2003 Ville Skyttä - 0:2.1.1-2jpp -- Include missed plugins: org.eclipse.ui.versioncheck (platform), - org.eclipse.pde.source (sdk). Thanks to Markus Härnvi for the heads up. - -* Sun Jun 29 2003 Michael Reinsch 0:2.1.1-1jpp -- patch for non-working rename action -- eclipse 2.1.1 -- Ville's comments: patch not applied, it didn't fix the problem completely. - Still built with Sun's 1.3.1.08. - -* Sun Jun 8 2003 Ville Skyttä - 0:2.1.0-4jpp -- Use xmlParserAPIs.jar that comes with Eclipse instead of xml-commons-apis: - - -* Sun Jun 1 2003 Ville Skyttä - 0:2.1.0-3jpp -- Rebuild with Sun's 1.3.1_08 to work around Eclipse Java 1.4.x build bug: - -- Drop %%{release} from subpackage interdependencies in order to make it - possible to do partial subpackage-only updates in the future. -- Make legacymenu conflict with redhat-menus. -- Add icon symlink in %%{_datadir}/pixmaps. - -* Mon Apr 21 2003 David Walluck 0:2.1.0-2jpp -- fix mdkmenu -- add Distribution and Vendor tags - -* Thu Apr 03 2003 David Walluck 0:2.1.0-1jpp -- 2.1 -- add %{name}-make-ld.patch to work around problems building on Mandrake 9.1 -- add Mandrake 9.1 comments to BuildRequires - -* Wed Mar 26 2003 Ville Skyttä - 0:2.1.0-0.rc3b.3jpp -- Rebuilt for JPackage 1.5. - -* Tue Mar 25 2003 Ville Skyttä - 0:2.1.0-0.rc3b.2jpp -- Add java.library.path and -Xms64M to default config. -- Don't use "-dev bin" by default. -- Use X-JPackage instead of X-Red-Hat-Extra in standard menu entry. -- Fix MDK menu entry title and summary. - -* Mon Mar 24 2003 Ville Skyttä - 0:2.1.0-0.rc3b.1jpp -- Update to 2.1.0 RC3b. -- Spec file and build cleanups, mostly from David Walluck. -- No longer requires csh. -- Made *.so in the gtk and platform packages executable. -- The %%{_libdir}/%{name} directory is now owned by the platform package. - -* Fri Mar 14 2003 Ville Skyttä - 2.1.0-0.rc2.2jpp -- Include a couple of platform files missing from the previous build. -- Remove bogus files from platform, ftp-webdav and sdk file lists. -- Abort with error if the file lists refer to nonexistent files. - -* Sun Mar 9 2003 Ville Skyttä - 2.1.0-0.rc2.1jpp -- Update to 2.1.0 RC2. -- Merge David Walluck's packaging work. -- Use JPackage lucene. -- Don't include Motif stuff. - -* Thu Mar 6 2003 Ville Skyttä - 2.1.0-0.rc1.0jpp -- First try at packaging. diff --git a/sources b/sources index 4a6ad75..4a0a6b7 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2 -28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip 611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2 +26ef7c2af793ec8b4ecffb62616483d1 eclipse-3.4.0-testframework.tar.bz2 +43c2aa722a815c61706549d28786d134 eclipse-ecj-gcj.tar.bz2 +e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2 555c99aee06fc52d2ec03995b5ac0710 eclipse-sourceBuild-srcIncluded-3.4.zip +28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip 372361ae6f1355ec5cfb9a301ad690f5 org.fedoraproject.ide.platform-3.4.0-1.zip -43c2aa722a815c61706549d28786d134 eclipse-ecj-gcj.tar.bz2 -26ef7c2af793ec8b4ecffb62616483d1 eclipse-3.4.0-testframework.tar.bz2