prep for update site
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 0e2a0f4..8f4c815 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
@@ -1,6 +1,7 @@
 package org.eclipse.wtp.releng.tools;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -24,17 +25,41 @@
 
 	final private static String FEATURES_PROPERTY = "featuresLocation";
 	final private static String EOL = System.getProperty("line.separator");
-	final private static String PATH_SEPARATOR=System.getProperty("file.separator");
+	final private static String PATH_SEPARATOR = System.getProperty("file.separator");
 
 	private String rawUpdateSite;
 	private int returnCode;
 	private String featuresDirectoryLocation;
 	private FullJarNameParser fullJarNameParser = new FullJarNameParser();
 
-//	private String[] featuresOfInterest = new String[]{"org.eclipse.wst", "org.eclipse.jst", "org.eclipse.jpt.feature", "org.eclipse.jpt.eclipselink.feature", "org.eclipse.wst.xml_ui.feature", "org.eclipse.wst.jsdt.feature", "org.eclipse.wst.common_ui.feature", "org.eclipse.jst.webpageeditor.feature", "org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature", "org.eclipse.jst.ws.axis2tools.feature", "org.eclipse.wst.xsl.feature", "org.eclipse.jst.ws.cxf.feature", "org.eclipse.wst.sdk", "org.eclipse.jst.sdk", "org.eclipse.jpt_sdk.feature", "org.eclipse.jpt.eclipselink_sdk.feature", "org.eclipse.wst.xml_sdk.feature", "org.eclipse.wst.jsdt_sdk.feature", "org.eclipse.wst.common_sdk.feature", "org.eclipse.jst.webpageeditor_sdk.feature", "org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature", "org.eclipse.jst.ws.axis2tools_sdk.feature", "org.eclipse.wst.xsl_sdk.feature",  "org.eclipse.jst.ws.cxf_sdk.feature",};
+// private String[] featuresOfInterest = new String[]{"org.eclipse.wst",
+	// "org.eclipse.jst", "org.eclipse.jpt.feature",
+	// "org.eclipse.jpt.eclipselink.feature",
+	// "org.eclipse.wst.xml_ui.feature", "org.eclipse.wst.jsdt.feature",
+	// "org.eclipse.wst.common_ui.feature",
+	// "org.eclipse.jst.webpageeditor.feature",
+	// "org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature",
+	// "org.eclipse.jst.ws.axis2tools.feature", "org.eclipse.wst.xsl.feature",
+	// "org.eclipse.jst.ws.cxf.feature", "org.eclipse.wst.sdk",
+	// "org.eclipse.jst.sdk", "org.eclipse.jpt_sdk.feature",
+	// "org.eclipse.jpt.eclipselink_sdk.feature",
+	// "org.eclipse.wst.xml_sdk.feature", "org.eclipse.wst.jsdt_sdk.feature",
+	// "org.eclipse.wst.common_sdk.feature",
+	// "org.eclipse.jst.webpageeditor_sdk.feature",
+	// "org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature",
+	// "org.eclipse.jst.ws.axis2tools_sdk.feature",
+	// "org.eclipse.wst.xsl_sdk.feature",
+	// "org.eclipse.jst.ws.cxf_sdk.feature",};
 
-//	private String[] shortListOfInterest = new String[]{"org.eclipse.wst", "org.eclipse.jst", "org.eclipse.jpt.feature", "org.eclipse.jpt.eclipselink.feature", "org.eclipse.wst.xml_ui.feature", "org.eclipse.wst.jsdt.feature", "org.eclipse.wst.common_ui.feature", "org.eclipse.jst.webpageeditor.feature", "org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature", "org.eclipse.jst.ws.axis2tools.feature",};
-	private String[] featuresOfInterest = new String[]{"org.eclipse.jpt.feature", "org.eclipse.jpt.eclipselink.feature", "org.eclipse.wst.xml_ui.feature", "org.eclipse.wst.jsdt.feature", "org.eclipse.wst.common_ui.feature", "org.eclipse.jst.webpageeditor.feature", "org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature", "org.eclipse.jst.ws.axis2tools.feature", "org.eclipse.wst.xsl.feature", "org.eclipse.jst.ws.cxf.feature", "org.eclipse.jpt_sdk.feature", "org.eclipse.jpt.eclipselink_sdk.feature", "org.eclipse.wst.xml_sdk.feature", "org.eclipse.wst.jsdt_sdk.feature", "org.eclipse.wst.common_sdk.feature", "org.eclipse.jst.webpageeditor_sdk.feature", "org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature", "org.eclipse.jst.ws.axis2tools_sdk.feature", "org.eclipse.wst.xsl_sdk.feature",  "org.eclipse.jst.ws.cxf_sdk.feature",};
+// private String[] shortListOfInterest = new String[]{"org.eclipse.wst",
+	// "org.eclipse.jst", "org.eclipse.jpt.feature",
+	// "org.eclipse.jpt.eclipselink.feature",
+	// "org.eclipse.wst.xml_ui.feature", "org.eclipse.wst.jsdt.feature",
+	// "org.eclipse.wst.common_ui.feature",
+	// "org.eclipse.jst.webpageeditor.feature",
+	// "org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature",
+	// "org.eclipse.jst.ws.axis2tools.feature",};
+	private String[] featuresOfInterest = new String[]{"org.eclipse.jpt.feature", "org.eclipse.jpt.eclipselink.feature", "org.eclipse.wst.xml_ui.feature", "org.eclipse.wst.jsdt.feature", "org.eclipse.wst.common_ui.feature", "org.eclipse.jst.webpageeditor.feature", "org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature", "org.eclipse.jst.ws.axis2tools.feature", "org.eclipse.wst.xsl.feature", "org.eclipse.jst.ws.cxf.feature", "org.eclipse.jpt_sdk.feature", "org.eclipse.jpt.eclipselink_sdk.feature", "org.eclipse.wst.xml_sdk.feature", "org.eclipse.wst.jsdt_sdk.feature", "org.eclipse.wst.common_sdk.feature", "org.eclipse.jst.webpageeditor_sdk.feature", "org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature", "org.eclipse.jst.ws.axis2tools_sdk.feature", "org.eclipse.wst.xsl_sdk.feature", "org.eclipse.jst.ws.cxf_sdk.feature",};
 
 	private String[] shortListOfInterest = new String[]{"org.eclipse.jpt.feature", "org.eclipse.jpt.eclipselink.feature", "org.eclipse.wst.xml_ui.feature", "org.eclipse.wst.jsdt.feature", "org.eclipse.wst.common_ui.feature", "org.eclipse.jst.webpageeditor.feature", "org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature", "org.eclipse.jst.ws.axis2tools.feature",};
 
@@ -74,17 +99,17 @@
 			}
 			else {
 				if ("Galileo".equals(stream)) {
-//					String filename = "features-galileo-wtp.xml";
-//					System.out.println("Creating full List for main WTP site");
-//					System.out.println("   filename: " + filename);
-//					doList(featuresDirectories, featuresOfInterest, filename);
-//					System.out.println();
-
 					String scfilename = rawUpdateSite + "webtools.build";
 					System.out.println("Creating short List for Galileo site");
 					System.out.println("   filename: " + scfilename);
 					doListForGalileo(featuresDirectories, shortListOfInterest, scfilename);
 				}
+				else if ("Helios".equals(stream)) {
+					String scfilename = rawUpdateSite + "webtools.build";
+					System.out.println("Creating short List for Galileo site");
+					System.out.println("   filename: " + scfilename);
+					doListForHelios(featuresDirectories, shortListOfInterest, scfilename);
+				}
 				else if ("Ganymede".equals(stream)) {
 					String filename = "features-ganymede-wtp.xml";
 					System.out.println("Creating full List for main WTP site");
@@ -196,9 +221,19 @@
 
 	private void doListForGalileo(String[] featureDirectories, String[] featureOfFocus, String filename) throws IOException {
 
-		String galeleoTemplateFile = "webtools.build.xml";
+		String galeleoTemplateFile = "galileo.webtools.build.xml";
+		createBuildFile(featureDirectories, featureOfFocus, filename, galeleoTemplateFile);
+
+	}
+	private void doListForHelios(String[] featureDirectories, String[] featureOfFocus, String filename) throws IOException {
+
+		String galeleoTemplateFile = "heolios.webtools.build.xml";
+		createBuildFile(featureDirectories, featureOfFocus, filename, galeleoTemplateFile);
+
+	}
+	private void createBuildFile(String[] featureDirectories, String[] featureOfFocus, String filename, String templateFile) throws IOException, FileNotFoundException {
 		FileOutputStream outfile = null;
-		Document templateDom = getTemplateDOM(galeleoTemplateFile);
+		Document templateDom = getTemplateDOM(templateFile);
 
 		try {
 
@@ -208,14 +243,13 @@
 			CommonXML.serialize(newDOM, outfile);
 
 			System.out.println("\tOutput to: " + filename); //$NON-NLS-1$
-			
+
 		}
 		finally {
 			if (outfile != null) {
 				outfile.close();
 			}
 		}
-
 	}
 
 	private Document substitureLatestVersions(String[] featureDirectories, String[] featureOfFocus, Document startingDOM) throws IOException {
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/galileo.webtools.build.xml
similarity index 98%
copy from org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml
copy to org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/galileo.webtools.build.xml
index f87d2de..d23872d 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/galileo.webtools.build.xml
@@ -55,5 +55,5 @@
   <features id="org.eclipse.jst.web_ui.feature" version="3.1.0.v200901280155-7E77FBbDlwX1_9Sf52hz09dkjz01" repo="//@repositories.0">
     <category href="galileo.build#//@categories.2"/>
   </features>
-  <repositories location="http://download.eclipse.org/webtools/milestones/" label="Web Tools 3.1 RC4 milestone updates"/>
+  <repositories location="http://download.eclipse.org/webtools/maintenance/" label="Web Tools 3.1.1 maintenance updates"/>
 </build:Contribution>
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/helios.webtools.build.xml
similarity index 98%
rename from org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/webtools.build.xml
rename to org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/helios.webtools.build.xml
index f87d2de..f413632 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/helios.webtools.build.xml
@@ -55,5 +55,5 @@
   <features id="org.eclipse.jst.web_ui.feature" version="3.1.0.v200901280155-7E77FBbDlwX1_9Sf52hz09dkjz01" repo="//@repositories.0">
     <category href="galileo.build#//@categories.2"/>
   </features>
-  <repositories location="http://download.eclipse.org/webtools/milestones/" label="Web Tools 3.1 RC4 milestone updates"/>
+  <repositories location="http://download.eclipse.org/webtools/milestones/" label="Web Tools 3.2 M1 milestone updates"/>
 </build:Contribution>