diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
index 23da2405036289aa0465fde854cd7141c8efa45c..0ee4bdd387f1222996d70f652a9ce261c8ae5041 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/runUpdateSiteXmlFiles.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
deleted file mode 100644
index fbc53513c131c3f9197059ad3f4511372800ba9b..0000000000000000000000000000000000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#set variables
-
-
-updateSiteFile=${1}
-updateSite=${2}
-
-source properties.shsource
-
-# save away a clean version of this site file, produced during mirroring commands,
-# with all the latest version numbers
-mv ${updateSite}/site.xml ${updateSite}/.site.xml
-
-if [ "$?" -ne "0" ]
-then
- exit $?
-fi
-
-# merge authored site.xml with the autogenerated one
-
-in_authored=${HOME}/${updateToolsDir}/WebContent/${updateSiteFile}
-# remember, this 'site.xml' is just the output of mirror command, when ran in context
-in_newFeatures=${updateSite}/.site.xml
-
-# merges newFeautes in to authored, back in original locaion
-java -jar siteFileUpdater.jar ${in_authored} ${in_newFeatures}
-
-if [ "$?" -ne "0" ]
-then
- exit $?
-fi
-
-# copy to discovery site
-# Note: here we are changing names from site specific site file name, to generic site.xml
-rsync -p ${in_authored} ${updateSite}/site.xml
-
-
-if [ "$?" -ne "0" ]
-then
- exit $?
-fi
-
-rm ${in_newFeatures}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar
deleted file mode 100644
index 7901ee0a8c78552057bcefc08a6c76cc144f003f..0000000000000000000000000000000000000000
Binary files a/org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar and /dev/null differ
diff --git a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
index 24f6f921c9d121d099bdac7655d3bc9c66d58ed7..9481d5a76319f4baa40ae43cfa5e187397e17eba 100644
--- a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
+++ b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
@@ -12,31 +12,29 @@
<selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
<javaElement handleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src"/>
<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/copyToMilestoneDirectory-code.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/removeOutOfSynch.sh"/>
<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"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/WebContent"/>
- <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/build-home/updateFinalSite.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/build-home/updateTestUpdateSite.sh"/>
<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/updateGanymedeMirrorPatches.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createP2Repo.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/.classpath"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource"/>
<folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource"/>
+ <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorAll.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/ant.sh"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorFile.sh"/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc b/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc
deleted file mode 100644
index effbf5a0cc5339e0d0269358c869baa5e377b35d..0000000000000000000000000000000000000000
--- a/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="WINDOWS-1252"?><jardesc>
- <jar path="org.eclipse.wtp.releng.webupdatesite/build-home/siteFileUpdater.jar"/>
- <options buildIfNeeded="true" compress="false" descriptionLocation="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
- <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
- <selectedProjects/>
- <manifest generateManifest="true" mainClassHandleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src<org.eclipse.callisto.tools{SiteFileUpdater.java[SiteFileUpdater" manifestLocation="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterManifest.mf" manifestVersion="1.0" reuseManifest="false" saveManifest="true" usesManifest="true">
- <sealing sealJar="false">
- <packagesToSeal/>
- <packagesToUnSeal/>
- </sealing>
- </manifest>
- <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-code.sh"/>
- <javaElement handleIdentifier="=org.eclipse.wtp.releng.webupdatesite/src"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterDescription.jardesc"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/.cvsignore"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/removeOutOfSynch.sh"/>
- <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"/>
- <folder path="/org.eclipse.wtp.releng.webupdatesite/WebContent"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateTestUpdateSite.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.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/webtools.build"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/instructions.txt"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorPatches.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createP2Repo.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/.classpath"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToFinalUpdateSite-siteFiles.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorSite.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar"/>
- <folder path="/org.eclipse.wtp.releng.webupdatesite/.settings"/>
- <folder path="/org.eclipse.wtp.releng.webupdatesite/META-INF"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGanymedeMirrorAll.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/ant.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/createMirrorFile.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllProjects.sh"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterManifest.mf"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/.project"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/wtp.sc"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateGalileoMirrorAll.xml"/>
- <file path="/org.eclipse.wtp.releng.webupdatesite/build.properties"/>
- </selectedElements>
-</jardesc>
\ No newline at end of file
diff --git a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/CreateFeatureUpdateFile.java b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/CreateFeatureUpdateFile.java
index 8f4c815b2ed78d1680ed99b41d2c2715d1ffb829..3b31793b0b9277879179f625877b4c502a47a407 100644
--- a/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/CreateFeatureUpdateFile.java
+++ b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/CreateFeatureUpdateFile.java
@@ -106,7 +106,7 @@ public class CreateFeatureUpdateFile {
}
else if ("Helios".equals(stream)) {
String scfilename = rawUpdateSite + "webtools.build";
- System.out.println("Creating short List for Galileo site");
+ System.out.println("Creating short List for Helios site");
System.out.println(" filename: " + scfilename);
doListForHelios(featuresDirectories, shortListOfInterest, scfilename);
}
@@ -227,7 +227,7 @@ public class CreateFeatureUpdateFile {
}
private void doListForHelios(String[] featureDirectories, String[] featureOfFocus, String filename) throws IOException {
- String galeleoTemplateFile = "heolios.webtools.build.xml";
+ String galeleoTemplateFile = "helios.webtools.build.xml";
createBuildFile(featureDirectories, featureOfFocus, filename, galeleoTemplateFile);
}