diff --git a/org.eclipse.wtp.releng.webupdatesite/.classpath b/org.eclipse.wtp.releng.webupdatesite/.classpath
index 64c5e31b7a264082f4c1dfdabb8097de820e66ce..2fbb7a23e121444d1c1072d73fc8f7fd50710d09 100644
--- a/org.eclipse.wtp.releng.webupdatesite/.classpath
+++ b/org.eclipse.wtp.releng.webupdatesite/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/META-INF/MANIFEST.MF b/org.eclipse.wtp.releng.webupdatesite/META-INF/MANIFEST.MF
index ec33a4aa4858ae173f7fe1a65be17ffe19cda598..6ddf07a7095f67aba129c9313916aaf6b5355161 100644
--- a/org.eclipse.wtp.releng.webupdatesite/META-INF/MANIFEST.MF
+++ b/org.eclipse.wtp.releng.webupdatesite/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Bundle-Version: 1.0.0.qualifier
Export-Package: org.eclipse.callisto.tools,
org.eclipse.callisto.tools.utils,
org.eclipse.wtp.releng.tools
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-Localization: plugin
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml
deleted file mode 100644
index bdec36bcdfa316ad253eb9001733b706ecd9a26c..0000000000000000000000000000000000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="create_run_jar" name="Create Runnable Jar for Project org.eclipse.wtp.releng.webupdatesite">
- <!--this file was created by Eclipse Runnable JAR Export Wizard-->
- <!--ANT 1.7 is required -->
- <target name="create_run_jar">
- <jar destfile="D:/builds/Workspaces/wtpPureHead/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar" filesetmanifest="mergewithoutmain">
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Main-Class" value="org.eclipse.wtp.releng.tools.CreateFeatureUpdateFile"/>
- <attribute name="Class-Path" value="."/>
- </manifest>
- <fileset dir="D:/builds/Workspaces/wtpPureHead/org.eclipse.wtp.releng.webupdatesite/bin"/>
- </jar>
- </target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
index 068fb7df6ef2089337698ba539d54dbb8c7e7975..14f42cb026d11325396b10a6dfb937b125603db8 100644
Binary files a/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar and b/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar differ
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar
index bc972b0aed4ff4084caf3aadf9e6182aa6f8aee6..c5426cb6544acb6e0c22d55ba890b4869d7305c9 100644
Binary files a/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar and b/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar differ
diff --git a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
index 95af8822dd16bd156568d3d8e0076228cf07b270..47d39074beaf1f91349ca1ca548847d450dad926 100644
--- a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
+++ b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
@@ -14,40 +14,39 @@
<file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-galileo-wtp.xml"/>
<javaElement handleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/WebContent"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-patches.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/webtools.build"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMileStone.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorAll.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/wtp.sc"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/.project"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGalileoMirrorAll.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/.project"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/removeOutOfSynch.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateTestUpdateSite.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/features-galileo-wtp.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/plugin.properties"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/features-galileo-wtp.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createP2Repo.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorPatches.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/.classpath"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/wtp.sc"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource"/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc b/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc
index 45601bdf9311fbf683010b4eb65a4e9dd6f28ea6..248ad988a7f719893b742363c5881ef1cf684016 100644
--- a/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc
+++ b/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc
@@ -10,23 +10,23 @@
</sealing>
</manifest>
<selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
- <file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-galileo-wtp.xml"/>
<javaElement handleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/WebContent"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateFinalSite.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-code.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-patches.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/webtools.build"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/webtools.build"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMileStone.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/>
@@ -35,19 +35,18 @@
<file path="/org.eclipse.wtp.releng.webupdatesite/wtp.sc"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/.project"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGalileoMirrorAll.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/build-featureFileCreate-Jar.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/removeOutOfSynch.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateTestUpdateSite.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/features-galileo-wtp.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/plugin.properties"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/features-galileo-wtp.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createP2Repo.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorPatches.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/.classpath"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/.settings"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/wtp.sc"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
@@ -59,8 +58,8 @@
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/ant.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-wtp.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build.properties"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-ganymede-wtp.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml"/>
</selectedElements>
<fatjar builder="org.eclipse.jdt.ui.plain_jar_builder" launchConfig=""/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml
index bdaf7a2ccb5d1f07f6b082863787cba96fada77e..fe5c3b8923ee262bbbb69c3b4dd1287132acbf72 100644
--- a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml
@@ -57,7 +57,7 @@
href="galileo.build#//@categories.2"/>
</features>
<features
- id="org.eclipse.wst.xml.feature"
+ id="org.eclipse.wst.xml_ui.feature"
version="1.0.2.v200809102023-6-7SBcMAAwAyIPHRNV"
repo="//@repositories.0">
<category