diff --git a/eclipse-build.patch b/eclipse-build.patch
index 36a2f57..973e3df 100644
--- a/eclipse-build.patch
+++ b/eclipse-build.patch
@@ -1,6 +1,11 @@
---- build.xml.orig	2005-06-07 16:53:26.000000000 -0400
-+++ build.xml	2005-06-16 16:07:11.000000000 -0400
-@@ -72,6 +72,20 @@
+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,21 @@
  			<arg line="build.sh" />
  		</exec>
  		<move file="${launcherlibs}/library/${installWs}/eclipse" todir="${launcherlibs}/" />
@@ -11,11 +16,25 @@
 +		<copy file="features/org.eclipse.platform.launchers/bin/gtk/linux/x86/icon.xpm" todir="${launcherlibs}/"/>
 +
 +		<!-- Build JNI libs -->
-+		<!-- libcore -->
-+		    <exec dir="plugins/org.eclipse.core.resources.linux/src" executable="make" failonerror="true"/>
-+		    <move file="plugins/org.eclipse.core.resources.linux/src/libcore_3_1_0.so" todir="plugins/org.eclipse.core.resources.linux/os/linux/${installArch}">
++		<!-- liblocalfile -->
++		<exec dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true"/>
++		<move file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" 
++			 todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}">
 +		    </move>
 +		<!-- and libupdate -->
 +		<ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
 +
  	</target>
+ 
+ 
+@@ -265,8 +280,8 @@
+ 			<os family="mac" />
+ 		</condition>
+ 		<property name="bootclasspath" refid="default.bootclasspath" />
+-		<property name="J2SE-1.5" refid="java5.bootclasspath" />
+-		<property name="javadoc1.5" value="${java5.home}/bin/javadoc" />
++		<!-- <property name="J2SE-1.5" refid="java5.bootclasspath" />
++		<property name="javadoc1.5" value="${java5.home}/bin/javadoc" /> -->
+ 
+ 		<!--set the compiler and compiler arguments-->
+ 		<!--the default compiler is set to the one used by eclipse rel. eng. -->
diff --git a/eclipse-filenamepatterns.txt b/eclipse-filenamepatterns.txt
index 140f8cf..5d0d319 100644
--- a/eclipse-filenamepatterns.txt
+++ b/eclipse-filenamepatterns.txt
@@ -1 +1 @@
-*.so
+.* = *.so
diff --git a/eclipse-libupdatebuild2.patch b/eclipse-libupdatebuild2.patch
index 52ff2b6..b570a02 100644
--- a/eclipse-libupdatebuild2.patch
+++ b/eclipse-libupdatebuild2.patch
@@ -1,5 +1,5 @@
---- plugins/org.eclipse.update.core.linux/src/build.xml.orig	2005-02-07 15:33:34.513890526 -0500
-+++ plugins/org.eclipse.update.core.linux/src/build.xml	2005-02-07 15:33:50.705301151 -0500
+--- 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 @@
    <!-- Set a meaningful default value for when it is not. -->
    <property name="eclipse-home" value="${basedir}/../.."/>
@@ -8,3 +8,4 @@
 +  <property name="destination" value="${eclipse-home}/org.eclipse.update.core.linux/os/linux/${installArch}/"/>
    <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>
    <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.linux/src/"/>  
+   
diff --git a/eclipse-pde.build-add-package-build.patch b/eclipse-pde.build-add-package-build.patch
new file mode 100644
index 0000000..95b9ae1
--- /dev/null
+++ b/eclipse-pde.build-add-package-build.patch
@@ -0,0 +1,279 @@
+Index: templates/package-build/build.properties
+===================================================================
+RCS file: templates/package-build/build.properties
+diff -N templates/package-build/build.properties
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ templates/package-build/build.properties	1 Jan 1970 00:00:00 -0000
+@@ -0,0 +1,12 @@
++buildDirectory=${sourceDirectory}/build
++buildLabel=rpmBuild
++archivePrefix=eclipse
++skipFetch=true
++javacFailOnError=true
++collectingFolder=eclipse
++archivesFormat=*,*,*-zip
++zipargs=-y
++javacDebugInfo=true
++archiveName=${id}.zip
++runPackager=false
++baseLocation=@eclipse_base@
+Index: templates/package-build/customTargets-assemble-target.xml
+===================================================================
+RCS file: templates/package-build/customTargets-assemble-target.xml
+diff -N templates/package-build/customTargets-assemble-target.xml
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ templates/package-build/customTargets-assemble-target.xml	1 Jan 1970 00:00:00 -0000
+@@ -0,0 +1,12 @@
++<project>
++	<!-- ===================================================================== -->
++	<!-- Targets to assemble the built elements for particular configurations  -->
++	<!-- These generally call the generated assemble scripts (named in -->
++	<!-- ${assembleScriptName}) but may also add pre and post processing -->
++	<!-- Add one target for each root element and each configuration -->
++	<!-- ===================================================================== -->
++
++	<target name="assemble.@id@">
++		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
++	</target>
++</project>
+Index: templates/package-build/customTargets.xml
+===================================================================
+RCS file: templates/package-build/customTargets.xml
+diff -N templates/package-build/customTargets.xml
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ templates/package-build/customTargets.xml	1 Jan 1970 00:00:00 -0000
+@@ -0,0 +1,144 @@
++<project name="Build specific targets and properties" default="noDefault">
++
++	<fail unless="type" message="Please set the ${type} property to 'feature', 'plugin' or 'fragment'." />
++	<fail unless="id" message="Please set the ${id} property to the feature, plugin or fragment id of the plugin you are building." />
++	<fail unless="sourceDirectory" message="Please set the ${sourceDirectory} property to the directory that has the source plugins." />
++
++	<!-- we need to do this because you can't expand variables in target names -->	
++	<copy file="${builder}/customTargets-assemble-target.xml" tofile="${buildDirectory}/customTargets-${id}-assemble-target.xml" /> 
++	<replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@id@" value="${id}" />
++	<import file="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
++
++	<!-- ===================================================================== -->
++	<!-- Run a given ${target} on all elements being built -->
++	<!-- Add on <ant> task for each top level element being built. -->
++	<!-- ===================================================================== -->
++	<target name="allElements">
++		<ant antfile="${genericTargets}" target="${target}">
++			<property name="type" value="${type}" />
++			<property name="id" value="${id}" />
++		</ant>
++	</target>
++
++	
++	<!-- ===================================================================== -->
++	<!-- Check out map files from correct repository -->
++	<!-- ===================================================================== -->
++	<target name="getMapFiles">
++	</target>
++
++	<!-- ===================================================================== -->
++
++	<target name="clean" unless="noclean">
++		<antcall target="allElements">
++			<param name="target" value="cleanElement" />
++		</antcall>
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do before setup -->
++	<!-- ===================================================================== -->
++	<target name="preSetup">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do after setup but before starting the build proper -->
++	<!-- ===================================================================== -->
++	<target name="postSetup">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do before fetching the build elements -->
++	<!-- ===================================================================== -->
++	<target name="preFetch">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do after fetching the build elements -->
++	<!-- ===================================================================== -->
++	<target name="postFetch">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do before generating the build scripts. -->
++	<!-- ===================================================================== -->
++	<target name="preGenerate">
++		<!-- Eclipse expects the feature projects to be in the 'features' directory and 
++   		plugin projects to be in the 'plugins' directory. The build infrastructure 
++		normally arranges the projects during the fetch stage. Since we aren't doing
++ 		the fetch stage, we have to manually arrange the files -->
++		<exec dir="${builder}" executable="/bin/sh">
++			<arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory}" />
++		</exec> 
++
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do after generating the build scripts. -->
++	<!-- ===================================================================== -->
++	<target name="postGenerate">
++		<antcall target="clean" />
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do before running the build.xmls for the elements being built. -->
++	<!-- ===================================================================== -->
++	<target name="preProcess">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do after running the build.xmls for the elements being built. -->
++	<!-- ===================================================================== -->
++	<target name="postProcess">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do before running assemble. -->
++	<!-- ===================================================================== -->
++	<target name="preAssemble">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do after  running assemble. -->
++	<!-- ===================================================================== -->
++	<target name="postAssemble">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do before running package. -->
++	<!-- ===================================================================== -->
++	<target name="prePackage">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do after  running package. -->
++	<!-- ===================================================================== -->
++	<target name="postPackage">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do after the build is done. -->
++	<!-- ===================================================================== -->
++	<target name="postBuild">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do to test the build results -->
++	<!-- ===================================================================== -->
++	<target name="test">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Steps to do to publish the build results -->
++	<!-- ===================================================================== -->
++	<target name="publish">
++	</target>
++
++	<!-- ===================================================================== -->
++	<!-- Default target                                                        -->
++	<!-- ===================================================================== -->
++	<target name="noDefault">
++		<echo message="You must specify a target when invoking this file" />
++	</target>
++
++</project>
+Index: templates/package-build/prepare-build-dir.sh
+===================================================================
+RCS file: templates/package-build/prepare-build-dir.sh
+diff -N templates/package-build/prepare-build-dir.sh
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ templates/package-build/prepare-build-dir.sh	1 Jan 1970 00:00:00 -0000
+@@ -0,0 +1,83 @@
++#!/bin/sh
++
++
++make_links()
++{
++  TYPE=$1
++  TYPEDIR=$2
++  shift; shift;
++  XMLFILES=$@
++  
++  CURBUILDFILE=$BUILDDIR/tmp/$TYPE-build.xml
++  cat $BUILDFILE | sed "s|@type@|$TYPE|" > $CURBUILDFILE
++
++  for f in $XMLFILES; do
++    PROJECTDIR=$(dirname $f)
++    PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $CURBUILDFILE 2>&1 | grep echo | cut --delimiter=' ' -f 7)
++    if [ -z $PROJECTNAME ]; then
++      if [ ! -e $PROJECTDIR/META-INF/MANIFEST.MF ]; then
++        echo "ERROR: could not determine the feature id for $PROJECTDIR"
++        exit 1
++      fi
++      PROJECTNAME=$(grep Bundle-SymbolicName $PROJECTDIR/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
++      if [ -z $PROJECTNAME  ]; then
++        echo "ERROR: could not determine the feature id for $PROJECTDIR"
++        exit 1
++      fi
++    fi
++    
++    echo "  making symlink: $BUILDDIR/$TYPEDIR/$PROJECTNAME -> $PROJECTDIR"
++    ln -sf $PROJECTDIR $BUILDDIR/$TYPEDIR/$PROJECTNAME 
++
++  done
++}
++
++
++if [ $# -ne 2 ]; then 
++  echo "usage: $0 <path to source dir> <path to build dir>"
++  exit 1
++fi
++
++if [ ! -d $1 ]; then
++  echo "usage: $0 <path to source dir> <path to build dir>"
++  exit 1
++fi
++
++SOURCEDIR=$1
++BUILDDIR=$2
++
++echo "preparing files in $1 for buildfile generation ..."
++mkdir -p $BUILDDIR
++
++# make some ant build files to extract the id from the feature.xml, plugin.xml or the fragment.xml
++mkdir -p $BUILDDIR/tmp
++BUILDFILE=$BUILDDIR/tmp/build.xml
++
++echo "<project default=\"main\">
++	<target name=\"main\">
++               	<xmlproperty file=\"@type@.xml\" collapseAttributes=\"true\"/>
++		<fail unless=\"@type@.id\" message=\"feature.id not set\"/>
++               	<echo message=\"\${@type@.id}\" />
++        </target>
++</project>" > $BUILDFILE
++
++# find the feature.xml, plugin.xml and fragment.xml files
++FEATURES=$(find $SOURCEDIR -name feature.xml)
++PLUGINS=$(find $SOURCEDIR -name plugin.xml) 
++FRAGMENTS=$(find $SOURCEDIR -name fragment.xml) 
++
++# make the directories eclipse is expecting 
++echo "  making the 'features' and 'plugins' directories"
++mkdir -p $BUILDDIR/features $BUILDDIR/plugins
++
++# make symlinks for the features
++make_links feature features $FEATURES
++
++# make the symlinks for plugins
++make_links plugin plugins $PLUGINS
++
++# make the symlinks for fragments - they go in the plugins directory as well
++make_links fragment plugins $FRAGMENTS
++
++rm -rf $BUILDDIR/tmp
++echo done 
diff --git a/eclipse-swttools.patch b/eclipse-swttools.patch
index dfd5fa6..60997f1 100644
--- a/eclipse-swttools.patch
+++ b/eclipse-swttools.patch
@@ -5,7 +5,7 @@ retrieving revision 1.3
 diff -u -r1.3 build.xml
 --- build.xml	18 Apr 2005 20:27:37 -0000	1.3
 +++ build.xml	26 Apr 2005 19:13:30 -0000
-@@ -20,7 +20,6 @@
+@@ -21,7 +21,6 @@
  
  	<target name="properties" if="eclipse.running">
  		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
@@ -13,7 +13,7 @@ diff -u -r1.3 build.xml
  	</target>
  
  	<target name="build.update.jar" depends="init">
-@@ -184,8 +183,11 @@
+@@ -200,8 +199,11 @@
  	</target>
  
  	<target name="build.cfiles" depends="build.jars">
@@ -26,12 +26,12 @@ diff -u -r1.3 build.xml
  		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
  		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
  		<java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.cairo.Cairo"/><arg value="${basedir}/src/Eclipse SWT PI/cairo/library/"/><arg value="${build.result.folder}/swt.jar"/></java>
-@@ -278,6 +280,8 @@
+@@ -304,6 +306,8 @@
  		<delete file="${plugin.destination}/${full.name}.jar"/>
  		<delete file="${plugin.destination}/${full.name}.zip"/>
  		<delete dir="${temp.folder}"/>
 +		<!-- delete swttools.jar so that it will be compiled in the build.jars target -->
-+		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean"/>
++		<ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false"	target="clean"/>
  	</target>
  
  	<target name="refresh" depends="init" if="eclipse.running">
diff --git a/eclipse-tomcat55-build.patch b/eclipse-tomcat55-build.patch
deleted file mode 100644
index 3e43550..0000000
--- a/eclipse-tomcat55-build.patch
+++ /dev/null
@@ -1,151 +0,0 @@
---- build.xml.orig	2006-03-06 16:45:16.000000000 -0500
-+++ build.xml	2006-03-06 16:45:57.000000000 -0500
-@@ -45,7 +45,7 @@
- 		<antcall target="gather.bin.parts">
- 			<param name="destination.temp.folder" value="${temp.folder}/"/>
- 		</antcall>
--		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.30.1" filesonly="false" whenempty="skip" update="false"/>
-+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.15" filesonly="false" whenempty="skip" update="false"/>
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
-@@ -115,48 +115,68 @@
- 				<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
- 				<pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
- 				<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xslp.jar"/>
--				<pathelement path="catalina.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/catalina.jar"/>
- 				<pathelement path="bootstrap.jar"/>
- 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/bootstrap.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-logging-api.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging-api.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.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-logging.jar"/>
- 				<pathelement path="commons-modeler.jar"/>
- 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/commons-modeler.jar"/>
--				<pathelement path="jakarta-regexp-1.3.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jakarta-regexp-1.3.jar"/>
--				<pathelement path="jasper-compiler.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-compiler.jar"/>
--				<pathelement path="jasper-runtime.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jasper-runtime.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="jspapi.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/jspapi.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="naming-common.jar"/>
- 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-common.jar"/>
- 				<pathelement path="naming-factory.jar"/>
- 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-factory.jar"/>
-+				<pathelement path="naming-java.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-java.jar"/>
- 				<pathelement path="naming-resources.jar"/>
- 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
--				<pathelement path="servlet.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlet.jar"/>
-+				<pathelement path="regexp-1.3.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/regexp-1.3.jar"/>
-+				<pathelement path="servletapi5.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servletapi5.jar"/>
- 				<pathelement path="servlets-common.jar"/>
- 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-common.jar"/>
- 				<pathelement path="servlets-default.jar"/>
- 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-default.jar"/>
- 				<pathelement path="servlets-invoker.jar"/>
- 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-invoker.jar"/>
--				<pathelement path="servlets-manager.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlets-manager.jar"/>
- 				<pathelement path="tomcat-coyote.jar"/>
- 				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-coyote.jar"/>
--				<pathelement path="tomcat-http11.jar"/>
--				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/tomcat-http11.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"/>
- 			</classpath>
-@@ -189,11 +209,11 @@
- 	</target>
- 
- 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
--		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1"/>
--		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="true" overwrite="false">
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15"/>
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="true" overwrite="false">
- 			<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar"			/>
- 		</copy>
--		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="true" overwrite="false">
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,*.license,META-INF/"			/>
- 		</copy>
- 	</target>
-@@ -202,23 +222,23 @@
- 	</target>
- 
- 	<target name="gather.sources" depends="init" if="destination.temp.folder">
--		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1"/>
--		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="false" overwrite="false"/>
--		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="false" overwrite="false">
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15"/>
-+		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="false" overwrite="false"/>
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="false" overwrite="false">
- 			<fileset dir="${basedir}" includes="about.html,*.license"			/>
- 		</copy>
- 	</target>
- 
- 	<target name="gather.logs" depends="init" if="destination.temp.folder">
--		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1"/>
--		<copy file="${temp.folder}/tomcatwrapper.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.30.1" failonerror="false" overwrite="false"/>
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15"/>
-+		<copy file="${temp.folder}/tomcatwrapper.jar.bin.log" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.15" failonerror="false" overwrite="false"/>
- 	</target>
- 
- 	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.tomcat of all the zips, jars and logs created.">
- 		<delete file="${build.result.folder}/tomcatwrapper.jar"/>
- 		<delete file="${build.result.folder}/tomcatwrappersrc.zip"/>
--		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.jar"/>
--		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.zip"/>
-+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.jar"/>
-+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.15.zip"/>
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
-@@ -241,7 +261,7 @@
- 		<delete>
- 			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
- 		</delete>
--		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.30.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.15.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
diff --git a/eclipse-tomcat55.patch b/eclipse-tomcat55.patch
deleted file mode 100644
index cdff92a..0000000
--- a/eclipse-tomcat55.patch
+++ /dev/null
@@ -1,983 +0,0 @@
-Index: .classpath
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.tomcat/.classpath,v
-retrieving revision 1.20
-diff -u -r1.20 .classpath
---- .classpath	21 Apr 2005 23:31:58 -0000	1.20
-+++ .classpath	7 Mar 2006 17:31:59 -0000
-@@ -1,29 +1,36 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <classpath>
- 	<classpathentry kind="src" path="src"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="catalina.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="bootstrap.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-beanutils.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-collections.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-digester.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-logging-api.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="commons-modeler.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jakarta-regexp-1.3.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jasper-compiler.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="jasper-runtime.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="mx4j-jmx.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-common.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-factory.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="naming-resources.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlet.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-common.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-default.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-invoker.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="servlets-manager.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-coyote.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-http11.jar"/>
--	<classpathentry exported="true" sourcepath="D:/tomcat4.1.30src" kind="lib" path="tomcat-util.jar"/>
-+	<classpathentry exported="true" kind="lib" path="catalina.jar"/>
-+	<classpathentry exported="true" kind="lib" path="bootstrap.jar"/>
-+	<classpathentry exported="true" kind="lib" path="commons-beanutils.jar"/>
-+	<classpathentry exported="true" kind="lib" path="commons-collections.jar"/>
-+	<classpathentry exported="true" kind="lib" path="commons-digester.jar"/>
-+	<classpathentry exported="true" kind="lib" path="commons-modeler.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jasper-compiler.jar"/>
-+	<classpathentry exported="true" kind="lib" path="jasper-runtime.jar"/>
-+	<classpathentry exported="true" kind="lib" path="mx4j-jmx.jar"/>
-+	<classpathentry exported="true" kind="lib" path="naming-factory.jar"/>
-+	<classpathentry exported="true" kind="lib" path="naming-resources.jar"/>
-+	<classpathentry exported="true" kind="lib" path="servlets-default.jar"/>
-+	<classpathentry exported="true" kind="lib" path="servlets-invoker.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tomcat-coyote.jar"/>
-+	<classpathentry exported="true" kind="lib" path="tomcat-util.jar"/>
- 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-+	<classpathentry kind="lib" path="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-logging.jar"/>
-+	<classpathentry kind="lib" path="commons-pool.jar"/>
-+	<classpathentry kind="lib" path="mx4j-impl.jar"/>
-+	<classpathentry kind="lib" path="mx4j.jar"/>
-+	<classpathentry kind="lib" path="jspapi.jar"/>
-+	<classpathentry kind="lib" path="catalina-optional.jar"/>
-+	<classpathentry kind="lib" path="tomcat-http.jar"/>
-+	<classpathentry kind="lib" path="servletapi5.jar"/>
-+	<classpathentry kind="lib" path="regexp-1.3.jar"/>
- 	<classpathentry kind="output" path="bin"/>
- </classpath>
-Index: about.html
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.tomcat/about.html,v
-retrieving revision 1.24
-diff -u -r1.24 about.html
---- about.html	21 Jun 2005 00:52:06 -0000	1.24
-+++ about.html	7 Mar 2006 17:31:59 -0000
-@@ -8,7 +8,7 @@
- <body lang="EN-US">
- <h2>About This Content</h2>
- 
--<p>February 24, 2005</p>	
-+<p>February 24, 2005 (modified June 14, 2005 with update to Tomcat 5.0.30)</p>
- <h3>License</h3>
- 
- <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-@@ -23,7 +23,7 @@
- 
- <p>The Content includes items that have been sourced from third parties as follows:</p>
- 
--<p><b>Tomcat 4.1.30</b></p>
-+<p><b>Tomcat 5.0.30</b></p>
- <p>The plug-in is based on software developed by The Apache Software Foundation as part of the Jakarta project.  Therefore:</p>
- 
- <blockquote>
-@@ -35,24 +35,31 @@
- <ul type="disc">
- 	<li>bootstrap.jar</li>
- 	<li>catalina.jar</li>
--	<li>commons-beanutils.jar</li>
--	<li>commons-collections.jar</li>
--	<li>commons-digester.jar</li>
--	<li>commons-logging.jar</li>
--	<li>commons-logging-api.jar</li>
--	<li>commons-modeler.jar</li>
--	<li>jakarta-regexp-1.3.jar</li>
--	<li>jasper-compiler.jar</li>
--	<li>jasper-runtime.jar</li>
-+	<li>catalina-optional.jar</li>
-+	<li>jakarta-commons-beanutils.jar</li>
-+	<li>jakarta-commons-collections.jar</li>
-+	<li>jakarta-commons-dbcp.jar</li>
-+	<li>jakarta-commons-digester.jar</li>
-+	<li>jakarta-commons-digester-rss.jar</li>
-+	<li>jakarta-commons-el.jar</li>
-+	<li>jakarta-commons-fileupload.jar</li>
-+	<li>jakarta-commons-launcher.jar</li>
-+	<li>jakarta-commons-logging.jar</li>
-+	<li>jakarta-commons-modeler.jar</li>
-+	<li>jakarta-commons-pool.jar</li>
-+	<li>jasper5-compiler.jar</li>
-+	<li>jasper5-runtime.jar</li>
-+	<li>mx4j.jar</li>
-+	<li>mx4j-impl.jar</li>
- 	<li>mx4j-jmx.jar</li>
- 	<li>naming-common.jar</li>
- 	<li>naming-factory.jar</li>
- 	<li>naming-resources.jar</li>
--	<li>servlet.jar</li>
-+	<li>regexp.jar</li>
-+	<li>servletapi5.jar</li>
- 	<li>servlets-common.jar</li>
- 	<li>servlets-default.jar</li>
- 	<li>servlets-invoker.jar</li>
--	<li>servlets-manager.jar</li>
- 	<li>tomcat-coyote.jar</li>
- 	<li>tomcat-http11.jar</li>
- 	<li>tomcat-util.jar</li>
-@@ -66,10 +73,10 @@
- 
- <p>Tomcat is:</p>
- 
--<blockquote>Copyright (c) 1999, 2000 The Apache Software Foundation. All rights reserved.</blockquote>
-+<blockquote>Copyright (c) 1999-2003 The Apache Software Foundation. All rights reserved.</blockquote>
- 
--<p>Your use of the Tomcat code is subject to the terms and conditions of the Apache Software License 1.1 which is available at
--<a href="http://www.apache.org/licenses/LICENSE-1.1">http://www.apache.org/licenses/LICENSE-1.1</a>.  More specifically:</p>
-+<p>Your use of the Tomcat code is subject to the terms and conditions of the Apache Software License 2.0 which is available at
-+<a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>.  More specifically:</p>
- <blockquote>
- 	1. Redistributions of source code must retain the above copyright notice, this list of<br>
- 	conditions and the following disclaimer.<br>
-@@ -107,11 +114,11 @@
- 
- <p>Source code for Tomcat is available at <a href="http://jakarta.apache.org/tomcat/">http://jakarta.apache.org/tomcat/</a>.</p>
- 
--<strong>MX4J 1.1.1</strong>
-+<strong>MX4J 2.1.0</strong>
- 
--<p></p>Tomcat 4.1.30 includes mx4j-jmx.jar from MX4J 1.1.1.  MX4J is:</p>
-+<p></p>Tomcat 5.0.30 includes mx4j.jar, mx4j-jmx.jar and mx4j-impl.jar from MX4J 2.1.0.  MX4J is:</p>
- 
--<blockquote>Copyright (c) 2001 MX4J.  All rights reserved.</blockquote>
-+<blockquote>Copyright (c) 2001-2004 MX4J contributors.  All rights reserved.</blockquote>
- 
- <p>Your use of the MX4J code is subject to the terms and conditions of the MX4J License, Version 1.0, a copy of which is included
- with the Content in the file <a href="mx4j.license">mx4j.license</a>.  More specifically: </p>
-Index: META-INF/MANIFEST.MF
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.tomcat/META-INF/MANIFEST.MF,v
-retrieving revision 1.14
-diff -u -r1.14 MANIFEST.MF
---- META-INF/MANIFEST.MF	19 May 2005 04:05:11 -0000	1.14
-+++ META-INF/MANIFEST.MF	7 Mar 2006 17:32:16 -0000
-@@ -2,30 +2,35 @@
- Bundle-ManifestVersion: 2
- Bundle-Name: %pluginName
- Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
--Bundle-Version: 4.1.30.1
-+Bundle-Version: 5.5.15
- Bundle-ClassPath: tomcatwrapper.jar,
-+ catalina-optional.jar,
-  catalina.jar,
-- bootstrap.jar,
-  commons-beanutils.jar,
-  commons-collections.jar,
-+ commons-digester-rss.jar,
-  commons-digester.jar,
-+ commons-el.jar,
-+ commons-logging.jar,
-  commons-logging-api.jar,
-  commons-modeler.jar,
-- jakarta-regexp-1.3.jar,
-+ regexp-1.3.jar,
-  jasper-compiler.jar,
-  jasper-runtime.jar,
-+ jspapi.jar,
-+ mx4j-impl.jar,
-  mx4j-jmx.jar,
-- naming-common.jar,
-+ mx4j.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-http.jar,
-+ tomcat-util.jar,
-+ regexp-1.3.jar,
-+ servletapi5.jar,
-+ log4j.jar
- Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
- Bundle-Vendor: %providerName
- Bundle-Localization: plugin
-@@ -54,8 +59,7 @@
-  mx4j.util;x-internal:=true,
-  org.apache.catalina;x-internal:=true,
-  org.apache.catalina.connector;x-internal:=true,
-- org.apache.catalina.connector.http;x-internal:=true,
-- org.apache.catalina.connector.http10;x-internal:=true,
-+ org.apache.catalina.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,
-@@ -69,7 +73,6 @@
-  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,
-@@ -79,13 +82,11 @@
-  org.apache.coyote.http11;x-internal:=true,
-  org.apache.coyote.http11.filters;x-internal:=true,
-  org.apache.coyote.memory;x-internal:=true,
-- org.apache.coyote.tomcat4;x-internal:=true,
-  org.apache.jasper;x-internal:=true,
-  org.apache.jasper.compiler;x-internal:=true,
-- org.apache.jasper.logging;x-internal:=true,
-  org.apache.jasper.runtime;x-internal:=true,
-  org.apache.jasper.servlet;x-internal:=true,
-- org.apache.jasper.util;x-internal:=true,
-+ org.apache.jasper.util,
-  org.apache.jasper.xmlparser;x-internal:=true,
-  org.apache.naming;x-internal:=true,
-  org.apache.naming.factory;x-internal:=true,
-@@ -95,12 +96,9 @@
-  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.compat;x-internal:=true,
-- org.apache.tomcat.util.handler;x-internal:=true,
-  org.apache.tomcat.util.http;x-internal:=true,
-  org.apache.tomcat.util.http.mapper;x-internal:=true,
-  org.apache.tomcat.util.log;x-internal:=true,
-- org.apache.tomcat.util.mx;x-internal:=true,
-  org.apache.tomcat.util.net;x-internal:=true,
-  org.apache.tomcat.util.net.jsse;x-internal:=true,
-  org.apache.tomcat.util.res;x-internal:=true,
-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.8
-diff -u -r1.8 EclipseErrorReportValve.java
---- src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java	23 May 2005 03:58:04 -0000	1.8
-+++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java	7 Mar 2006 17:32:16 -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,18 +157,18 @@
-      * @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;
-+        ServletRequest sreq = request;
-         Throwable throwable = 
-             (Throwable) sreq.getAttribute(Globals.EXCEPTION_ATTR);
- 
--        ServletResponse sresp = (ServletResponse) response;
-+        ServletResponse sresp = response;
-         if (sresp.isCommitted()) {
-             return;
-         }
-@@ -173,7 +185,7 @@
-                 ;
-             }
- 
--            ServletResponse sresponse = (ServletResponse) response;
-+            ServletResponse sresponse = response;
-             if (sresponse instanceof HttpServletResponse)
-                 ((HttpServletResponse) sresponse).sendError
-                     (HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-@@ -219,15 +231,9 @@
-                           Throwable throwable)
-         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());
-+        HttpServletResponse hres = response;
-+        int statusCode = response.getStatus();
-+        String message = RequestUtil.filter(response.getMessage());
-         if (message == null)
-             message = "";
- 
-@@ -373,9 +379,9 @@
-      */
-     protected void log(String message) {
- 
--        Logger logger = container.getLogger();
-+        Logger logger = (Logger) container.getLogger();
-         if (logger != null)
--            logger.log(this.toString() + ": " + message);
-+            logger.info(this.toString() + ": " + message);
-         else
-             System.out.println(this.toString() + ": " + message);
- 
-@@ -390,9 +396,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);
-+            logger.info(this.toString() + ": " + message, throwable);
-         else {
-             System.out.println(this.toString() + ": " + message);
-             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.43
-diff -u -r1.43 TomcatAppServer.java
---- src/org/eclipse/tomcat/internal/TomcatAppServer.java	22 Jun 2005 15:29:56 -0000	1.43
-+++ src/org/eclipse/tomcat/internal/TomcatAppServer.java	7 Mar 2006 17:32:17 -0000
-@@ -11,27 +11,29 @@
- package org.eclipse.tomcat.internal;
- 
- import java.io.ByteArrayOutputStream;
-+import java.io.FileNotFoundException;
-+import java.io.FileOutputStream;
- import java.io.PrintStream;
- import java.net.InetAddress;
- import java.net.URL;
- 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.IConfigurationElement;
- import org.eclipse.core.runtime.IExtension;
-@@ -91,27 +93,40 @@
-      *      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";
-+    	} 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;
-+        	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);
--            URL installURL = TomcatPlugin.getDefault().getBundle()
--                    .getEntry("/"); //$NON-NLS-1$
--            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$
-+        	embedded = new Embedded(new MemoryRealm());
-+        	embedded.setRedirectStreams(true);
-+        	URL installURL = TomcatPlugin.getDefault().getBundle()
-+					.getEntry("/"); //$NON-NLS-1$
-+			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$
- 
-             // Set up realm if one found
-             if (TomcatPlugin.getDefault().getPluginPreferences().getInt(
-@@ -119,14 +134,32 @@
-                 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;
-+                        }
- 
-+            });
-+            
-+            // Install the assembled container hierarchy
-+            PrintStream sysErr = System.err;
-+            // reassign standard error to prevent Tomcat from writing
-+            // its version message there.
-+            PrintStream newOutput = new PrintStream(new FileOutputStream(
-+            		TomcatPlugin.getDefault().getStateLocation().toOSString()
-+            		+ IPath.SEPARATOR + "tomcat.log")); //$NON-NLS-1$
-+            System.setErr(newOutput);
-+
-+            embedded.setRedirectStreams(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$ //$NON-NLS-2$
- 
-             // all request go to our only host
-             engine.setDefaultHost(host.getName());
-@@ -136,123 +169,112 @@
-                         .setErrorReportValveClass("org.eclipse.tomcat.internal.EclipseErrorReportValve"); //$NON-NLS-1$
-             }
-             engine.addChild(host);
--
--            // Install the assembled container hierarchy
--            PrintStream sysOut = System.out;
--            // reassign standard output to prevent Tomcat from writing
--            // its version message there.
--            System.setOut(new PrintStream(new ByteArrayOutputStream()));
-+            
-             try {
-                 embedded.addEngine(engine);
-             } finally {
--                System.setOut(sysOut);
--            }
--
-+                System.setErr(sysErr);
-+            }           
-+            
-             // Root context
-             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) {
--                ((StandardContext) root)
--                        .setWorkDir(getWorkingDirectory("ROOT")); //$NON-NLS-1$
-+            	StandardContext standardContext = (StandardContext) root;
-+            	standardContext.setWorkDir(getWorkingDirectory("ROOT")); //$NON-NLS-1$
-+            	standardContext.setSaveConfig(false);
-             }
-+            
-             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
--                }
--            }
-+            host.addChild(root);
-+            contexts.add(root);
-+            
-             updateSslPort(iAddress);
-             if (this.port == 0) {
--                this.port = SocketUtil.findUnusedLocalPort(iAddress); //$NON-NLS-1$
-+                this.port = SocketUtil.findUnusedLocalPort(iAddress);
-                 if (this.port == -1) {
-                     throw new CoreException(
-                             new Status(
-                                     IStatus.ERROR,
-                                     TomcatPlugin.PLUGIN_ID,
-                                     IStatus.OK,
--                                    TomcatResources.TomcatAppServer_start_CannotObtainPort, //$NON-NLS-1$
-+                                    TomcatResources.TomcatAppServer_start_CannotObtainPort,
-                                     null));
-                 }
-             }
- 
-             // 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);
--                }
--                // 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;
--                    }
--                });
-+            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);
-+            }
-+
-+            int maxProcessors = pref
-+            .getInt(TomcatPlugin.PREF_MAX_PROCESSORS);
-+            if (maxProcessors > 0) {
-+            	connector.setProperty("maxThreads",""+maxProcessors);
-+            }
-+            
-+            int minProcessors = pref
-+            .getInt(TomcatPlugin.PREF_MIN_PROCESSORS);
-+            if (minProcessors > 0) {
-+            	connector.setProperty("minSpareThreads",""+minProcessors);
-+            }
-+            
-+            if (this.sslPort > 0) {
-+            	connector.setRedirectPort(this.sslPort);
-+            	connector.setEnableLookups(true);
-+            	connector.setProperty("soTimeout",""+20000);
-+            	// 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);
-+            	}
-             }
-+            
-+            // 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;
-             // reassign standard error to prevent Coyote from writing
-             // its version message there.
--            System.setErr(new PrintStream(new ByteArrayOutputStream()));
-+            System.setErr(newOutput);
-             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);
--
-+            
-         } catch (Exception exc) {
-             TomcatPlugin
-                     .logError(
-@@ -306,91 +328,145 @@
-      * @throws CoreException
-      */
-     private void createSSLConnector(InetAddress iAddress, int sslport)
--            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;
--                }
--            });
--        }
--
--        // 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);
--        }
--    }
--
--    /**
--     * Creates a {@link Realm}object using the information contained in
--     * extensions of the type org.eclipse.tomcat.realmfactory in the plugin
--     * registry.
--     * 
--     * @return the {@link Realm}object created
--     */
-+			throws CoreException {
-+		// Create Connector
-+		// Defaults to local if iAddress is null
-+		Connector connector = embedded.createConnector(iAddress
-+				.getHostAddress(), this.port, false);
-+
-+		// --------------------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);
-+		}
-+		String protocols = pref.getString(TomcatPlugin.PREF_SSL_PROTOCOLS);
-+		if ((protocols != null) && (!("".equals(protocols.trim())))) { //$NON-NLS-1$
-+			connector.setProperty("protocols", protocols);
-+		}
-+		String protocolClassName = Http11Protocol.class.getName();
-+		connector.setProtocol(protocolClassName);
-+
-+		String JSSEImplementationName = JSSEImplementation.class.getName();
-+		connector.setProperty("sslImplementation", JSSEImplementationName);
-+
-+		String disableUploadTimeout = pref
-+				.getString(TomcatPlugin.DISABLE_UPLOAD_TIMEOUT);
-+		if ((disableUploadTimeout != null)
-+				&& (!("".equals(disableUploadTimeout.trim())))) { //$NON-NLS-1$
-+			connector.setProperty("disableUploadTimeout", disableUploadTimeout);
-+		}
-+
-+		String algorithm = pref.getString(TomcatPlugin.PREF_SSL_ALGORITHM);
-+		if ((algorithm != null) && (!("".equals(algorithm.trim())))) { //$NON-NLS-1$
-+			connector.setProperty("algorithm", algorithm);
-+		}
-+		int maxProcessors = pref.getInt(TomcatPlugin.PREF_MAX_PROCESSORS);
-+		if (maxProcessors > 0) {
-+			// connector.setMaxProcessors(maxProcessors);
-+			connector.setProperty("maxThreads", "" + maxProcessors);
-+		}
-+		int minProcessors = pref.getInt(TomcatPlugin.PREF_MIN_PROCESSORS);
-+		if (minProcessors > 0) {
-+			// connector.setMinProcessors(minProcessors);
-+			connector.setProperty("minSpareThreads", "" + minProcessors);
-+		}
-+		// this is making use of org.apache.tomcat.util.IntrospectionUtils
-+		connector.setProperty("disableUploadTimeout", "" + true);
-+		String clientauth = pref
-+				.getString(TomcatPlugin.PREF_CLIENT_AUTHENTICATION);
-+		if ((clientauth != null) && (!("".equals(clientauth.trim())))) { //$NON-NLS-1$
-+			connector.setProperty("clientauth", clientauth);
-+		}
-+
-+		int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT);
-+		if (acceptCount > 0) {
-+			connector.setProperty("backlog", "" + acceptCount);
-+		}
-+
-+		String keyStoreFile = pref.getString(TomcatPlugin.PREF_KEY_STORE_FILE);
-+		if ((keyStoreFile != null) && (!("".equals(keyStoreFile.trim())))) { //$NON-NLS-1$
-+			connector.setProperty("keystore", keyStoreFile);
-+		}
-+		String keyStorePassword = pref
-+				.getString(TomcatPlugin.PREF_KEY_STORE_PASSWORD);
-+		if ((keyStorePassword != null)
-+				&& (!("".equals(keyStorePassword.trim())))) { //$NON-NLS-1$
-+			connector.setProperty("keypass", keyStorePassword);
-+		}
-+		// 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 = System.err;
-+		// reassign standard error to prevent Coyote from writing
-+		// its version message there.
-+//		System.setErr(new PrintStream(new ByteArrayOutputStream()));
-+        PrintStream newOutput;
-+		try {
-+			newOutput = new PrintStream(new FileOutputStream(
-+					TomcatPlugin.getDefault().getStateLocation().toOSString()
-+					+ IPath.SEPARATOR + "tomcat.log"));
-+			System.setErr(newOutput);
-+		} catch (SecurityException e1) {
-+			e1.printStackTrace();
-+			System.setErr(new PrintStream(new ByteArrayOutputStream()));
-+		} catch (FileNotFoundException e1) {
-+			e1.printStackTrace();
-+			System.setErr(new PrintStream(new ByteArrayOutputStream()));
-+		} catch (IllegalStateException e1) {
-+			e1.printStackTrace();
-+			System.setErr(new PrintStream(new ByteArrayOutputStream()));
-+		} //$NON-NLS-1$
-+		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);
-+		}
-+	}
-+
-+    /**
-+	 * Creates a {@link Realm}object using the information contained in
-+	 * extensions of the type org.eclipse.tomcat.realmfactory in the plugin
-+	 * registry.
-+	 * 
-+	 * @return the {@link Realm}object created
-+	 */
-     private Realm getRealm() {
-         IExtensionRegistry registry = Platform.getExtensionRegistry();
-         IExtensionPoint extensionPoint = registry.getExtensionPoint(
-@@ -477,10 +553,11 @@
-         }
-         try {
-             Context context = embedded.createContext(contextPath, path
--                    .toOSString());
-+            		.toOSString());
-             if (context instanceof StandardContext) {
--                ((StandardContext) context)
--                        .setWorkDir(getWorkingDirectory(webappName));
-+				StandardContext standardContext = (StandardContext) context;
-+				standardContext.setWorkDir(getWorkingDirectory(webappName));
-+				standardContext.setSaveConfig(false);
-             }
- 
-             WebAppClassLoader webappLoader = new WebAppClassLoader(customLoader);
-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	7 Mar 2006 17:32:17 -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;
-@@ -63,6 +66,9 @@
- 	}
- 
- 	public static TomcatPlugin getDefault() {
-+		if (plugin == null) {
-+			plugin = new TomcatPlugin();
-+		}
- 		return plugin;
- 	}
- 
diff --git a/eclipse-updatehomedir.patch b/eclipse-updatehomedir.patch
new file mode 100644
index 0000000..7dbabfa
--- /dev/null
+++ b/eclipse-updatehomedir.patch
@@ -0,0 +1,272 @@
+Index: src/org/eclipse/update/search/UpdateSearchRequest.java
+===================================================================
+RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java,v
+retrieving revision 1.27
+diff -u -r1.27 UpdateSearchRequest.java
+--- plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java	29 Mar 2006 23:37:07 -0000	1.27
++++ plugins/org.eclipse.update.core/src/org/eclipse/update/search/UpdateSearchRequest.java	30 Mar 2006 06:02:10 -0000
+@@ -10,6 +10,7 @@
+  *******************************************************************************/
+ package org.eclipse.update.search;
+ 
++import java.io.File;
+ import java.net.URL;
+ import java.util.ArrayList;
+ 
+@@ -140,11 +141,11 @@
+ 		this.category = category;
+ 		this.scope = scope;
+ 	}
++	
+ 	/**
+ 	 * Returns the search catagory used in this request.
+ 	 * @return the search category
+ 	 */
+-	
+ 	public IUpdateSearchCategory getCategory() {
+ 		return category;
+ 	}
+@@ -251,6 +252,10 @@
+ 					// currently, the next conditional is only executed (qsite!=null) when
+ 					// running an update search. 
+ 					if (qsite != null && searchFeatureProvidedSites) {
++						// do not update features that are installed in read-only locations
++						IFeature feature = query.getFeature();
++						if (feature != null && !feature.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK())
++							continue;
+ 						// check for mapping
+ 						IUpdateSiteAdapter mappedSite = getMappedSite(updatePolicy, qsite);
+ 						// when there is no mapped site the feature is not updatable
+Index: src/org/eclipse/update/search/IUpdateSearchQuery.java
+===================================================================
+RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java,v
+retrieving revision 1.8
+diff -u -r1.8 IUpdateSearchQuery.java
+--- plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java	1 Mar 2005 20:29:16 -0000	1.8
++++ plugins/org.eclipse.update.core/src/org/eclipse/update/search/IUpdateSearchQuery.java	30 Mar 2006 06:02:10 -0000
+@@ -7,6 +7,7 @@
+  *
+  * Contributors:
+  *     IBM Corporation - initial API and implementation
++ *     Red Hat Incorporated - getFeature() API addition
+  *******************************************************************************/
+ package org.eclipse.update.search;
+ 
+@@ -50,4 +51,12 @@
+  * @param monitor a progress monitor to report search progress within the provided site
+  */
+ 	public void run(ISite site, String [] categoriesToSkip, IUpdateSearchFilter filter, IUpdateSearchResultCollector collector, IProgressMonitor monitor);
++	
++/**
++ * Returns IFeature associated with the IUpdateSearchQuery
++ * 
++ * @return the IFeature that is associated with the IUpdateSearchQuery
++ * @since 3.2
++ */
++	public IFeature getFeature(); 
+ }
+Index: src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java
+===================================================================
+RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java,v
+retrieving revision 1.8
+diff -u -r1.8 OptionalFeatureSearchCategory.java
+--- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java	1 Mar 2005 20:29:16 -0000	1.8
++++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/OptionalFeatureSearchCategory.java	30 Mar 2006 06:02:10 -0000
+@@ -76,6 +76,13 @@
+ 		public IQueryUpdateSiteAdapter getQuerySearchSite() {
+ 			return null;
+ 		}
++
++		/* (non-Javadoc)
++		 * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature()
++		 */
++		public IFeature getFeature() {
++			return null;
++		}
+ 	}
+ 
+ 	public void addVersionedIdentifier(VersionedIdentifier vid) {
+Index: src/org/eclipse/update/internal/search/UpdatesSearchCategory.java
+===================================================================
+RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java,v
+retrieving revision 1.26
+diff -u -r1.26 UpdatesSearchCategory.java
+--- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java	23 May 2005 17:59:41 -0000	1.26
++++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/UpdatesSearchCategory.java	30 Mar 2006 06:02:10 -0000
+@@ -285,6 +285,10 @@
+ 			monitor.worked(1);
+ 			monitor.done();
+ 		}
++
++		public IFeature getFeature() {
++			return candidate;
++		}
+ 	}
+ 
+ 	private ArrayList candidates;
+Index: src/org/eclipse/update/internal/search/SiteSearchCategory.java
+===================================================================
+RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java,v
+retrieving revision 1.12
+diff -u -r1.12 SiteSearchCategory.java
+--- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java	29 Mar 2006 23:37:08 -0000	1.12
++++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/search/SiteSearchCategory.java	30 Mar 2006 06:02:10 -0000
+@@ -114,6 +114,12 @@
+ 		public IQueryUpdateSiteAdapter getQuerySearchSite() {
+ 			return null;
+ 		}
++		/* (non-Javadoc)
++		 * @see org.eclipse.update.internal.ui.search.ISearchQuery#getFeature()
++		 */
++		public IFeature getFeature() {
++			return null;
++		}
+ 	}
+ 
+ 	public SiteSearchCategory() {
+Index: src/org/eclipse/update/internal/core/ConfiguredSite.java
+===================================================================
+RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java,v
+retrieving revision 1.96
+diff -u -r1.96 ConfiguredSite.java
+--- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java	30 Mar 2006 02:34:37 -0000	1.96
++++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java	30 Mar 2006 06:02:10 -0000
+@@ -35,6 +35,7 @@
+ import org.eclipse.core.runtime.IProgressMonitor;
+ import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.core.runtime.MultiStatus;
++import org.eclipse.core.runtime.Platform;
+ import org.eclipse.osgi.util.NLS;
+ import org.eclipse.update.configuration.IActivity;
+ import org.eclipse.update.configuration.IConfiguredSite;
+@@ -803,7 +804,9 @@
+ 			}
+ 		} else {
+ 			File container = getSiteContaining(file);
+-			if (container != null) {
++			// allow the install location to pass even though it looks like this
++			// site is contained in another site
++			if (container != null && !siteLocation.equals(Platform.getInstallLocation().getURL().getFile())) {
+ 				verifyStatus = createStatus(IStatus.ERROR, NLS.bind(Messages.ConfiguredSite_ContainedInAnotherSite, (new String[] { container.getAbsolutePath() })), null);
+ 				return verifyStatus;
+ 			}
+Index: src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java
+===================================================================
+RCS file: /home/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java,v
+retrieving revision 1.8
+diff -u -r1.8 InstallWizard2.java
+--- plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java	17 Mar 2006 06:02:44 -0000	1.8
++++ plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/InstallWizard2.java	30 Mar 2006 06:02:11 -0000
+@@ -148,7 +148,7 @@
+ 		addPage(licensePage);
+ 		optionalFeaturesPage = new OptionalFeaturesPage(config);
+ 		addPage(optionalFeaturesPage);
+-		targetPage = new TargetPage(config);
++		targetPage = new TargetPage(config, isUpdate);
+ 		addPage(targetPage);
+ 	}
+ 
+Index: src/org/eclipse/update/internal/ui/wizards/TargetPage.java
+===================================================================
+RCS file: /home/eclipse/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java,v
+retrieving revision 1.74
+diff -u -r1.74 TargetPage.java
+--- plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java	21 Nov 2005 21:39:24 -0000	1.74
++++ plugins/org.eclipse.update.ui/src/org/eclipse/update/internal/ui/wizards/TargetPage.java	30 Mar 2006 06:02:11 -0000
+@@ -13,6 +13,9 @@
+ import java.io.*;
+ import java.util.*;
+ 
++import org.eclipse.core.runtime.Platform;
++import org.eclipse.core.runtime.CoreException;
++import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.jface.dialogs.Dialog;
+ import org.eclipse.jface.resource.*;
+ import org.eclipse.jface.viewers.*;
+@@ -41,6 +44,7 @@
+     private Label installLocation;
+     private Button changeLocation;
+     static HashSet added;
++    private boolean isUpdate; // whether the wizard is updating a feature or installing a new one
+ 
+ 	class JobsContentProvider
+ 		extends DefaultContentProvider
+@@ -113,13 +117,14 @@
+ 	/**
+ 	 * Constructor for ReviewPage2
+ 	 */
+-	public TargetPage(IInstallConfiguration config) {
++	public TargetPage(IInstallConfiguration config, boolean isUpdate) {
+ 		super("Target"); //$NON-NLS-1$
+ 		setTitle(UpdateUIMessages.InstallWizard_TargetPage_title); 
+ 		setDescription(UpdateUIMessages.InstallWizard_TargetPage_desc); 
+ 		this.config = config;
+ 		UpdateUI.getDefault().getLabelProvider().connect(this);
+ 		configListener = new ConfigListener();
++		this.isUpdate = isUpdate;
+ 	}
+ 
+ 	public void setJobs(IInstallFeatureOperation[] jobs) {
+@@ -150,7 +155,7 @@
+         label.setLayoutData(gd);
+ 
+ 		installLocation = new Label(client, SWT.NULL);
+-        installLocation.setText("foo"); //$NON-NLS-1$
++        installLocation.setText(""); //$NON-NLS-1$
+         gd = new GridData(GridData.FILL_HORIZONTAL);
+         installLocation.setLayoutData(gd);
+         
+@@ -360,17 +365,51 @@
+ 				continue;
+ 			}
+ 
+-			jobs[i].setTargetSite(getFirstTargetSite(jobs[i]));
++			IConfiguredSite csite = getFirstTargetSite(jobs[i]);
++			if (csite == null && Platform.getInstallLocation().isReadOnly() && isUpdate == false) {
++				// there are no updateable sites, the installation location is read-only and we are installing a new feature
++				// make an update site in the user's home direcotry
++				File site= new File(System.getProperty("user.home") + File.separator + ".eclipse" + File.separator + //$NON-NLS-1$
++					Platform.getProduct().getId() + File.separator + "updates"); //$NON-NLS-1$
++				
++				try {
++					csite = config.createConfiguredSite(site);
++					config.addConfiguredSite(csite);
++					IStatus status = csite.verifyUpdatableStatus();
++					if (!status.isOK())
++						throw new CoreException(status);
++					
++				} catch (CoreException e) {
++					// there was a problem, the user must choose an installation site
++					csite = null;
++					// no need to check if the directory exists because File.delete() returns false if it's not there
++					deleteDir(site);
++				}
++			}
+ 
++			jobs[i].setTargetSite(csite);
+ 		}
+ 	}
++
++	private boolean deleteDir(File dir) {
++        if (dir.isDirectory()) {
++            String[] files = dir.list();
++            for (int i=0; i < files.length; i++) {
++                if (!deleteDir(new File(dir, files[i]))) {
++                    return false;
++                }
++            }
++        }
++        return dir.delete();
++    }
+ 	
+ 
+ 	private IConfiguredSite getFirstTargetSite(IInstallFeatureOperation job) {
+ 		IConfiguredSite[] sites = config.getConfiguredSites();
+ 		for (int i = 0; i < sites.length; i++) {
+ 			IConfiguredSite csite = sites[i];
+-			if (getSiteVisibility(csite, job)) 
++			if (getSiteVisibility(csite, job) && 
++				csite.getSite().getCurrentConfiguredSite().verifyUpdatableStatus().isOK())
+ 				return csite;
+ 		}
+ 		return null;
diff --git a/eclipse-usebuiltlauncher.patch b/eclipse-usebuiltlauncher.patch
index 02cdf3b..aa8945d 100644
--- a/eclipse-usebuiltlauncher.patch
+++ b/eclipse-usebuiltlauncher.patch
@@ -1,8 +1,7 @@
-diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
---- features/org.eclipse.platform/build.xml	2006-02-06 13:49:43.000000000 -0500
-+++ features/org.eclipse.platform/build.xml	2006-02-06 13:58:52.000000000 -0500
-@@ -349,6 +349,12 @@
- 		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml"  selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
+--- features/org.eclipse.platform/build.xml.orig	2006-06-01 15:45:39.000000000 -0400
++++ features/org.eclipse.platform/build.xml	2006-06-01 15:45:08.000000000 -0400
+@@ -394,6 +394,11 @@
+ 		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.0.v20060525a-gszCg6CPhlzUdGe/feature.xml"  selfVersion="3.2.0.v20060525a-gszCg6CPhlzUdGe" featureIds="org.eclipse.rcp,3.2.0.v20060511-2000-wbi2Ul87V-MbMKc," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060510a,org.eclipse.ant.core,3.1.100.v20060511,org.eclipse.compare,3.2.0.v20060525,org.eclipse.core.boot,3.1.100.v20060511,org.eclipse.core.filebuffers,3.2.0.v20060518-0800,org.eclipse.core.filesystem,1.0.0.v20060510,org.eclipse.core.resources,3.2.0.v20060512,org.eclipse.core.resources.compatibility,3.2.0.v20060510,org.eclipse.core.runtime.compatibility,3.1.100.v20060511,org.eclipse.osgi.services,3.1.100.v20060511,org.eclipse.osgi.util,3.1.100.v20060511,org.eclipse.core.variables,3.1.100.v20060517,org.eclipse.debug.core,3.2.0.v20060525,org.eclipse.debug.ui,3.2.0.v20060525a,org.eclipse.help.webapp,3.2.0.v20060510b,org.eclipse.help.base,3.2.0.v20060510a,org.eclipse.help.ui,3.2.0.v20060510b,org.eclipse.help.appserver,3.1.100.v20060510b,org.eclipse.ltk.core.refactoring,3.2.0.v20060526-0010,org.eclipse.ltk.ui.refactoring,3.2.0.v20060526-0010,org.eclipse.platform,3.2.0.v20060525,org.eclipse.platform.doc.user,3.2.0.v20060525,org.eclipse.search,3.2.0.v20060526-0010,org.eclipse.team.core,3.2.0.I200605181830,org.eclipse.team.cvs.core,3.2.0.I20060510,org.eclipse.team.cvs.ssh,3.2.0.I20060510,org.eclipse.team.cvs.ssh2,3.2.0.I20060510,org.eclipse.team.cvs.ui,3.2.0.I200605251705,org.eclipse.team.ui,3.2.0.I200605181830,org.eclipse.tomcat,4.1.130.v20060510a,org.eclipse.text,3.2.0.v20060518-0800,org.eclipse.jface.text,3.2.0.v20060518-0800,org.eclipse.ui.console,3.1.100.v20060518,org.eclipse.ui.presentations.r21,3.2.0.I20060511-2000,org.eclipse.ui.intro,3.2.0.v20060518,org.eclipse.ui.intro.universal,3.2.0.v20060510b,org.eclipse.ui.cheatsheets,3.2.0.v20060516,org.eclipse.ui.browser,3.2.0.v20060518,org.eclipse.ui.navigator,3.2.0.I20060526-0010,org.eclipse.ui.navigator.resources,3.2.0.I20060511-2000,org.eclipse.ui.workbench.texteditor,3.2.0.v20060526-0010,org.eclipse.ui.views,3.2.0.I20060511-2000,org.eclipse.ui.editors,3.2.0.v20060518-0800,org.eclipse.ui.forms,3.2.0.v20060510,org.eclipse.ui.externaltools,3.1.100.v20060511,org.eclipse.ui.ide,3.2.0.I20060519-0010,org.eclipse.update.core,3.2.0.v20060511,org.eclipse.update.scheduler,3.2.0.v20060511,org.eclipse.update.ui,3.2.0.v20060511,org.eclipse.ui.workbench.compatibility,3.2.0.I20060511-2000,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060510,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060510,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060510,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060510,org.eclipse.core.filesystem.macosx,1.0.0.v20060502,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060510,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060510,org.eclipse.core.resources.win32,3.2.0.v20060510,org.eclipse.ui.carbon,3.2.0.I20060519-0010,org.eclipse.ui.win32,3.2.0.I20060511-2000,org.eclipse.update.core.linux,3.2.0.v20060511,org.eclipse.update.core.win32,3.2.0.v20060511,org.eclipse.ui.views.properties.tabbed,3.2.0.I20060511-0800a,org.eclipse.core.runtime.compatibility.registry,3.2.0.v20060426,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
 +	<target name="copybuiltlauncher" if="libsconfig">
@@ -10,11 +9,10 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
 +			<fileset dir="${basedir}/../../launchertmp" includes="**"			/>
 +		</copy>
 +	</target>
-+
  	<target name="rootFileswin32_win32_x86">
  		<mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}"/>
  		<copy todir="${feature.base}/win32.win32.x86/${collectingFolder}" failonerror="true" overwrite="true">
-@@ -357,6 +363,8 @@
+@@ -402,6 +407,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -22,8 +20,17 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
 +		<antcall target="copybuiltlauncher" />
  		<chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" /> 
  	</target>
- 	<target name="rootFileslinux_gtk_x86">
-@@ -369,6 +377,8 @@
+ 	<target name="rootFilesmacosx_carbon_ppc">
+@@ -412,6 +419,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="eclipse" /> 
+ 		<chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt" /> 
+ 		<exec executable="ln" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" os="Linux">
+@@ -429,6 +438,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -32,7 +39,7 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> 
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> 
  	</target>
-@@ -380,6 +390,8 @@
+@@ -440,6 +451,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -41,7 +48,7 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
  		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="*.so*" /> 
  		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" /> 
  	</target>
-@@ -391,6 +403,8 @@
+@@ -451,6 +464,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -50,7 +57,7 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
  		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="*.so*" /> 
  		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> 
  	</target>
-@@ -404,6 +418,8 @@
+@@ -463,6 +478,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -59,7 +66,7 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> 
  		<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> 
  	</target>
-@@ -415,6 +431,8 @@
+@@ -474,6 +491,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -68,7 +75,7 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
  		<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFileslinux_motif_x86">
-@@ -429,6 +447,8 @@
+@@ -487,6 +506,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -77,25 +84,34 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
  		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> 
  		<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> 
  	</target>
-@@ -440,6 +460,8 @@
+@@ -498,6 +519,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
 +		<!-- Copy the launcher that we built over the pre-built binary -->
 +		<antcall target="copybuiltlauncher" />
- 		<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" /> 
+ 		<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" /> 
  	</target>
- 	<target name="rootFilessolaris_gtk_sparc">
-@@ -450,6 +472,8 @@
+ 	<target name="rootFilessolaris_gtk_x86">
+@@ -508,6 +531,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
 +		<!-- Copy the launcher that we built over the pre-built binary -->
 +		<antcall target="copybuiltlauncher" />
- 		<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" /> 
+ 		<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="eclipse" /> 
+ 	</target>
+ 	<target name="rootFilessolaris_motif_sparc">
+@@ -518,6 +543,8 @@
+ 			<fileset dir="${basedir}/rootfiles" includes="**"			/>
+ 			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
+ 		</copy>
++		<!-- Copy the launcher that we built over the pre-built binary -->
++		<antcall target="copybuiltlauncher" />
+ 		<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFilesaix_motif_ppc">
-@@ -460,6 +484,8 @@
+@@ -528,6 +555,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -104,7 +120,7 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
  		<chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFileshpux_motif_PA_RISC">
-@@ -470,6 +496,8 @@
+@@ -538,6 +567,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -113,7 +129,7 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
  		<chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFileshpux_motif_ia64">
-@@ -480,6 +508,8 @@
+@@ -548,6 +579,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -122,7 +138,7 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
  		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" /> 
  	</target>
  	<target name="rootFileshpux_motif_ia64_32">
-@@ -490,6 +520,8 @@
+@@ -558,6 +591,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -130,8 +146,8 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
 +		<antcall target="copybuiltlauncher" />
  		<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" /> 
  	</target>
- 	<target name="rootFilesmacosx_carbon_ppc">
-@@ -516,6 +548,8 @@
+ 	<target name="rootFilesqnx_photon_x86">
+@@ -568,6 +603,8 @@
  			<fileset dir="${basedir}/rootfiles" includes="**"			/>
  			<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar"			/>
  		</copy>
@@ -139,4 +155,4 @@ diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/
 +		<antcall target="copybuiltlauncher" />
  		<chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" /> 
  	</target>
- 
+ 	<target name="rootFilesgroup_group_group">
diff --git a/eclipse-webapp-tomcat55.patch b/eclipse-webapp-tomcat55.patch
deleted file mode 100644
index 8b8e741..0000000
--- a/eclipse-webapp-tomcat55.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: build.properties
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.properties,v
-retrieving revision 1.32
-diff -u -r1.32 build.properties
---- build.properties	18 Mar 2005 08:00:28 -0000	1.32
-+++ build.properties	6 Mar 2006 21:10:11 -0000
-@@ -33,5 +33,5 @@
-                      ../org.eclipse.help.appserver/bin,\
-                      ../org.eclipse.help.appserver,\
-                      ../org.eclipse.help.appserver/@dot,\
--                     ../org.eclipse.tomcat/servlet.jar,\
-+                     ../org.eclipse.tomcat/servletapi5.jar,\
-                      ../org.eclipse.tomcat/jasper-runtime.jar
-Index: build.xml
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.xml,v
-retrieving revision 1.65
-diff -u -r1.65 build.xml
---- build.xml	18 Mar 2005 07:55:40 -0000	1.65
-+++ build.xml	6 Mar 2006 21:10:12 -0000
-@@ -126,7 +126,7 @@
- 				<pathelement path="../org.eclipse.help"/>
- 				<pathelement path="../org.eclipse.help.base"/>
- 				<pathelement path="../org.eclipse.help.appserver"/>
--				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
-+				<pathelement path="../org.eclipse.tomcat/servletapi5.jar"/>
- 				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
- 			</classpath>
- 			<src path="src_servlets/"			/>
-@@ -154,11 +154,14 @@
- 		<!-- generate java code from JSPs -->
- 		<path id="jasper.classpath" > 
- 			<pathelement location="../org.apache.ant/lib/ant.jar"/>
--			<pathelement location="../org.apache.ant/lib/optional.jar"/>
-+			<pathelement location="../org.apache.ant/lib/ant-launcher.jar"/>
- 			<pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
- 			<pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
--			<pathelement location="../org.eclipse.tomcat/servlet.jar" />
--			<pathelement location="../org.eclipse.tomcat/tomcat_util.jar" />  
-+			<pathelement location="../org.eclipse.tomcat/servletapi5.jar" />
-+			<pathelement location="../org.eclipse.tomcat/tomcat-util.jar" />  
-+			<pathelement location="../org.eclipse.tomcat/jspapi.jar"/>
-+			<pathelement location="../org.eclipse.tomcat/commons-el.jar"/>
-+			<pathelement location="../org.eclipse.tomcat/commons-logging.jar"/>
- 		</path>
- 		<delete dir="${temp.folder}/jsp.jar.src"/>
-   		<mkdir dir="${temp.folder}/jsp.jar.src"/>
-@@ -168,7 +171,6 @@
- 			failonerror="false"
- 			classpathref="jasper.classpath"
- 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
--			<arg value="-v3" />
- 			<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
- 			<arg value="-die" />
- 			<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>
-@@ -202,8 +204,9 @@
- 				<pathelement path="../org.eclipse.help"/>
- 				<pathelement path="../org.eclipse.help.base"/>
- 				<pathelement path="../org.eclipse.help.appserver"/>
--				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
-+				<pathelement path="../org.eclipse.tomcat/servletapi5.jar"/>
- 				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
-+				<pathelement path="../org.eclipse.tomcat/jspapi.jar"/>
- 			</classpath>
- 			<src path="${temp.folder}/jsp.jar.src/"			/>
- <!-- custom begin -->
diff --git a/eclipse.spec b/eclipse.spec
index ec235ab..befc60e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,16 +1,24 @@
 Epoch:	1
 
+%define fedora		1
+%define redhat		0
+%if %{fedora}
 %define gcj_support 	1
+%else
+%define gcj_support 	0
+%endif
 %define tomcatsharedir 	%{_datadir}/tomcat5
 %define tomcatlibdir 	%{_var}/lib/tomcat5
 %define pkg_summary     An open, extensible IDE
 %define section         free
-%define swt_version     3139
+# FIXME automate this
+%define swt_version     3232
 %define eclipse_major   3
-%define eclipse_minor   1
+%define eclipse_minor   2
 %define eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro   2
+%define eclipse_micro   0
 %define libname         libswt3
+%define build_id        I20051206-0800
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -18,30 +26,33 @@ Epoch:	1
 %else
 %define eclipse_arch   %{_arch}
 %endif
+%if %{gcj_support}
 %ifarch %{ix86} x86_64 ppc
 %define native_ecj   1
 %else
 %define native_ecj   0
 %endif
+%else
+%define native_ecj   0
+%endif
 
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_14fc
+Release:        0jpp_0fc.3.2RC6
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-sourceBuild-srcIncluded-3.1.2.zip
+Source0:	http://download.eclipse.org/eclipse/downloads/drops/S-3.2RC6-200605260010/eclipse-sourceBuild-srcIncluded-3.2RC6.zip
 Source2:        %{name}.desktop
 Source5:        %{name}-48.png
 Source6:        %{name}.conf
-Source7:        %{name}-jdt.install
-Source8:        %{name}-pde.install     
-Source9:        %{name}-platform.install
-Source10:       %{libname}-gtk2.install
-Source11:	%{name}-fedora-splash-3.1.2.png
+Source11:	%{name}-fedora-splash-3.2rc6.png
 Source16:       %{name}-copy-platform.sh
 Source17:       %{name}-efj-wrapper.sh
+%if %{redhat}
+Source18:	%{name}-redhat-splash.png
+%endif
 Source19:       %{name}-filenamepatterns.txt
 Source20:	ecj.sh.in
 Source21:	rebuild-sdk-features
@@ -58,36 +69,29 @@ Patch0:         %{name}-libswt-enableallandO2.patch
 Patch2:		%{name}-build.patch
 Patch4:		%{name}-libupdatebuild.patch
 Patch5:		%{name}-libupdatebuild2.patch
-# Use installed mozilla libs and headers
-Patch11:	%{name}-libswt-mozilla.patch
 # We can't really commit to doing builds for these arches upstream, but we
 # need at least eclipse-ecj to run on them as it's our bytecode compiler for
 # Fedora.
-#Patch13:	%{name}-s390ands390x.patch
+Patch13:	%{name}-s390ands390x.patch
 # Stupid spaces in directories ...
-#Patch14:	%{name}-s390ands390x2.patch
+Patch14:	%{name}-s390ands390x2.patch
 # Build swttools.jar
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
 Patch18: 	%{name}-swttools.patch
-# Add command-line source code formatter
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=75333
-Patch19: 	%{name}-efj.patch
-Patch25: 	%{name}-efj-doc.patch
 # GNU-style JDT formatter
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=91770
 #Patch20: 	%{name}-gnuformatterjdt.patch
 #Patch21: 	%{name}-gnuformatterjdtui.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630
-Patch22: 	%{name}-updatehomedir-core.patch
-Patch23: 	%{name}-updatehomedir-ui.patch
+Patch22: 	%{name}-updatehomedir.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
 Patch24: 	%{name}-fileinitializer.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
-Patch28: 	%{name}-tomcat55.patch
-Patch29: 	%{name}-tomcat55-build.patch
-Patch30: 	%{name}-tomcat55-build.2.patch
-Patch50:        %{name}-tomcat55-build.3.patch
-Patch31: 	%{name}-webapp-tomcat55.patch
+#Patch28: 	%{name}-tomcat5.patch
+#Patch29: 	%{name}-tomcat5-build.patch
+#Patch30: 	%{name}-tomcat5-build.2.patch
+#Patch50:        %{name}-tomcat5-build.3.patch
+#Patch31: 	%{name}-webapp-tomcat5.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726
 Patch33:        %{name}-compare-create-api.patch
@@ -95,34 +99,39 @@ Patch33:        %{name}-compare-create-api.patch
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
 Patch34:	%{name}-bz162177.patch
 Patch35:	%{name}-genjavadocoutput.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=105430
-Patch36:	%{name}-ecj-classpath.patch
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=109253
-# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168040
-Patch37:	%{name}-gre64.conf.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=114001
 Patch38:	%{name}-helpindexbuilder.patch
 Patch40:	%{name}-usebuiltlauncher.patch
-# Build cairo libs
+## Build cairo native libs
+#Patch43:	%{name}-libswt-cairo1.0-3.patch
 # Again, I hate patches with spaces in the filenames
-Patch41:	%{name}-libswt-cairo1.0-1.patch
-Patch42:	%{name}-libswt-cairo1.0-2.patch
-Patch43:	%{name}-libswt-cairo1.0-3.patch
-Patch44:	%{name}-libswt-cairo1.0-4.patch
+#Patch45:	%{name}-webapp-jasperclasspath.patch
 Patch46:	%{name}-libswt-xpcomgcc4.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=79592
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=168726
 Patch47:	%{name}-launcher-link.patch
 # Don't attempt to link to Sun's javadocs
 Patch48:	%{name}-javadoclinks.patch
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=126648
+Patch52:	%{name}-libswt-mozilla2.patch
 # Always generate debug info when building RPMs (Andrew Haley)
 Patch49:	%{name}-ecj-rpmdebuginfo.patch
 # Add support for ppc64:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172172
 Patch51:	%{name}-ppc64.patch
+# generic releng plugins that can be used to build plugins
+# see this thread for deails: 
+# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
+Patch53:	%{name}-pde.build-add-package-build.patch
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=191536
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=142861
+Patch54:	%{name}-swt-rm-ON_TOP.patch
+# We need to disable junit4 and apt until GCJ can handle Java5 code
+Patch55: 	%{name}-disable-junit4-apt.patch
+
 
 %if %{gcj_support}
-ExcludeArch: s390 s390x ppc64
+ExcludeArch: ppc64 s390 s390x
 %else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %endif
@@ -140,6 +149,8 @@ BuildRequires:  mozilla = 37:1.7.13
 BuildRequires:  mozilla-devel = 37:1.7.13
 BuildRequires:  nspr-devel
 BuildRequires:  libXtst-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
 BuildRequires:  java-javadoc
@@ -155,11 +166,14 @@ BuildRequires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apa
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 #BuildRequires: ant-commons-net
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
+# FIXME update jsch to 1.28
 BuildRequires: jsch >= 0:0.1.18-1jpp
 BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 BuildRequires: mx4j >= 2.1
-BuildRequires: tomcat5 tomcat5-jasper tomcat5-servlet-2.4-api
-BuildRequires: lucene lucene-demo
+BuildRequires: tomcat5 >= 5.5.15
+BuildRequires: tomcat5-jasper >= 5.5.15
+BuildRequires: tomcat5-servlet-2.4-api >= 5.5.15
+BuildRequires: lucene
 BuildRequires: regexp 
 BuildRequires: junit >= 3.8.1-3jpp
 %if %{gcj_support}
@@ -210,7 +224,6 @@ Requires:       %{name}-rcp = %{epoch}:%{version}-%{release}
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires:       /usr/bin/perl
 Requires:       /usr/bin/mozilla
-Requires:       java-javadoc
 
 BuildRequires:    gtk2 >= 2.6
 Requires:         gtk2 >= 2.6
@@ -219,11 +232,14 @@ Requires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-o
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 #Requires: ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
+# FIXME update jsch to 0.1.28
 Requires: jsch >= 0:0.1.18-1jpp
 Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
 Requires: mx4j >= 2.1
-Requires: tomcat5 tomcat5-jasper tomcat5-servlet-2.4-api
-Requires: lucene lucene-demo
+Requires: tomcat5 >= 5.5.15
+Requires: tomcat5-jasper >= 5.5.15
+Requires: tomcat5-servlet-2.4-api >= 5.5.15
+Requires: lucene 
 Requires: regexp
 
 %description    platform
@@ -237,6 +253,7 @@ Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-rcp-devel = %{epoch}:%{version}-%{release}
 Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
+Requires:       java-javadoc
 
 %description    platform-devel
 Source for Eclipse platform for use within Eclipse.
@@ -264,6 +281,7 @@ Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
 Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
+Requires:       java-javadoc
 
 %description    jdt-devel
 Source for JDT for use within Eclipse.
@@ -272,6 +290,7 @@ Source for JDT for use within Eclipse.
 Summary:        Eclipse PDE
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
+Requires:       %{name}-pde-runtime = %{epoch}:%{version}-%{release}
 Requires:       %{name}-platform-devel = %{epoch}:%{version}-%{release}
 Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
 Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
@@ -282,7 +301,23 @@ Requires(postun): java-gcj-compat >= 1.0.43
 %endif
 
 %description    pde
-Eclipse PDE.
+Eclipse Plug-in Development Environment.
+
+%package        pde-runtime
+Summary:        Eclipse PDE runtime plugin.
+Group:          Text Editors/Integrated Development Environments (IDE)
+Requires:       %{name}-jdt = %{epoch}:%{version}-%{release}
+Requires:       %{name}-platform-devel = %{epoch}:%{version}-%{release}
+Requires(post):   %{name}-platform = %{epoch}:%{version}-%{release}
+Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
+%if %{gcj_support}
+Requires:	libgcj >= 4.0.2
+Requires(post):   java-gcj-compat >= 1.0.43
+Requires(postun): java-gcj-compat >= 1.0.43
+%endif
+
+%description    pde-runtime
+Eclipse Plug-in Development Environment runtime plugin (org.eclipse.pde.runtime).
 
 %package        pde-devel
 Summary:        Eclipse PDE Source
@@ -295,7 +330,7 @@ Obsoletes:	%{name}-source
 Provides:       %{name}-source = %{epoch}:%{version}-%{release}
 
 %description    pde-devel
-Source for PDE for use within Eclipse.
+Source for Eclipse Plug-in Development Environment for use within Eclipse.
 
 %package     -n %{libname}-gtk2
 Summary:        SWT Library for GTK2
@@ -338,9 +373,7 @@ Source for RCP for use within Eclipse.
 # I hate spaces in paths with patch!
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 %patch0 -p0
-# FIXME:  do something like this in the future
-# sed --in-place "s:@MOZ_VERSION@:%{mozilla_version}/:g" patch11
-%patch11 -p0
+%patch52 -p0
 %if %{gcj_support}
 #%patch14 -p0
 %endif
@@ -354,62 +387,37 @@ popd
 pushd plugins/org.eclipse.swt.gtk.linux.x86_64
 %patch18 -p0
 popd
-pushd plugins/org.eclipse.jdt.core
-%patch19 -p1
+#pushd plugins/org.eclipse.jdt.core
 #%patch20 -p0
-popd
-pushd plugins/org.eclipse.jdt.doc.user
-%patch25 -p1
-popd
+#popd
 #pushd plugins/org.eclipse.jdt.ui
 #%patch21 -p0
 #popd
-pushd plugins/org.eclipse.update.core
 %patch22 -p0
-popd
-pushd plugins/org.eclipse.update.ui
-%patch23 -p0
-popd
 pushd plugins/org.eclipse.core.runtime
 %patch24 -p0
 popd
 pushd plugins/org.eclipse.tomcat
-%patch28 -p0
-%patch29 -p0
-popd
-%patch30 -p0
-%patch50 -p1
-pushd plugins/org.eclipse.help.webapp
-%patch31 -p0
-popd
-# Remove the pre-built cairo libraries
-pushd plugins/org.eclipse.swt.gtk.linux.x86
-rm libcairo.so.1
-popd
-pushd plugins/org.eclipse.swt.gtk.linux.x86_64
-rm libcairo.so.1
-popd
-pushd plugins/org.eclipse.swt.motif.linux.x86
-rm libcairo.so.1
+#%patch28 -p0
+#%patch29 -p0
 popd
+#%patch30 -p0
+#%patch50 -p1
+#pushd plugins/org.eclipse.help.webapp
+#%patch31 -p0
+#popd
 pushd plugins/org.eclipse.compare
-%patch33 -p0
+#%patch33 -p0
+popd
+pushd plugins/org.eclipse.jdt.core
+%patch34 -p0
 popd
-%patch34 -p1
 %patch35 -p0
-%patch36 -p1
 %patch38 -p0
 %patch40 -p0
-# Again, I hate spaces in patches
-pushd plugins/org.eclipse.swt/Eclipse\ SWT/
-%patch41 -p0
-popd
-pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/
-%patch42 -p0
-popd
-%patch43
-pushd plugins/org.eclipse.swt.tools/JNI\ Generation/
-%patch44
+#%patch43
+pushd plugins/org.eclipse.help.webapp
+#%patch45
 popd
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library
 %patch46
@@ -419,7 +427,6 @@ popd
 mkdir launchertmp
 unzip -d launchertmp plugins/org.eclipse.platform/launchersrc.zip
 pushd launchertmp
-%patch37 -p1
 %patch47 -p1
 zip -9 -r ../launchersrc.zip *
 popd
@@ -427,120 +434,198 @@ mv launchersrc.zip plugins/org.eclipse.platform
 rm -rf launchertmp
 
 pushd features/org.eclipse.platform.launchers
-%patch37 -p1
 %patch47 -p1
 popd
 # Link against our system-installed javadocs
 %patch48 -p0
-pushd plugins/org.eclipse.jdt.doc.isv
-sed --in-place "s:/usr/share/:%{_datadir}/:g" jdtOptions
-popd
-pushd plugins/org.eclipse.pde.doc.user
-sed --in-place "s:/usr/share/:%{_datadir}/:g" pdeOptions
-popd
-pushd plugins/org.eclipse.platform.doc.isv
-sed --in-place "s:/usr/share/:%{_datadir}/:g" platformOptions
-popd
+sed --in-place "s:/usr/share/:%{_datadir}/:g"           \
+	plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt  \
+	plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
+	plugins/org.eclipse.pde.doc.user/pdeOptions     \
+	plugins/org.eclipse.platform.doc.isv/platformOptions.txt 
 %patch49 -p0
 pwd
-%patch51 -p0
+#TODO FIXME %patch51 -p0
 
-%if %{gcj_support}
+pushd plugins/org.eclipse.pde.build
+%patch53
+sed --in-place "s:@eclipse_base@:%{_datadir}/%{name}:" templates/package-build/build.properties
+popd
+
+pushd plugins/org.eclipse.swt/Eclipse\ SWT
+%patch54 
+popd
+
+%patch55 -p1
+rm plugins/org.junit4/junit-4.1.jar
+
+%if %{fedora}
   # Fedora splash screen.
   pushd plugins/org.eclipse.platform
   cp %{SOURCE11} splash.bmp
   popd
 %endif
+%if %{redhat}
+  # Red Hat splash screen.
+  pushd plugins/org.eclipse.platform
+  cp %{SOURCE18} splash.bmp
+  popd
+%endif
 
 # Remove existing .sos
-find -name \*.so -exec rm "-f" "{}" ";"
+find -name \*.so | xargs rm
 
 # Symlinks
 
 ## BEGIN ANT ##
-ln -sf %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant/lib/ant-antlr.jar
-ln -sf %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant/lib/ant-apache-bcel.jar
-ln -sf %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant/lib/ant-apache-bsf.jar
-ln -sf %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant/lib/ant-apache-log4j.jar
-ln -sf %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant/lib/ant-apache-oro.jar
-ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apache-regexp.jar
-ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar
-ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-commons-logging.jar
+rm plugins/org.apache.ant/lib/ant-antlr.jar
+rm plugins/org.apache.ant/lib/ant-antlrsrc.zip
+rm plugins/org.apache.ant/lib/ant-apache-bcel.jar
+rm plugins/org.apache.ant/lib/ant-apache-bcelsrc.zip
+rm plugins/org.apache.ant/lib/ant-apache-bsf.jar
+rm plugins/org.apache.ant/lib/ant-apache-bsfsrc.zip
+rm plugins/org.apache.ant/lib/ant-apache-log4j.jar
+rm plugins/org.apache.ant/lib/ant-apache-log4jsrc.zip
+rm plugins/org.apache.ant/lib/ant-apache-oro.jar
+rm plugins/org.apache.ant/lib/ant-apache-orosrc.zip
+rm plugins/org.apache.ant/lib/ant-apache-regexp.jar
+rm plugins/org.apache.ant/lib/ant-apache-regexpsrc.zip
+rm plugins/org.apache.ant/lib/ant-apache-resolver.jar
+rm plugins/org.apache.ant/lib/ant-apache-resolversrc.zip
+rm plugins/org.apache.ant/lib/ant-commons-logging.jar
+rm plugins/org.apache.ant/lib/ant-commons-loggingsrc.zip
+rm plugins/org.apache.ant/lib/ant-commons-net.jar
+rm plugins/org.apache.ant/lib/ant-commons-netsrc.zip
+rm plugins/org.apache.ant/lib/ant-icontract.jar
+rm plugins/org.apache.ant/lib/ant-icontractsrc.zip
+rm plugins/org.apache.ant/lib/ant-jai.jar
+rm plugins/org.apache.ant/lib/ant-jaisrc.zip
+rm plugins/org.apache.ant/lib/ant.jar
+rm plugins/org.apache.ant/lib/antsrc.zip
+rm plugins/org.apache.ant/lib/ant-javamail.jar
+rm plugins/org.apache.ant/lib/ant-javamailsrc.zip
+rm plugins/org.apache.ant/lib/ant-jdepend.jar
+rm plugins/org.apache.ant/lib/ant-jdependsrc.zip
+rm plugins/org.apache.ant/lib/ant-jmf.jar
+rm plugins/org.apache.ant/lib/ant-jmfsrc.zip
+rm plugins/org.apache.ant/lib/ant-jsch.jar
+rm plugins/org.apache.ant/lib/ant-jschsrc.zip
+rm plugins/org.apache.ant/lib/ant-junit.jar
+rm plugins/org.apache.ant/lib/ant-junitsrc.zip
+rm plugins/org.apache.ant/lib/ant-launcher.jar
+rm plugins/org.apache.ant/lib/ant-launchersrc.zip
+rm plugins/org.apache.ant/lib/ant-netrexx.jar
+rm plugins/org.apache.ant/lib/ant-netrexxsrc.zip
+rm plugins/org.apache.ant/lib/ant-nodeps.jar
+rm plugins/org.apache.ant/lib/ant-nodepssrc.zip
+rm plugins/org.apache.ant/lib/ant-starteam.jar
+rm plugins/org.apache.ant/lib/ant-starteamsrc.zip
+rm plugins/org.apache.ant/lib/ant-stylebook.jar
+rm plugins/org.apache.ant/lib/ant-stylebooksrc.zip
+rm plugins/org.apache.ant/lib/ant-swing.jar
+rm plugins/org.apache.ant/lib/ant-swingsrc.zip
+rm plugins/org.apache.ant/lib/ant-trax.jar
+rm plugins/org.apache.ant/lib/ant-traxsrc.zip
+rm plugins/org.apache.ant/lib/ant-vaj.jar
+rm plugins/org.apache.ant/lib/ant-vajsrc.zip
+rm plugins/org.apache.ant/lib/ant-weblogic.jar
+rm plugins/org.apache.ant/lib/ant-weblogicsrc.zip
+rm plugins/org.apache.ant/lib/ant-xalan1.jar
+rm plugins/org.apache.ant/lib/ant-xalan1src.zip
+rm plugins/org.apache.ant/lib/ant-xslp.jar
+rm plugins/org.apache.ant/lib/ant-xslpsrc.zip
+# FIXME use build-jar-repository
+ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant/lib/ant-antlr.jar
+ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant/lib/ant-apache-bcel.jar
+ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant/lib/ant-apache-bsf.jar
+ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant/lib/ant-apache-log4j.jar
+ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant/lib/ant-apache-oro.jar
+ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apache-regexp.jar
+ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar
+ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-commons-logging.jar
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
-#ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant/lib/ant-commons-net.jar
-ln -sf %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
-ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
-ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant/lib/ant-jdepend.jar
-ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
-ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant/lib/ant-junit.jar
-ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant/lib/ant-launcher.jar
-ln -sf %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant/lib/ant-nodeps.jar
-ln -sf %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant/lib/ant-swing.jar
-ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
-# We don't have this in FC5
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
-rm -f plugins/org.apache.ant/lib/ant-commons-net.jar
-# We used to ship these pre-built, but we're not going to do that anymore.  If
-# we can build them using free stuff, we will. -- overholt, 2005-07-04
-rm -f plugins/org.apache.ant/lib/ant-icontract.jar
-rm -f plugins/org.apache.ant/lib/ant-jai.jar
-rm -f plugins/org.apache.ant/lib/ant-netrexx.jar
-rm -f plugins/org.apache.ant/lib/ant-starteam.jar
-rm -f plugins/org.apache.ant/lib/ant-stylebook.jar
-rm -f plugins/org.apache.ant/lib/ant-vaj.jar
-rm -f plugins/org.apache.ant/lib/ant-weblogic.jar
-rm -f plugins/org.apache.ant/lib/ant-xalan1.jar
-rm -f plugins/org.apache.ant/lib/ant-xslp.jar
+# the symlinks that are commented out are not currently shipped on Fedora
+#ln -s %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant/lib/ant-commons-net.jar
+#ln -s %{_javadir}/ant/ant-icontract.jar plugins/org.apache.ant/lib/ant-icontract.jar
+#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant/lib/ant-jai.jar
+ln -s %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
+ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
+ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant/lib/ant-jdepend.jar
+#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant/lib/ant-jmf.jar
+ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
+ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant/lib/ant-junit.jar
+ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant/lib/ant-launcher.jar
+#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant/lib/ant-netrexx.jar
+ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant/lib/ant-nodeps.jar
+#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant/lib/ant-starteam.jar
+#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant/lib/ant-stylebook.jar
+ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant/lib/ant-swing.jar
+ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
+#ln -s %{_javadir}/ant/ant-vaj.jar plugins/org.apache.ant/lib/ant-vaj.jar
+#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant/lib/ant-weblogic.jar
+#ln -s %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant/lib/ant-xalan1.jar
+#ln -s %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant/lib/ant-xslp.jar
 ## END ANT ##
 # BEGIN LUCENE ##
-ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
-ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene/parser.jar
+rm plugins/org.apache.lucene/lucene-1.4.3.jar
 # FIXME:  Remove this zip until we have a lucene-devel package containing it.
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=170343
-rm -f plugins/org.apache.lucene/lucene-1.4.3-src.zip
+rm plugins/org.apache.lucene/lucene-1.4.3-src.zip
+ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene/lucene-1.4.3.jar
 # END LUCENE ##
-ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
+# FIXME
+#rm baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
+#ln -s %{_javadir}/jsch.jar baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
+#rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_0.1.26.jar
+#rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_0.1.27.jar
+#rm plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_0.1.28.jar
+#ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/com.jcraft.jsch_0.1.28.jar
 ## BEGIN TOMCAT ##
-rm -f plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
-rm -f plugins/org.eclipse.tomcat/servlet.jar
-rm -f plugins/org.eclipse.tomcat/servlets-manager.jar
-rm -f plugins/org.eclipse.tomcat/naming-common.jar
-rm -f plugins/org.eclipse.tomcat/servlets-common.jar
-rm -f plugins/org.eclipse.tomcat/tomcat-http11.jar
-ln -sf %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
-ln -sf %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
-ln -sf %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
-ln -sf %{_javadir}/commons-beanutils.jar plugins/org.eclipse.tomcat/commons-beanutils.jar
-ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat/commons-collections.jar
-ln -sf %{_javadir}/commons-dbcp.jar plugins/org.eclipse.tomcat/commons-dbcp.jar
-ln -sf %{_javadir}/commons-digester.jar plugins/org.eclipse.tomcat/commons-digester.jar
-ln -sf %{_javadir}/commons-digester-rss.jar plugins/org.eclipse.tomcat/commons-digester-rss.jar
-ln -sf %{_javadir}/commons-el.jar plugins/org.eclipse.tomcat/commons-el.jar
-ln -sf %{_javadir}/commons-fileupload.jar plugins/org.eclipse.tomcat/commons-fileupload.jar
-ln -sf %{_javadir}/commons-launcher.jar plugins/org.eclipse.tomcat/commons-launcher.jar
-ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat/commons-logging.jar
-ln -sf %{_javadir}/commons-logging-api.jar plugins/org.eclipse.tomcat/commons-logging-api.jar
-ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat/commons-modeler.jar
-ln -sf %{_javadir}/commons-pool.jar plugins/org.eclipse.tomcat/commons-pool.jar
-ln -sf %{_javadir}/jasper-compiler.jar  plugins/org.eclipse.tomcat/jasper-compiler.jar
-ln -sf %{_javadir}/jasper-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
-ln -sf %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat/jspapi.jar
-ln -sf %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat/mx4j.jar
-ln -sf %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat/mx4j-impl.jar
-ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar
-ln -sf %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
-ln -sf %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
-ln -sf %{_javadir}/regexp-1.3.jar plugins/org.eclipse.tomcat/regexp-1.3.jar
-ln -sf %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat/servletapi5.jar
-ln -sf %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
-ln -sf %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
-ln -sf %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
-ln -sf %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat/tomcat-http.jar
-ln -sf %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
+#rm plugins/org.eclipse.tomcat/commons-beanutils.jar
+#rm plugins/org.eclipse.tomcat/commons-collections.jar
+#rm plugins/org.eclipse.tomcat/commons-digester.jar
+#rm plugins/org.eclipse.tomcat/commons-logging-api.jar
+#rm plugins/org.eclipse.tomcat/commons-modeler.jar
+#rm plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
+#rm plugins/org.eclipse.tomcat/servlet.jar
+#rm plugins/org.eclipse.tomcat/servlets-manager.jar
+#rm plugins/org.eclipse.tomcat/naming-common.jar
+#rm plugins/org.eclipse.tomcat/servlets-common.jar
+#rm plugins/org.eclipse.tomcat/tomcat-http11.jar
+#ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
+#ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
+#ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
+#ln -s %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat/jakarta-commons-beanutils.jar
+#ln -s %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat/jakarta-commons-collections.jar
+#ln -s %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat/jakarta-commons-dbcp.jar
+#ln -s %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat/jakarta-commons-digester.jar
+#ln -s %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat/jakarta-commons-digester-rss.jar
+#ln -s %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat/jakarta-commons-el.jar
+#ln -s %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat/jakarta-commons-fileupload.jar
+#ln -s %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat/jakarta-commons-launcher.jar
+#ln -s %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat/jakarta-commons-logging.jar
+#ln -s %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat/jakarta-commons-modeler.jar
+#ln -s %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat/jakarta-commons-pool.jar
+#ln -s %{_javadir}/jasper5-compiler.jar  plugins/org.eclipse.tomcat/jasper-compiler.jar
+#ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat/jasper-runtime.jar
+#ln -s %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat/jspapi.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 %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat/naming-common.jar
+#ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar
+#ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar
+#ln -s %{_javadir}/regexp.jar plugins/org.eclipse.tomcat/regexp.jar
+#ln -s %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat/servletapi5.jar
+#ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat/servlets-common.jar
+#ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar
+#ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar
+#ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
+#ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
+#ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
 ## END TOMCAT ##
-ln -sf %{_javadir}/junit.jar plugins/org.junit/junit.jar
-
-rm -f *.jar
+rm plugins/org.junit/junit.jar
+ln -s %{_javadir}/junit.jar plugins/org.junit/junit.jar
 
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
 # /usr/lib -> /usr/lib64
@@ -548,17 +633,26 @@ sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
 sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
 popd
 
+# FIXME enable
+# make sure there are no jars left
+#for j in $(find -name \*.jar); do
+#  if [ ! -L $j ]; then
+#    echo This jar should be deleted and syslinked to a system jar: $j
+#    exit 1
+#  fi
+#done
+
 
 %build
 env
 ORIGCLASSPATH=$CLASSPATH
 
+# Bootstrapping is 3 parts:
+# 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc
+# 2. Build ecj with gcj-built ecj ("javac")
+# 3. Re-build ecj with output of 2.
+
 %if %{gcj_support}
-  # Bootstrapping is 3 parts:
-  # 1. Build ecj with gcj -C 
-  # 2. Build ecj with gcj-built ecj ("javac")
-  # 3. Re-build ecj with output of 2.
-  
   # Unzip the "stable compiler" source into a temp dir and build it.
   # Note:  we don't want to build the CompilerAdapter.
   mkdir ecj-bootstrap-tmp
@@ -578,12 +672,12 @@ ORIGCLASSPATH=$CLASSPATH
   rm -rf ecj-bootstrap-tmp
   
 %if %{native_ecj}
-  # 1b. Natively-compile it
-  gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
-    -o ecj-bootstrap.jar.so ecj-bootstrap.jar
+    # 1b. Natively-compile it
+    gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
+      -o ecj-bootstrap.jar.so ecj-bootstrap.jar
    
-  gcj-dbtool -n ecj-bootstrap.db 30000
-  gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
+    gcj-dbtool -n ecj-bootstrap.db 30000
+    gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so}
 %endif
   
   # 2a. Build ecj
@@ -594,7 +688,6 @@ ORIGCLASSPATH=$CLASSPATH
 %endif
 ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
 
-%if %{gcj_support}
 %if %{native_ecj}
   # 2b. Natively-compile ecj
   gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
@@ -609,13 +702,11 @@ ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
   # To enSURE we're not using any pre-compiled ecj on the build system, set this
   export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
 %endif
-%endif
 
 # 3. Use this ecj to rebuild itself
 export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
 ant -buildfile jdtcoresrc/compilejdtcore.xml
 
-%if %{gcj_support}
 %if %{native_ecj}
   # Natively-compile it
   gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
@@ -627,10 +718,10 @@ ant -buildfile jdtcoresrc/compilejdtcore.xml
   # Remove old native bits
   rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
 %endif
-%endif
 
 # Build the rest of Eclipse
 export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH
+export JAVA_HOME=%{java_home}
 ant \
   -Dnobootstrap=true \
   -DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
@@ -682,13 +773,13 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
-ln -sf %{_libdir}/%{name}/eclipse eclipse
+ln -s %{_libdir}/%{name}/eclipse eclipse
 
 # Symlink JNI libraries
 for l in `find configuration -name \*.so`; do
     mv $l $RPM_BUILD_ROOT%{_libdir}/%{name};
     pushd `dirname $l`;
-      ln -sf %{_libdir}/%{name}/`basename $l`;
+      ln -s %{_libdir}/%{name}/`basename $l`;
     popd;
     # SWT bundle stuff should go in libswt3-gtk
     # Contents of other bundles should go in eclipse-platform
@@ -707,7 +798,7 @@ for l in `find configuration -name \*.so`; do
             echo $currentDir | gawk -F '/' '{ print "/"$7"/"$8"/"$9"/"$10"/"$11"/"$12"/"$13"/"$14 }' > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install;
           fi
         popd
-    elif [ "`basename $l`" = "libcore_3_1_0.so" ]; then
+    elif [ "`basename $l`" = "liblocalfile_1_0_0.so" ]; then
         pushd `dirname $l`;
           cd ../../../../..;
           currentDir=`pwd`;
@@ -745,18 +836,15 @@ popd
 
 ### begin libswt-gtk2 symlinks
 pushd $RPM_BUILD_ROOT%{_libdir}
-for base in awt-gtk atk-gtk cairo-gtk mozilla-gtk gnome-gtk gtk pi-gtk; do
-  ln -sf %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
+for base in awt-gtk atk-gtk cairo-gtk mozilla-gtk gnome-gtk gtk pi-gtk glx-gtk; do
+  ln -s %{_libdir}/%{name}/libswt-${base}-%{swt_version}.so \
          libswt-${base}-%{swt_version}.so
 done
 popd
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 pushd $RPM_BUILD_ROOT%{_javadir}
-#ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
-#ln -sf %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
-# SWT is still a 3.1.1 jar ... (rh#180000)
-ln -sf %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar swt-gtk-3.1.1.jar
-ln -sf %{_javadir}/swt-gtk-3.1.1.jar swt-gtk-%{eclipse_majmin}.jar
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_%{eclipse_majmin}.%{eclipse_micro}.v%{swt_version}.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
+ln -s %{_javadir}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.v%{swt_version}.jar swt-gtk-%{eclipse-majmin}.jar
 popd
 ### end libswt-gtk2 symlinks
 
@@ -797,24 +885,22 @@ desktop-file-validate %{SOURCE2}
 install -p -D -m0644 %{SOURCE2} \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-cat %{SOURCE7} > %{name}-jdt.install
-cat %{SOURCE8} > %{name}-pde.install
-cat %{SOURCE9} >> %{name}-platform.install
-cat %{SOURCE10} >> %{libname}-gtk2.install
-
 cat >> $RPM_BUILD_ROOT%{_datadir}/%{name}/.eclipseproduct << EOF
 name=Eclipse Platform
 id=org.eclipse.platform
 version=%{eclipse_majmin}.%{eclipse_micro}
 EOF
 
+%if %{fedora}
 # Put Fedora Core version into about.mappings of org.eclipse.sdk to show it in
 # Eclipse about dialog.  (courtesy Debian Eclipse packagers)
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_%{eclipse_majmin}.%{eclipse_micro}
+# FIXME use the third id
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/org.eclipse.sdk_%{eclipse_majmin}.%{eclipse_micro}.*
 FEDORA_VERSION=`cat /etc/fedora-release`
 sed -e "s/\(0=.*\)/\1 ($FEDORA_VERSION)/" < about.mappings > about.mappings.tmp
 mv about.mappings.tmp about.mappings
 popd
+%endif
 
 # Create a script that can be used to make a symlink tree of the
 # eclipse platform.
@@ -828,103 +914,144 @@ sed -e's/^\(.*\)$/\1 \1/' -e's,^,ln -s $eclipse/,' >> copy-platform
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
 cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
-install -p -D -m0755 %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
-sed --in-place "s:@SDK_VERSION@:%{version}:" \
+install -p -D -m755 %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
+sdk_version=$(basename `find $RPM_BUILD_ROOT%{_datadir}/%{name}/features \
+  -type d -name \*sdk_%{version}\*` | sed -e 's/org.eclipse.sdk_//')
+sed --in-place "s:@SDK_VERSION@:$sdk_version:" \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features 
 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features 
+chmod a+x $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
 
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
 ## BEGIN ANT ##
-ln -sf %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_*/lib/ant-antlr.jar
-ln -sf %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_*/lib/ant-apache-bcel.jar
-ln -sf %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
-ln -sf %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_*/lib/ant-apache-log4j.jar
-ln -sf %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_*/lib/ant-apache-oro.jar
-ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_*/lib/ant-apache-regexp.jar
-ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_*/lib/ant-apache-resolver.jar
-ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_*/lib/ant-commons-logging.jar
-#ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_*/lib/ant-commons-net.jar
-ln -sf %{_javadir}/ant.jar plugins/org.apache.ant_*/lib/ant.jar
-ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_*/lib
-ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_*/lib/ant-jdepend.jar
-ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_*/lib/ant-jsch.jar
-ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_*/lib/ant-junit.jar
-ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant_*/lib/ant-launcher.jar
-ln -sf %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_*/lib/ant-nodeps.jar
-ln -sf %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_*/lib/ant-swing.jar
-ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_*/lib/ant-trax.jar
-# We don't have this in FC5
-rm -f plugins/org.apache.ant_*/lib/ant-commons-net.jar
-# We used to ship these pre-built, but we're not going to do that anymore.  If
-# we can build them using free stuff, we will. -- overholt, 2005-07-04
-rm -f plugins/org.apache.ant_*/lib/ant-icontract.jar
-rm -f plugins/org.apache.ant_*/lib/ant-jai.jar
-rm -f plugins/org.apache.ant_*/lib/ant-jmf.jar
-rm -f plugins/org.apache.ant_*/lib/ant-netrexx.jar
-rm -f plugins/org.apache.ant_*/lib/ant-starteam.jar
-rm -f plugins/org.apache.ant_*/lib/ant-stylebook.jar
-rm -f plugins/org.apache.ant_*/lib/ant-vaj.jar
-rm -f plugins/org.apache.ant_*/lib/ant-weblogic.jar
-rm -f plugins/org.apache.ant_*/lib/ant-xalan1.jar
-rm -f plugins/org.apache.ant_*/lib/ant-xslp.jar
+rm plugins/org.apache.ant_*/lib/ant-antlr.jar
+rm plugins/org.apache.ant_*/lib/ant-apache-bcel.jar
+rm plugins/org.apache.ant_*/lib/ant-apache-bsf.jar
+rm plugins/org.apache.ant_*/lib/ant-apache-log4j.jar
+rm plugins/org.apache.ant_*/lib/ant-apache-oro.jar
+rm plugins/org.apache.ant_*/lib/ant-apache-regexp.jar
+rm plugins/org.apache.ant_*/lib/ant-apache-resolver.jar
+rm plugins/org.apache.ant_*/lib/ant-commons-logging.jar
+#rm plugins/org.apache.ant_*/lib/ant-commons-net.jar
+#rm plugins/org.apache.ant_*/lib/ant-icontract.jar
+#rm plugins/org.apache.ant_*/lib/ant-jai.jar
+rm plugins/org.apache.ant_*/lib/ant.jar
+rm plugins/org.apache.ant_*/lib/ant-javamail.jar
+rm plugins/org.apache.ant_*/lib/ant-jdepend.jar
+#rm plugins/org.apache.ant_*/lib/ant-jmf.jar
+rm plugins/org.apache.ant_*/lib/ant-jsch.jar
+rm plugins/org.apache.ant_*/lib/ant-junit.jar
+rm plugins/org.apache.ant_*/lib/ant-launcher.jar
+#rm plugins/org.apache.ant_*/lib/ant-netrexx.jar
+rm plugins/org.apache.ant_*/lib/ant-nodeps.jar
+#rm plugins/org.apache.ant_*/lib/ant-starteam.jar
+#rm plugins/org.apache.ant_*/lib/ant-stylebook.jar
+rm plugins/org.apache.ant_*/lib/ant-swing.jar
+rm plugins/org.apache.ant_*/lib/ant-trax.jar
+#rm plugins/org.apache.ant_*/lib/ant-vaj.jar
+#rm plugins/org.apache.ant_*/lib/ant-weblogic.jar
+#rm plugins/org.apache.ant_*/lib/ant-xalan1.jar
+#rm plugins/org.apache.ant_*/lib/ant-xslp.jar
+# FIXME use build-jar-repository
+ln -s %{_javadir}/ant/ant-antlr.jar plugins/org.apache.ant_1.6.5/lib/ant-antlr.jar
+ln -s %{_javadir}/ant/ant-apache-bcel.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-bcel.jar
+ln -s %{_javadir}/ant/ant-apache-bsf.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-bsf.jar
+ln -s %{_javadir}/ant/ant-apache-log4j.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-log4j.jar
+ln -s %{_javadir}/ant/ant-apache-oro.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-oro.jar
+ln -s %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-regexp.jar
+ln -s %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant_1.6.5/lib/ant-apache-resolver.jar
+ln -s %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant_1.6.5/lib/ant-commons-logging.jar
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
+# the symlinks that are commented out are not currently shipped on Fedora
+#ln -s %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant_1.6.5/lib/ant-commons-net.jar
+#ln -s %{_javadir}/ant/ant-icontract.jar plugins/org.apache.ant_1.6.5/lib/ant-icontract.jar
+#ln -s %{_javadir}/ant/ant-jai.jar plugins/org.apache.ant_1.6.5/lib/ant-jai.jar
+ln -s %{_javadir}/ant.jar plugins/org.apache.ant_1.6.5/lib/ant.jar
+ln -s %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_1.6.5/lib/ant-javamail.jar
+ln -s %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_1.6.5/lib/ant-jdepend.jar
+#ln -s %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_1.6.5/lib/ant-jmf.jar
+ln -s %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_1.6.5/lib/ant-jsch.jar
+ln -s %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_1.6.5/lib/ant-junit.jar
+ln -s %{_javadir}/ant-launcher.jar plugins/org.apache.ant_1.6.5/lib/ant-launcher.jar
+#ln -s %{_javadir}/ant/ant-netrexx.jar plugins/org.apache.ant_1.6.5/lib/ant-netrexx.jar
+ln -s %{_javadir}/ant/ant-nodeps.jar plugins/org.apache.ant_1.6.5/lib/ant-nodeps.jar
+#ln -s %{_javadir}/ant/ant-starteam.jar plugins/org.apache.ant_1.6.5/lib/ant-starteam.jar
+#ln -s %{_javadir}/ant/ant-stylebook.jar plugins/org.apache.ant_1.6.5/lib/ant-stylebook.jar
+ln -s %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant_1.6.5/lib/ant-swing.jar
+ln -s %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant_1.6.5/lib/ant-trax.jar
+#ln -s %{_javadir}/ant/ant-vaj.jar plugins/org.apache.ant_1.6.5/lib/ant-vaj.jar
+#ln -s %{_javadir}/ant/ant-weblogic.jar plugins/org.apache.ant_1.6.5/lib/ant-weblogic.jar
+#ln -s %{_javadir}/ant/ant-xalan1.jar plugins/org.apache.ant_1.6.5/lib/ant-xalan1.jar
+#ln -s %{_javadir}/ant/ant-xslp.jar plugins/org.apache.ant_1.6.5/lib/ant-xslp.jar
 ## END ANT ##
 # BEGIN LUCENE ##
-ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar
-ln -sf %{_datadir}/lucene/lucene-demos-1.4.3.jar plugins/org.apache.lucene_*/parser.jar
-# FIXME:  Remove this zip until we have a lucene-devel package containing it.
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=170343
-rm -f plugins/org.apache.lucene_*/lucene-1.4.3-src.zip
+rm plugins/org.apache.lucene_*/lucene-1.4.3.jar
+# FIXME:
+ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_1.4.103.v20060510a/lucene-1.4.3.jar
 # END LUCENE ##
-ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
+# FIXME
+#rm plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
+#ln -s %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
 ## BEGIN TOMCAT ##
-rm -f plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
-rm -f plugins/org.eclipse.tomcat_*/servlet.jar
-rm -f plugins/org.eclipse.tomcat_*/servlets-manager.jar
-rm -f plugins/org.eclipse.tomcat_*/naming-common.jar
-rm -f plugins/org.eclipse.tomcat_*/servlets-common.jar
-rm -f plugins/org.eclipse.tomcat_*/tomcat-http11.jar
-ln -sf %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
-ln -sf %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
-ln -sf %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar
-ln -sf %{_javadir}/commons-beanutils.jar plugins/org.eclipse.tomcat_*/commons-beanutils.jar
-ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat_*/commons-collections.jar
-ln -sf %{_javadir}/commons-dbcp.jar plugins/org.eclipse.tomcat_*/commons-dbcp.jar
-ln -sf %{_javadir}/commons-digester.jar plugins/org.eclipse.tomcat_*/commons-digester.jar
-ln -sf %{_javadir}/commons-digester-rss.jar plugins/org.eclipse.tomcat_*/commons-digester-rss.jar
-ln -sf %{_javadir}/commons-el.jar plugins/org.eclipse.tomcat_*/commons-el.jar
-ln -sf %{_javadir}/commons-fileupload.jar plugins/org.eclipse.tomcat_*/commons-fileupload.jar
-ln -sf %{_javadir}/commons-launcher.jar plugins/org.eclipse.tomcat_*/commons-launcher.jar
-ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat_*/commons-logging.jar
-ln -sf %{_javadir}/commons-logging-api.jar plugins/org.eclipse.tomcat_*/commons-logging-api.jar
-ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat_*/commons-modeler.jar
-ln -sf %{_javadir}/commons-pool.jar plugins/org.eclipse.tomcat_*/commons-pool.jar
-ln -sf %{_javadir}/jasper-compiler.jar  plugins/org.eclipse.tomcat_*/jasper-compiler.jar
-ln -sf %{_javadir}/jasper-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
-ln -sf %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat_*/jspapi.jar
-ln -sf %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/mx4j.jar
-ln -sf %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/mx4j-impl.jar
-ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/mx4j-jmx.jar
-ln -sf %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
-ln -sf %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
-ln -sf %{_javadir}/regexp-1.3.jar plugins/org.eclipse.tomcat_*/regexp-1.3.jar
-ln -sf %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat_*/servletapi5.jar
-ln -sf %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
-ln -sf %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
-ln -sf %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
-ln -sf %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat_*/tomcat-http.jar
-ln -sf %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
+#rm plugins/org.eclipse.tomcat_*/commons-beanutils.jar
+#rm plugins/org.eclipse.tomcat_*/commons-collections.jar
+#rm plugins/org.eclipse.tomcat_*/commons-digester.jar
+#rm plugins/org.eclipse.tomcat_*/commons-logging-api.jar
+#rm plugins/org.eclipse.tomcat_*/commons-modeler.jar
+#rm plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
+#rm plugins/org.eclipse.tomcat_*/servlet.jar
+#rm plugins/org.eclipse.tomcat_*/servlets-manager.jar
+#rm plugins/org.eclipse.tomcat_*/naming-common.jar
+#rm plugins/org.eclipse.tomcat_*/servlets-common.jar
+#rm plugins/org.eclipse.tomcat_*/tomcat-http11.jar
+#ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar
+#ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar
+#ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar
+#ln -s %{_javadir}/jakarta-commons-beanutils.jar plugins/org.eclipse.tomcat_*/jakarta-commons-beanutils.jar
+#ln -s %{_javadir}/jakarta-commons-collections.jar plugins/org.eclipse.tomcat_*/jakarta-commons-collections.jar
+#ln -s %{_javadir}/jakarta-commons-dbcp.jar plugins/org.eclipse.tomcat_*/jakarta-commons-dbcp.jar
+#ln -s %{_javadir}/jakarta-commons-digester.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester.jar
+#ln -s %{_javadir}/jakarta-commons-digester-rss.jar plugins/org.eclipse.tomcat_*/jakarta-commons-digester-rss.jar
+#ln -s %{_javadir}/jakarta-commons-el.jar plugins/org.eclipse.tomcat_*/jakarta-commons-el.jar
+#ln -s %{_javadir}/jakarta-commons-fileupload.jar plugins/org.eclipse.tomcat_*/jakarta-commons-fileupload.jar
+#ln -s %{_javadir}/jakarta-commons-launcher.jar plugins/org.eclipse.tomcat_*/jakarta-commons-launcher.jar
+#ln -s %{_javadir}/jakarta-commons-logging.jar plugins/org.eclipse.tomcat_*/jakarta-commons-logging.jar
+#ln -s %{_javadir}/jakarta-commons-modeler.jar plugins/org.eclipse.tomcat_*/jakarta-commons-modeler.jar
+#ln -s %{_javadir}/jakarta-commons-pool.jar plugins/org.eclipse.tomcat_*/jakarta-commons-pool.jar
+#ln -s %{_javadir}/jasper5-compiler.jar  plugins/org.eclipse.tomcat_*/jasper-compiler.jar
+#ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/jasper-runtime.jar
+#ln -s %{_javadir}/jspapi.jar plugins/org.eclipse.tomcat_*/jspapi.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 %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/naming-common.jar
+#ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/naming-factory.jar
+#ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/naming-resources.jar
+#ln -s %{_javadir}/regexp.jar plugins/org.eclipse.tomcat_*/regexp.jar
+#ln -s %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat_*/servletapi5.jar
+#ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/servlets-common.jar
+#ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar
+#ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar
+#ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar
+#ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http11.jar
+#ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar
 ## END TOMCAT ##
-ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar
+# FIXME
+rm plugins/org.junit_*/junit.jar
+ln -s %{_javadir}/junit.jar plugins/org.junit_3.8.1/junit.jar
 
 # Symlink org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar in
 # %{_datadir}/java/eclipse-ecj.jar for java-1.4.2-gcj-compat's "javac"
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
 ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar \
   $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar
+ln -s %{_datadir}/java/eclipse-ecj.jar \
+  $RPM_BUILD_ROOT%{_datadir}/java/jdtcore.jar
 
 %if %{gcj_support}
 aot-compile-rpm
+%endif
 
 # FIXME:  due to aot-compile-rpm smarts, the required resource bundles aren't
 # being compiled so this truly native ecj binary isn't possible
@@ -942,19 +1069,27 @@ aot-compile-rpm
 sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE20} > ecj
 install -m755 ecj $RPM_BUILD_ROOT%{_bindir}
 rm ecj
-#%endif
+# Remove log file(s) we don't want to ship
+pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/configuration
+rm *.log
+popd
 
+%if %{gcj_support}
+aot-compile-rpm
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
 %post ecj
+%if %{gcj_support}
 %{_bindir}/rebuild-gcj-db
+%endif
 
 %post jdt
+%if %{gcj_support}
 %{_bindir}/rebuild-gcj-db
+%endif
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
@@ -965,18 +1100,27 @@ if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
 fi
 
 %post pde
+%if %{gcj_support}
 %{_bindir}/rebuild-gcj-db
+%endif
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
 
+%post pde-runtime
+%if %{gcj_support}
+%{_bindir}/rebuild-gcj-db
+%endif
+
 %post pde-devel
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
 
 %post rcp
+%if %{gcj_support}
 %{_bindir}/rebuild-gcj-db
+%endif
 
 %post rcp-devel
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
@@ -984,6 +1128,7 @@ if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
 fi
 
 %post -n %{libname}-gtk2
+%if %{gcj_support}
 %{_bindir}/rebuild-gcj-db
 %endif
 
@@ -1030,6 +1175,11 @@ if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
 fi
 
+%postun pde-runtime
+%if %{gcj_support}
+%{_bindir}/rebuild-gcj-db
+%endif
+
 %postun pde-devel
 if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
   %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
@@ -1065,21 +1215,27 @@ if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
 fi
 
 %files ecj
+%defattr(-,root,root)
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/plugins
 %dir %{_datadir}/%{name}/features
 %dir %{_datadir}/%{name}/configuration
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.*
-%{_datadir}/java/eclipse-ecj.jar
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_*
+%{_javadir}/eclipse-ecj.jar
+%{_javadir}/jdtcore.jar
+%{_bindir}/ecj
 %if %{gcj_support}
 # Native bits
 %dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.db
-%{_bindir}/ecj
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_*
 %endif
 
 %files -n %{libname}-gtk2 -f %{libname}-gtk2.install
+%defattr(-,root,root)
+%{_datadir}/%{name}/plugins/org.eclipse.swt*
+%{_datadir}/%{name}/plugins/org.eclipse.jface_*
+%{_datadir}/%{name}/plugins/org.eclipse.jface.text_*
+%{_datadir}/%{name}/plugins/org.eclipse.jface.databinding_*
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/plugins
 %dir %{_datadir}/%{name}/features
@@ -1094,71 +1250,176 @@ fi
 %if %{gcj_support}
 # Native bits
 %dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jface_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.1.1.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jface_*
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_*
+%{_libdir}/gcj/%{name}/org.eclipse.jface.databinding_*
+%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_*
 %endif
 
-%files jdt -f %{name}-jdt.install
+%files jdt
+%defattr(-,root,root)
 %{_bindir}/efj
+%{_datadir}/%{name}/plugins/org.eclipse.jdt_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.launching_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.ui_*
+%{_datadir}/%{name}/plugins/org.junit_*
+%{_datadir}/%{name}/features/org.eclipse.jdt_*
 %if %{gcj_support}
 # Native bits
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/junitruntime.jar.db
-%{_libdir}/gcj/%{name}/junitruntime.jar.so
-%{_libdir}/gcj/%{name}/junitsupport.jar.db
-%{_libdir}/gcj/%{name}/junitsupport.jar.so
-%{_libdir}/gcj/%{name}/jdimodel.jar.db
-%{_libdir}/gcj/%{name}/jdimodel.jar.so
-%{_libdir}/gcj/%{name}/jdi.jar.db
-%{_libdir}/gcj/%{name}/jdi.jar.so
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core.manipulation_*
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_*
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_*
+%{_libdir}/gcj/%{name}/junitruntime.jar.*
+%{_libdir}/gcj/%{name}/junitsupport.jar.*
+%{_libdir}/gcj/%{name}/jdimodel.jar.*
+%{_libdir}/gcj/%{name}/jdi.jar.*
 %endif
 
 %files jdt-devel
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_3.*
-%{_datadir}/%{name}/features/org.eclipse.jdt.source_3.*
-
-%files pde -f %{name}-pde.install
+%defattr(-,root,root)
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*
+%{_datadir}/%{name}/features/org.eclipse.jdt.source_*
+
+%files pde
+%defattr(-,root,root)
+%{_datadir}/%{name}/plugins/org.eclipse.pde.build_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.runtime_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde_*
+%{_datadir}/%{name}/features/org.eclipse.pde_*
 %if %{gcj_support}
 # Native bits
-%{_libdir}/gcj/%{name}/pdebuild.jar.so
-%{_libdir}/gcj/%{name}/pdebuild.jar.db
-%{_libdir}/gcj/%{name}/pdebuild-ant.jar.so
-%{_libdir}/gcj/%{name}/pdebuild-ant.jar.db
-%{_libdir}/gcj/%{name}/pdejunit.jar.so
-%{_libdir}/gcj/%{name}/pdejunit.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.pde.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.pde.core_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.pde_3.1.0.jar.db
+%{_libdir}/gcj/%{name}/pdebuild.jar*
+%{_libdir}/gcj/%{name}/pdebuild-ant.jar*
+%{_libdir}/gcj/%{name}/org.eclipse.pde.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.pde_*
+%endif
+
+%files pde-runtime
+%defattr(-,root,root)
+%{_datadir}/%{name}/plugins/org.eclipse.pde.runtime_*
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_*
 %endif
 
 %files pde-devel
-%{_datadir}/%{name}/plugins/org.eclipse.pde.source_3.*
-%{_datadir}/%{name}/features/org.eclipse.pde.source_3.*
+%defattr(-,root,root)
+%{_datadir}/%{name}/plugins/org.eclipse.pde.source_*
+%{_datadir}/%{name}/features/org.eclipse.pde.source_*
 
 %files rcp
-%{_datadir}/%{name}/features/org.eclipse.rcp_3.*
-%{_datadir}/%{name}/plugins/org.eclipse.rcp_3.*
+%defattr(-,root,root)
+%{_datadir}/%{name}/features/org.eclipse.rcp_*
+%{_datadir}/%{name}/plugins/org.eclipse.rcp_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_*
+%if %{gcj_support}
+# Native bits
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility.auth_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_*
+%endif
 
 %files rcp-devel
-%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_3.*
+%defattr(-,root,root)
+%{_datadir}/%{name}/plugins/com.ibm.icu.source_*
+%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_*
 %{_datadir}/%{name}/plugins/org.eclipse.rcp.source.linux*
-%{_datadir}/%{name}/features/org.eclipse.rcp.source_3.*
+%{_datadir}/%{name}/features/org.eclipse.rcp.source_*
 
 %files platform -f %{name}-platform.install
+%defattr(-,root,root)
+%{_datadir}/%{name}/eclipse.ini
+%{_datadir}/%{name}/epl-v10.html
+%{_datadir}/%{name}/notice.html
+%{_datadir}/%{name}/readme
+%{_datadir}/%{name}/plugins/com.jcraft.jsch_*
+%{_datadir}/%{name}/plugins/org.apache.ant_*
+%{_datadir}/%{name}/plugins/org.apache.lucene_*
+%{_datadir}/%{name}/plugins/org.eclipse.ant.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.ant.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.compare_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.boot_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.commands_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.contenttype_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.expressions_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.filesystem.linux*
+%{_datadir}/%{name}/plugins/org.eclipse.core.jobs_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.resources_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.variables_*
+%{_datadir}/%{name}/plugins/org.eclipse.debug.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.debug.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.common_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.preferences_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.base_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.webapp_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.appserver_*
+%{_datadir}/%{name}/plugins/org.eclipse.help_*
+%{_datadir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*
+%{_datadir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
+%{_datadir}/%{name}/plugins/org.eclipse.osgi.services_*
+%{_datadir}/%{name}/plugins/org.eclipse.osgi.util_*
+%{_datadir}/%{name}/plugins/org.eclipse.osgi_*
+%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
+%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_*
+%{_datadir}/%{name}/plugins/org.eclipse.platform_*
+%{_datadir}/%{name}/plugins/org.eclipse.search_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.text_*
+%{_datadir}/%{name}/plugins/org.eclipse.tomcat_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.browser_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.console_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.externaltools_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.forms_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.ide_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.intro.universal_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.intro_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.editors_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.presentations*_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.views_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.scheduler_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.ui_*
+%{_datadir}/%{name}/plugins/com.ibm.icu_*
+%{_datadir}/%{name}/features/org.eclipse.platform_*
+%{_datadir}/%{name}/plugins/org.eclipse.swt_*
+%{_datadir}/%{name}/features/org.eclipse.sdk_*
+%{_datadir}/%{name}/plugins/org.eclipse.sdk_*
 %ifarch %{ix86} x86_64
 %{_datadir}/%{name}/about.html
 %{_datadir}/%{name}/about_files
@@ -1167,8 +1428,8 @@ fi
 %{_datadir}/%{name}/startup.jar
 %{_datadir}/%{name}/buildscripts
 %{_libdir}/%{name}/eclipse
-%{_libdir}/%{name}/libcore*
 %{_libdir}/%{name}/libupdate*
+%{_libdir}/%{name}/liblocalfile*
 # This is all from our FileInitializer extraction of .sos
 # all extracted bundles other than SWT will be in eclipse-platform.install
 %dir %{_datadir}/%{name}/configuration
@@ -1182,131 +1443,95 @@ fi
 %{_datadir}/%{name}/configuration/org.eclipse.core.runtime
 %{_datadir}/%{name}/configuration/org.eclipse.update
 %{_datadir}/%{name}/eclipse
-%{_bindir}/eclipse
+%attr(0755,root,root) %{_bindir}/eclipse
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/*/*/apps/*
 %config(noreplace) %{_sysconfdir}/eclipse.conf
 %if %{gcj_support}
 # Native bits
-%{_libdir}/gcj/%{name}/startup.jar.so
-%{_libdir}/gcj/%{name}/startup.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.commands_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.commands_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.core.variables_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.core.variables_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.help_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.help_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.help.base_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.help.base_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.help.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.help.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/jsp.jar.db
-%{_libdir}/gcj/%{name}/jsp.jar.so
-%{_libdir}/gcj/%{name}/servlets.jar.db
-%{_libdir}/gcj/%{name}/servlets.jar.so
-%{_libdir}/gcj/%{name}/webapp.jar.db
-%{_libdir}/gcj/%{name}/webapp.jar.so
-%{_libdir}/gcj/%{name}/tomcatwrapper.jar.db
-%{_libdir}/gcj/%{name}/tomcatwrapper.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.views_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/compatibility.jar.db
-%{_libdir}/gcj/%{name}/compatibility.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.update.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ant.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.compare_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/activeHelpSample.jar.db
-%{_libdir}/gcj/%{name}/activeHelpSample.jar.so
-%{_libdir}/gcj/%{name}/platform.jar.db
-%{_libdir}/gcj/%{name}/platform.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.team.core_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.team.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_3.1.0.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_3.1.0.jar.so
-%{_libdir}/gcj/%{name}/cvsssh2.jar.so
-%{_libdir}/gcj/%{name}/cvsssh2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.team.ui_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.search_3.1.2.jar.db
-%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.so
-%{_libdir}/gcj/%{name}/org.eclipse.text_3.1.1.jar.db
+%{_libdir}/gcj/%{name}/startup.jar*
+%{_libdir}/gcj/%{name}/com.jcraft.jsch_*
+%{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.commands_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.contenttype_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.filesystem_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.jobs_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_*
+%{_libdir}/gcj/%{name}/runtime_registry_compatibility.jar*
+%{_libdir}/gcj/%{name}/org.eclipse.core.variables_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.common_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.preferences_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.registry_*
+%{_libdir}/gcj/%{name}/org.eclipse.help_*
+%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_*
+%{_libdir}/gcj/%{name}/org.eclipse.help.base_*
+%{_libdir}/gcj/%{name}/org.eclipse.help.ui_*
+%{_libdir}/gcj/%{name}/servlets.jar*
+%{_libdir}/gcj/%{name}/webapp.jar*
+%{_libdir}/gcj/%{name}/tomcatwrapper.jar*
+%{_libdir}/gcj/%{name}/universal.jar*
+%{_libdir}/gcj/%{name}/org.eclipse.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.views_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_*
+%{_libdir}/gcj/%{name}/compatibility.jar*
+%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_*
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_*
+%{_libdir}/gcj/%{name}/org.eclipse.update.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_*
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_*
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_*
+%{_libdir}/gcj/%{name}/org.eclipse.compare_*
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_*
+%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_*
+%{_libdir}/gcj/%{name}/platform.jar*
+%{_libdir}/gcj/%{name}/org.eclipse.team.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.search_*
+%{_libdir}/gcj/%{name}/org.eclipse.text_*
+%{_libdir}/gcj/%{name}/com.ibm.icu_*
 %endif
 
 %files platform-devel
-%{_datadir}/%{name}/plugins/org.eclipse.platform.source_3.*
-%{_datadir}/%{name}/features/org.eclipse.platform.source_3.*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version}
+%defattr(-,root,root)
+%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
+%{_datadir}/%{name}/plugins/org.eclipse.platform.source_*
+%{_datadir}/%{name}/features/org.eclipse.platform.source_*
+%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*
 
 %changelog
+* Wed May 31 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-0jpp_0fc.3.2RC6
+- 3.2RC6.
+
+* Tue May 30 2006 Ben Konrath <bkonrath@redhat.com> 3.1.2-1jpp_15fc
+- 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.
+
 * Mon May 15 2006 Andrew Overholt <overholt@redhat.com> 3.1.2-1jpp_14fc
 - Bump mozilla requirement to match rawhide.