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 0e2a0f43e2c5cc414341300417cb19bb47ec9d77..8f4c815b2ed78d1680ed99b41d2c2715d1ffb829 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 @@ public class CreateFeatureUpdateFile {
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[] 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[] 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.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 @@ public class CreateFeatureUpdateFile {
}
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 @@ public class CreateFeatureUpdateFile {
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 @@ public class CreateFeatureUpdateFile {
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/galileo.webtools.build.xml b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/galileo.webtools.build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d23872d636b8d0d2eec87895a164f919cee0304d
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/src/org/eclipse/wtp/releng/tools/galileo.webtools.build.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<build:Contribution xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:build="http://www.eclipse.org/amalgam/2008/build" label="WebTools">
+ <contacts name="David Williams" email="david_williams@us.ibm.com"/>
+ <features id="org.eclipse.wst.web_ui.feature" version="3.1.0.v200905242131-7R77FShEVw2xUGpF1LiNxdVAEK_p" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jst.enterprise_ui.feature" version="3.1.0.v200905242144-7_7EGr_FQRwRZSME08aqRiT1Skap" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jpt.feature" version="2.2.0.v200905310000-7L7OAFFBBoPR9QNdMUt_f" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jst.ws.axis2tools.feature" version="1.1.0.v200905242110-78-FBpDZRDE6FdPdLYYe" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jpt.eclipselink.feature" version="2.2.0.v200905310000-65A7AkF77g7SGH7997" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jst.webpageeditor.feature" version="2.2.0.v20090310-4339oB55W5K6F" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" version="2.2.0.v20090517-20-7w311A1636" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.wst.xml_ui.feature" version="3.1.0.v200905240756-7H6FMVDxtkM-5OgPGKK4xQocS5AL" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ <category href="galileo.build#//@categories.1"/>
+ </features>
+ <features id="org.eclipse.wst.jsdt.feature" version="1.1.1.v200906020459-77-FGBCcNBC-BeMcEeOm" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ <category href="galileo.build#//@categories.1"/>
+ </features>
+ <features id="org.eclipse.wtp.capabilities" version="1.0.0.v200905221827-5--AkF77g7V7ZFJ77" repo="//@repositories.0"/>
+ <features id="org.eclipse.wst.common.fproj" version="3.1.0.v200906080522-377-8s733L3F3J3DAB" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.wst.server_adapters.feature" version="3.1.0.v200906020451-51DFAkF77g7GCNc" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.wst.xsl.feature" version="1.0.0.v200905242203-7R7T7IFIhIehWfz064pz0YX1" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jst.common.fproj.enablement.jdt" version="3.1.0.v200905220328-377-8s733L3F3J3D33" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jst.server_ui.feature" version="3.1.0.v20080930-7A2FB_9xFaFovXGKcCTNM2355" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jst.server_adapters.feature" version="3.1.0.v20090311c-20-7w311A1422c" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <features id="org.eclipse.jst.server_adapters.ext.feature" version="3.1.0.v20090311b-777HFDNCcNBBz-BcKW6EGF" repo="//@repositories.0">
+ <category href="galileo.build#//@categories.2"/>
+ </features>
+ <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/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 f87d2defffef6daff779291b1350d87e80975cd8..f413632a1feff4f763e0d9d787ab93dcbb29d2f9 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>