From fe13189419d030046585a7210f3e541c90951a78 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Fri, 14 Aug 2009 02:09:55 +0000
Subject: [PATCH] prep for update site
---
.../build-home/featureFileCreate.jar | Bin 424425 -> 425573 bytes
.../featureFileUpdaterDescription.jardesc | 2 +-
.../siteFileUpdaterManifest.mf | 3 -
.../releng/tools/CreateFeatureUpdateFile.java | 130 +++++++++++-------
.../webtools.build | 59 --------
org.eclipse.wtp.releng.webupdatesite/wtp.sc | 52 -------
6 files changed, 81 insertions(+), 165 deletions(-)
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterManifest.mf
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/webtools.build
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/wtp.sc
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/featureFileCreate.jar
index 0ee4bdd387f1222996d70f652a9ce261c8ae5041..453c293a5b8c2df21e2d57ce15640bbd04337ca6 100644
GIT binary patch
delta 10920
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
delta 9501
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
P5d+t#d1_sqob>(+I_x#2
diff --git a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
index 9481d5a76..09cc54c53 100644
--- a/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
+++ b/org.eclipse.wtp.releng.webupdatesite/featureFileUpdaterDescription.jardesc
@@ -33,8 +33,8 @@
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml"/>
<file path="/org.eclipse.wtp.releng.webupdatesite/build-home/copyToMilestoneDirectory-SiteFiles.sh"/>
<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/properties.shsource"/>
<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/siteFileUpdaterManifest.mf b/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterManifest.mf
deleted file mode 100644
index f78d55238..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/siteFileUpdaterManifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: org.eclipse.callisto.tools.SiteFileUpdater
-
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 3b31793b0..26a8f0d78 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
@@ -28,57 +28,36 @@ public class CreateFeatureUpdateFile {
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[] 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",};
public static void main(String[] args) {
+ int returnCode = 0;
if (args.length != 2) {
System.out.println(" Error: Program needs stream and rawUpdateSite");
}
else {
try {
- new CreateFeatureUpdateFile().createFeatureFiles(args);
+ returnCode = new CreateFeatureUpdateFile().createFeatureFiles(args);
}
catch (IOException e) {
e.printStackTrace();
}
+ catch (SAXException e) {
+ e.printStackTrace();
+ }
}
+ System.exit(returnCode);
}
- private void createFeatureFiles(String[] args) throws IOException {
+ private int createFeatureFiles(String[] args) throws IOException, SAXException {
+ int returnCode = 0;
String stream = args[0].trim();
rawUpdateSite = args[1].trim();
if (!rawUpdateSite.endsWith(PATH_SEPARATOR)) {
@@ -98,17 +77,28 @@ public class CreateFeatureUpdateFile {
returnCode = 9;
}
else {
+ Map currentFeatureVersions = getCurrentFeatures(featuresDirectories);
if ("Galileo".equals(stream)) {
String scfilename = rawUpdateSite + "webtools.build";
System.out.println("Creating short List for Galileo site");
System.out.println(" filename: " + scfilename);
- doListForGalileo(featuresDirectories, shortListOfInterest, scfilename);
+ doListForGalileo(currentFeatureVersions, shortListOfInterest, scfilename);
+ // update site.xml, incase some features are "new".
+ // this is just needed for now, as long as we use site.xml
+ // to define categories
+ String sitexmlFileName = rawUpdateSite + "site.xml";
+ updateSiteXml(currentFeatureVersions, sitexmlFileName);
}
else if ("Helios".equals(stream)) {
String scfilename = rawUpdateSite + "webtools.build";
System.out.println("Creating short List for Helios site");
System.out.println(" filename: " + scfilename);
- doListForHelios(featuresDirectories, shortListOfInterest, scfilename);
+ doListForHelios(currentFeatureVersions, shortListOfInterest, scfilename);
+ // update site.xml, incase some features are "new".
+ // this is just needed for now, as long as we use site.xml
+ // to define categories
+ String sitexmlFileName = rawUpdateSite + "site.xml";
+ updateSiteXml(currentFeatureVersions, sitexmlFileName);
}
else if ("Ganymede".equals(stream)) {
String filename = "features-ganymede-wtp.xml";
@@ -148,9 +138,32 @@ public class CreateFeatureUpdateFile {
}
}
}
- System.exit(returnCode);
+ return returnCode;
}
+ private void updateSiteXml(Map currentFeatureVersions, String sitexmlFileName) throws IOException, SAXException {
+ FileOutputStream outfile = null;
+ Document siteDOM = getSiteDOM(sitexmlFileName);
+
+ try {
+
+ Document newDOM = updateFeatureDOM(siteDOM, currentFeatureVersions);
+
+ // we'll write over what we read it
+ outfile = new FileOutputStream(sitexmlFileName);
+ CommonXML.serialize(newDOM, outfile);
+
+ System.out.println("\tSite.xml output to: " + sitexmlFileName); //$NON-NLS-1$
+
+ }
+ finally {
+ if (outfile != null) {
+ outfile.close();
+ }
+ }
+ }
+
+
private void doList(String[] featureDirectories, String[] featureOfFocus, String filename) throws IOException {
File outFile = new File(filename);
Writer output = new FileWriter(outFile);
@@ -219,25 +232,28 @@ public class CreateFeatureUpdateFile {
}
- private void doListForGalileo(String[] featureDirectories, String[] featureOfFocus, String filename) throws IOException {
+ private void doListForGalileo(Map currentFeatureVersions, String[] featureOfFocus, String filename) throws IOException {
String galeleoTemplateFile = "galileo.webtools.build.xml";
- createBuildFile(featureDirectories, featureOfFocus, filename, galeleoTemplateFile);
+ createBuildFile(currentFeatureVersions, filename, galeleoTemplateFile);
}
- private void doListForHelios(String[] featureDirectories, String[] featureOfFocus, String filename) throws IOException {
+
+ private void doListForHelios(Map currentFeatureVersions, String[] featureOfFocus, String filename) throws IOException {
String galeleoTemplateFile = "helios.webtools.build.xml";
- createBuildFile(featureDirectories, featureOfFocus, filename, galeleoTemplateFile);
+ createBuildFile(currentFeatureVersions, filename, galeleoTemplateFile);
}
- private void createBuildFile(String[] featureDirectories, String[] featureOfFocus, String filename, String templateFile) throws IOException, FileNotFoundException {
+
+ private void createBuildFile(Map currentFeatureVersions, String filename, String templateFile) throws IOException, FileNotFoundException {
FileOutputStream outfile = null;
Document templateDom = getTemplateDOM(templateFile);
try {
- Document newDOM = substitureLatestVersions(featureDirectories, featureOfFocus, templateDom);
+ Document newDOM = updateFeatureDOM(templateDom, currentFeatureVersions);
+
outfile = new FileOutputStream(filename);
CommonXML.serialize(newDOM, outfile);
@@ -252,17 +268,7 @@ public class CreateFeatureUpdateFile {
}
}
- private Document substitureLatestVersions(String[] featureDirectories, String[] featureOfFocus, Document startingDOM) throws IOException {
-
- Map currentFeatureVersions = new HashMap();
- for (int i = 0; i < featureDirectories.length; i++) {
- String directoryName = featureDirectories[i];
- fullJarNameParser.parse(directoryName);
- String projectName = fullJarNameParser.getProjectString();
- String versionString = fullJarNameParser.getVersionString();
- currentFeatureVersions.put(projectName, versionString);
- }
-
+ private Document updateFeatureDOM(Document startingDOM, Map currentFeatureVersions) {
NodeList features = startingDOM.getElementsByTagName("features");
for (int i = 0; i < features.getLength(); i++) {
@@ -280,6 +286,18 @@ public class CreateFeatureUpdateFile {
return startingDOM;
}
+ private Map getCurrentFeatures(String[] featureDirectories) {
+ Map currentFeatureVersions = new HashMap();
+ for (int i = 0; i < featureDirectories.length; i++) {
+ String directoryName = featureDirectories[i];
+ fullJarNameParser.parse(directoryName);
+ String projectName = fullJarNameParser.getProjectString();
+ String versionString = fullJarNameParser.getVersionString();
+ currentFeatureVersions.put(projectName, versionString);
+ }
+ return currentFeatureVersions;
+ }
+
private Document getTemplateDOM(String templateFileName) throws IOException {
@@ -302,4 +320,16 @@ public class CreateFeatureUpdateFile {
return templateDom;
}
+
+ private Document getSiteDOM(String siteFileName) throws IOException, SAXException {
+
+
+ File siteFile = new File(siteFileName);
+
+ DocumentBuilder documentBuilder = CommonXML.getDocumentBuilder();
+ Document templateDom = null;
+ templateDom = documentBuilder.parse(siteFile);
+ return templateDom;
+
+ }
}
diff --git a/org.eclipse.wtp.releng.webupdatesite/webtools.build b/org.eclipse.wtp.releng.webupdatesite/webtools.build
deleted file mode 100644
index 226ed8f52..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/webtools.build
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<build:Contribution xmlns:build="http://www.eclipse.org/amalgam/2008/build" xmlns:xmi="http://www.omg.org/XMI" label="WebTools" xmi:version="2.0">
- <contacts email="david_williams@us.ibm.com" name="David Williams"/>
- <features id="org.eclipse.wst.web_ui.feature" repo="//@repositories.0" version="3.1.0.v200905242131-7R77FSlEVw2xWKwEsJnUxocrDEY1">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jst.enterprise_ui.feature" repo="//@repositories.0" version="3.1.0.v200905242144-7_7EGraFQRwRZSMN-6Z-NeR7Thco">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jpt.feature" repo="//@repositories.0" version="2.2.0.v200906100220-7L7OAFFBBoPR9QNdMUt_f">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jst.ws.axis2tools.feature" repo="//@repositories.0" version="1.1.0.v200905242110-78-FBpDZRDE6FdPdLYYe">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jpt.eclipselink.feature" repo="//@repositories.0" version="2.2.0.v200905310000-65A7AkF77g7SGH7997">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jst.webpageeditor.feature" repo="//@repositories.0" version="2.2.0.v20090310-4339oB55W5K6F">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" repo="//@repositories.0" version="2.2.0.v20090517-20-7w311A1636">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.wst.xml_ui.feature" repo="//@repositories.0" version="3.1.1.v200907161031-7H6FMXDxtkM-5RhLELH3z0Rvb_PW">
- <category href="galileo.build#//@categories.2"/>
- <category href="galileo.build#//@categories.1"/>
- </features>
- <features id="org.eclipse.wst.jsdt.feature" repo="//@repositories.0" version="1.1.1.v200906091427-77-FGCCcNBC-BgLiEWQn">
- <category href="galileo.build#//@categories.2"/>
- <category href="galileo.build#//@categories.1"/>
- </features>
- <features id="org.eclipse.wtp.capabilities" repo="//@repositories.0" version="1.0.0.v200905221827-5--AkF77g7V7ZFJ77"/>
- <features id="org.eclipse.wst.common.fproj" repo="//@repositories.0" version="3.1.0.v200906241252-377-8s733L3H355J8A">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.wst.server_adapters.feature" repo="//@repositories.0" version="3.1.0.v200906020451-51DFAkF77g7GCNc">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.wst.xsl.feature" repo="//@repositories.0" version="1.0.0.v200905242203-7R7T8rFIhIehWg35Bsn_c1">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jst.common.fproj.enablement.jdt" repo="//@repositories.0" version="3.1.0.v200906241252-377-8s733L3G58469C">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jst.server_ui.feature" repo="//@repositories.0" version="3.1.0.v20080930-7A2FB_9xFaFovXGKcCTNM2355">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jst.server_adapters.feature" repo="//@repositories.0" version="3.1.0.v20090311c-20-7w311A1422c">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jst.server_adapters.ext.feature" repo="//@repositories.0" version="3.1.0.v20090311b-777HFDNCcNBBz-BcKW6EGF">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <features id="org.eclipse.jst.web_ui.feature" repo="//@repositories.0" version="3.1.0.v200901280155-7E77FBcDlwYa_9Vfy1i58cp-7Zfg">
- <category href="galileo.build#//@categories.2"/>
- </features>
- <repositories label="Web Tools 3.1.1 maintenance" location="http://download.eclipse.org/webtools/maintenance/"/>
-</build:Contribution>
diff --git a/org.eclipse.wtp.releng.webupdatesite/wtp.sc b/org.eclipse.wtp.releng.webupdatesite/wtp.sc
deleted file mode 100644
index 8ccfb4dfc..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/wtp.sc
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<sc:siteContribution
- xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
- xmlns:sc="http://www.eclipse.org/buckminster/SiteContribution-1.0"
- updateSite="${downloads}/webtools/tempTestUpdates/site.xml"
- projectId="wtp">
- <sc:member
- name="David Williams"
- email="david_williams@us.ibm.com" />
- <sc:cspec
- name="org.eclipse.wtp-sc">
- <dependencies>
- </dependencies>
- <groups>
- <public
- name="Web and Java EE Development">
- <attribute
- component="org.eclipse.wst.xml_ui.feature" />
- <attribute
- component="org.eclipse.wst.jsdt.feature" />
- <attribute
- component="org.eclipse.wst" />
- <attribute
- component="org.eclipse.jst" />
- <attribute
- component="org.eclipse.jpt.feature" />
- <attribute
- component="org.eclipse.jpt.eclipselink.feature" />
- <attribute
- component="org.eclipse.jst.webpageeditor.feature" />
- <attribute
- component="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature" />
- <attribute
- component="org.eclipse.jst.ws.axis2tools.feature" />
- </public>
- <public
- name="Enabling Features">
- <attribute
- component="org.eclipse.wst.common_ui.feature" />
- </public>
- <public
- name="Java Development">
- <attribute
- component="org.eclipse.jpt.feature" />
- <attribute
- component="org.eclipse.jpt.eclipselink.feature" />
- <attribute
- component="org.eclipse.jst" />
- </public>
- </groups>
- </sc:cspec>
-</sc:siteContribution>
\ No newline at end of file
--
GitLab