From ed5201c89a5ebdd6457485034803b1c3c2eeb1bf Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 27 May 2007 05:48:38 +0000
Subject: [PATCH] small improvements
---
.../.classpath | 2 -
org.eclipse.wtp.releng.webupdatesite/.project | 35 +-
org.eclipse.wtp.releng.webupdatesite/.runtime | 2 -
.../WebContent/siteCallisto.xml | 312 +++---------------
.../WebContent/siteEnablingFeatures.xml | 32 --
.../WebContent/siteWTPCallisto.xml | 156 ---------
.../build-home/callisto-features-jem.xml | 21 --
.../build-home/callisto-features-jpa.xml | 28 --
.../build-home/callisto-features-jsf.xml | 29 --
.../build-home/callisto-features-wtp.xml | 54 ---
.../build-home/createDigests.xml | 6 +-
.../build-home/createPack200s.xml | 6 +-
.../build-home/eclipseLocation.shsource | 1 -
.../build-home/features-callisto-jem.xml | 33 ++
.../build-home/features-callisto-jpa.xml | 33 ++
.../build-home/features-callisto-jsf.xml | 36 ++
.../build-home/features-callisto-wtp.xml | 86 +++++
...atures-wtp.xml => features-europa-wtp.xml} | 6 +-
.../build-home/generateMirrorTags.jar | Bin 30138 -> 0 bytes
.../build-home/getWTPUpdateToolsFromCVS.sh | 2 +
.../build-home/mirrorMilestones.xml | 30 --
.../build-home/properties.shsource | 7 +
.../build-home/runCreateDigests.sh | 4 +-
.../build-home/runCreatePack200s.sh | 4 +-
.../runUpdateAllCallistoProjects.sh | 19 +-
.../build-home/runUpdateAllEuropaProjects.sh | 16 +-
.../build-home/runUpdateProjects.sh | 23 --
.../build-home/runUpdateSiteXmlFile.sh | 20 --
.../build-home/runUpdateSiteXmlFiles.sh | 18 +-
.../build-home/updateCallistoMirrorAll.xml | 28 +-
.../build-home/updateEuropaMirrorAll.xml | 22 +-
.../build-home/updateMirrorProject.xml | 104 +++---
.../testmail.xml | 16 -
33 files changed, 380 insertions(+), 811 deletions(-)
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/.runtime
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/WebContent/siteEnablingFeatures.xml
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jem.xml
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jpa.xml
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jsf.xml
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource
create mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml
create mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml
create mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml
create mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml
rename org.eclipse.wtp.releng.webupdatesite/build-home/{features-wtp.xml => features-europa-wtp.xml} (94%)
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/generateMirrorTags.jar
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/mirrorMilestones.xml
create mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateProjects.sh
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh
delete mode 100644 org.eclipse.wtp.releng.webupdatesite/testmail.xml
diff --git a/org.eclipse.wtp.releng.webupdatesite/.classpath b/org.eclipse.wtp.releng.webupdatesite/.classpath
index 0e80cf2bc..7cec603db 100644
--- a/org.eclipse.wtp.releng.webupdatesite/.classpath
+++ b/org.eclipse.wtp.releng.webupdatesite/.classpath
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="var" path="JRE_LIB"/>
- <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.0"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.wtp.releng.webupdatesite/.project b/org.eclipse.wtp.releng.webupdatesite/.project
index 91fbde6fc..95088cfb2 100644
--- a/org.eclipse.wtp.releng.webupdatesite/.project
+++ b/org.eclipse.wtp.releng.webupdatesite/.project
@@ -1,24 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.wtp.releng.webupdatesite</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- </natures>
+ <name>org.eclipse.wtp.releng.webupdatesite</name>
+ <comment></comment>
+ <projects></projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments></arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>
+ org.eclipse.wst.common.project.facet.core.nature
+ </nature>
+ </natures>
</projectDescription>
diff --git a/org.eclipse.wtp.releng.webupdatesite/.runtime b/org.eclipse.wtp.releng.webupdatesite/.runtime
deleted file mode 100644
index 4730d235c..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/.runtime
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<runtime runtime-id="Apache Tomcat v5.0" servers="false"/>
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteCallisto.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteCallisto.xml
index 1999000f5..f70eb649d 100644
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteCallisto.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteCallisto.xml
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<site
- pack200="true"
digestURL="http://download.eclipse.org/webtools/testUpdates/"
- mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&format=xml">
-
+ pack200="true"
+ mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&format=xml">
<description
- url="http://download.eclipse.org/webtools/declaredUpdates/index.html">
+ url="http://download.eclipse.org/webtools/testUpdates/index.html">
The update site contains the features of the of Eclipse Web
Tools Project (WTP)
</description>
@@ -13,312 +12,96 @@
<feature
- url="features/org.eclipse.wst_1.5.3.v200701251935-X3Tn7ug44nfs8AE.jar"
id="org.eclipse.wst"
- version="1.5.3.v200701251935-X3Tn7ug44nfs8AE">
+ url="features/org.eclipse.wst_1.5.4.v200704200440-X3TmzmK-W-vP-Fs.jar"
+ version="1.5.4.v200704200440-X3TmzmK-W-vP-Fs">
<category name="Web Tools Platform (WTP)" />
</feature>
<feature
- url="features/org.eclipse.jst_1.5.3.v200701251935-kW-NqztJbMj98Vy.jar"
id="org.eclipse.jst"
- version="1.5.3.v200701251935-kW-NqztJbMj98Vy">
+ url="features/org.eclipse.jst_1.5.4.v200704150219-kW-NuyxHh4-w7-n.jar"
+ version="1.5.4.v200704150219-kW-NuyxHh4-w7-n">
<category name="Web Tools Platform (WTP)" />
</feature>
<feature
- url="features/org.eclipse.wst.sdk_1.5.3.v200701251935-O2U9h5tjqRzyXdC.jar"
id="org.eclipse.wst.sdk"
- version="1.5.3.v200701251935-O2U9h5tjqRzyXdC">
+ url="features/org.eclipse.wst.sdk_1.5.4.v200704200440-O2U9jyC-ZDAHEgs.jar"
+ version="1.5.4.v200704200440-O2U9jyC-ZDAHEgs">
<category name="Web Tools Platform (WTP)" />
</feature>
<feature
- url="features/org.eclipse.jst.sdk_1.5.3.v200701251935-dnUTzpmRSVGy2Rb.jar"
id="org.eclipse.jst.sdk"
- version="1.5.3.v200701251935-dnUTzpmRSVGy2Rb">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst.web_core.feature.patch_1.5.2.v200611141330--08422833363552.jar"
- id="org.eclipse.jst.web_core.feature.patch"
- version="1.5.2.v200611141330--08422833363552">
- <category name="Web Tools Platform (WTP) Patches" />
- </feature>
-
-
- <feature
- url="features/org.eclipse.wst_1.5.1.v200609111500-X3TmmF3AeboB5EW.jar"
- id="org.eclipse.wst"
- version="1.5.1.v200609111500-X3TmmF3AeboB5EW">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst_1.5.1.v200609111510-kW-O_zxPud7GuJG.jar"
- id="org.eclipse.jst"
- version="1.5.1.v200609111510-kW-O_zxPud7GuJG">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- url="features/org.eclipse.wst.sdk_1.5.1.v200609111510-53LhU5L4LmuQyht.jar"
- id="org.eclipse.wst.sdk"
- version="1.5.1.v200609111510-53LhU5L4LmuQyht">
+ url="features/org.eclipse.jst.sdk_1.5.4.v200704150219-dnUU6nyMbgExb_A.jar"
+ version="1.5.4.v200704150219-dnUU6nyMbgExb_A">
<category name="Web Tools Platform (WTP)" />
</feature>
<feature
- url="features/org.eclipse.jst.sdk_1.5.1.v200609111510-dnUVLseYZElPh32.jar"
- id="org.eclipse.jst.sdk"
- version="1.5.1.v200609111510-dnUVLseYZElPh32">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--0842282_233879.jar"
id="org.apache.commons_logging.feature"
+ url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--0842282_233879.jar"
version="1.0.4.v200606152055--0842282_233879">
<category name="Enabling Features" />
</feature>
<feature
- url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--0842282939426_.jar"
id="org.apache.jakarta_log4j.feature"
+ url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--0842282939426_.jar"
version="1.2.8.v200605300321--0842282939426_">
<category name="Enabling Features" />
</feature>
<feature
- url="features/org.apache.xerces.feature_2.8.0.v200605151647--08422828353873.jar"
id="org.apache.xerces.feature"
+ url="features/org.apache.xerces.feature_2.8.0.v200605151647--08422828353873.jar"
version="2.8.0.v200605151647--08422828353873">
<category name="Enabling Features" />
</feature>
- <feature
- url="features/org.eclipse.wst_1.5.0.v200606092300-U4T922yjOWsGK5Y.jar"
- id="org.eclipse.wst"
- version="1.5.0.v200606092300-U4T922yjOWsGK5Y">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst_1.5.0.v200606092300-kW-O_ysCRLJsxJt.jar"
- id="org.eclipse.jst"
- version="1.5.0.v200606092300-kW-O_ysCRLJsxJt">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- url="features/org.eclipse.wst.sdk_1.5.0.v200606092300-24KsYkftnYYU8Om.jar"
- id="org.eclipse.wst.sdk"
- version="1.5.0.v200606092300-24KsYkftnYYU8Om">
- <category name="Web Tools Platform (WTP)" />
- </feature>
- <feature
- url="features/org.eclipse.jst.sdk_1.5.0.v200606092300-dnUVLo09wQhiy4R.jar"
- id="org.eclipse.jst.sdk"
- version="1.5.0.v200606092300-dnUVLo09wQhiy4R">
- <category name="Web Tools Platform (WTP)" />
- </feature>
<feature
- url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--08422828353873.jar"
- id="org.apache.commons_logging.feature"
- version="1.0.4.v200606152055--08422828353873">
- <category name="Enabling Features" />
- </feature>
-
- <feature
- url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--08422828353873.jar"
- id="org.apache.jakarta_log4j.feature"
- version="1.2.8.v200605300321--08422828353873">
- <category name="Enabling Features" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst.jsf.feature_0.5.1.v20060829-OJnpNuKYI7O7SAU.jar"
id="org.eclipse.jst.jsf.feature"
+ url="features/org.eclipse.jst.jsf.feature_0.5.1.v20060829-OJnpNuKYI7O7SAU.jar"
version="0.5.1.v20060829-OJnpNuKYI7O7SAU">
<category name="Java Server Faces (JSF) -- Preview" />
</feature>
- <feature
- url="features/org.eclipse.jst.jsf_sdk.feature_0.5.1.v20060829-fX45f_dlc_3ccM8.jar"
- id="org.eclipse.jst.jsf_sdk.feature"
- version="0.5.1.v20060829-fX45f_dlc_3ccM8">
- <category name="Java Server Faces (JSF) -- Preview" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst.jsf.feature_0.5.0.v20060622-OJnpNtoWR7O7OAA.jar"
- id="org.eclipse.jst.jsf.feature"
- version="0.5.0.v20060622-OJnpNtoWR7O7OAA">
- <category name="Java Server Faces (JSF) -- Preview" />
- </feature>
<feature
- url="features/org.eclipse.jst.jsf_sdk.feature_0.5.0.v20060622-fX45f__je9W9WII.jar"
id="org.eclipse.jst.jsf_sdk.feature"
- version="0.5.0.v20060622-fX45f__je9W9WII">
+ url="features/org.eclipse.jst.jsf_sdk.feature_0.5.1.v20060829-fX45f_dlc_3ccM8.jar"
+ version="0.5.1.v20060829-fX45f_dlc_3ccM8">
<category name="Java Server Faces (JSF) -- Preview" />
</feature>
<feature
- url="features/org.eclipse.dali_0.5.0.v200606200001--87cMN7N7cPMMMa.jar"
id="org.eclipse.dali"
- version="0.5.0.v200606200001--87cMN7N7cPMMMa">
+ url="features/org.eclipse.dali_0.5.0.v200606270000--87cMN7N7crMMMR.jar"
+ version="0.5.0.v200606270000--87cMN7N7crMMMR">
<category name="EJB 3.0 Java Persistence (Dali JPA) -- Preview" />
</feature>
- <feature
- url="features/org.eclipse.wst_1.0.0.jar"
- id="org.eclipse.wst"
- version="1.0.0">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst_1.0.0.jar"
- id="org.eclipse.jst"
- version="1.0.0">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.wst.sdk_1.0.0.jar"
- id="org.eclipse.wst.sdk"
- version="1.0.0">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst.sdk_1.0.0.jar"
- id="org.eclipse.jst.sdk"
- version="1.0.0">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.wst_1.0.1.v200602130105.jar"
- id="org.eclipse.wst"
- version="1.0.1.v200602130105">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst_1.0.1.v200602130105.jar"
- id="org.eclipse.jst"
- version="1.0.1.v200602130105">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.wst.sdk_1.0.1.v200602130105.jar"
- id="org.eclipse.wst.sdk"
- version="1.0.1.v200602130105">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst.sdk_1.0.1.v200602130105.jar"
- id="org.eclipse.jst.sdk"
- version="1.0.1.v200602130105">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.wst_1.0.2.v200604280000.jar"
- id="org.eclipse.wst"
- version="1.0.2.v200604280000">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst_1.0.2.v200604280000.jar"
- id="org.eclipse.jst"
- version="1.0.2.v200604280000">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.wst.sdk_1.0.2.v200604280000.jar"
- id="org.eclipse.wst.sdk"
- version="1.0.2.v200604280000">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst.sdk_1.0.2.v200604280000.jar"
- id="org.eclipse.jst.sdk"
- version="1.0.2.v200604280000">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.wst_1.0.3.v200607290745.jar"
- id="org.eclipse.wst"
- version="1.0.3.v200607290745">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
<feature
- url="features/org.eclipse.jst_1.0.3.v200607290745.jar"
- id="org.eclipse.jst"
- version="1.0.3.v200607290745">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
+ id="org.eclipse.jem"
+ patch="false"
+ url="features/org.eclipse.jem_1.2.4.v200704181020--6zXJK0L0SE3a95.jar"
+ version="1.2.4.v200704181020--6zXJK0L0SE3a95">
+ <category name="Models and Model Development" />
</feature>
-
<feature
- url="features/org.eclipse.wst.sdk_1.0.3.v200607290745.jar"
- id="org.eclipse.wst.sdk"
- version="1.0.3.v200607290745">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst.sdk_1.0.3.v200607290745.jar"
- id="org.eclipse.jst.sdk"
- version="1.0.3.v200607290745">
- <category name="Web Tools Platform (WTP) 1.0.x maintenance" />
- </feature>
-
-
-
- <feature
- url="features/org.eclipse.wst_1.5.2.v200610070620-X3Tmm8_VLz2EcCH.jar"
- id="org.eclipse.wst"
- version="1.5.2.v200610070620-X3Tmm8_VLz2EcCH">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst_1.5.2.v200610070620-kW-OA1vfaZTJtXg.jar"
- id="org.eclipse.jst"
- version="1.5.2.v200610070620-kW-OA1vfaZTJtXg">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- url="features/org.eclipse.wst.sdk_1.5.2.v200610070620-O2U9W5yZ8Xaybx1.jar"
- id="org.eclipse.wst.sdk"
- version="1.5.2.v200610070620-O2U9W5yZ8Xaybx1">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- url="features/org.eclipse.jst.sdk_1.5.2.v200610070620-dnUUNbBDstmRfV2.jar"
- id="org.eclipse.jst.sdk"
- version="1.5.2.v200610070620-dnUUNbBDstmRfV2">
- <category name="Web Tools Platform (WTP)" />
+ id="org.eclipse.jem.sdk"
+ url="features/org.eclipse.jem.sdk_1.2.4.v200704140333-GIHlkYKbOQv_rA7.jar"
+ version="1.2.4.v200704140333-GIHlkYKbOQv_rA7">
+ <category name="Models and Model Development" />
</feature>
<category-def
- name="EJB 3.0 Java Persistence (Dali JPA) -- Preview"
- label="EJB 3.0 Java Persistence (Dali JPA) -- Preview">
+ label="EJB 3.0 Java Persistence (Dali JPA) -- Preview"
+ name="EJB 3.0 Java Persistence (Dali JPA) -- Preview">
<description
url="http://download.eclipse.org/webtools/updates/index.html">
This category contains features providing function to use
@@ -328,8 +111,8 @@
</category-def>
<category-def
- name="Enabling Features"
- label="Enabling Features">
+ label="Enabling Features"
+ name="Enabling Features">
<description
url="http://download.eclipse.org/webtools/updates/index.html">
This category contains features used by WTP or even other
@@ -339,8 +122,8 @@
</category-def>
<category-def
- name="Java Server Faces (JSF) -- Preview"
- label="Java Server Faces (JSF) -- Preview">
+ label="Java Server Faces (JSF) -- Preview"
+ name="Java Server Faces (JSF) -- Preview">
<description
url="http://download.eclipse.org/webtools/updates/index.html">
This category contains features providing function to use
@@ -349,8 +132,8 @@
</category-def>
<category-def
- name="Web Tools Platform (WTP)"
- label="Web Tools Platform (WTP)">
+ label="Web Tools Platform (WTP)"
+ name="Web Tools Platform (WTP)">
<description
url="http://download.eclipse.org/webtools/updates/index.html">
This category contains the features of the Eclipse Web Tools
@@ -358,24 +141,13 @@
</description>
</category-def>
+
<category-def
- name="Web Tools Platform (WTP) 1.0.x maintenance"
- label="Web Tools Platform (WTP) 1.0.x maintenance">
- <description
- url="http://download.eclipse.org/webtools/updates/index.html">
- This category contains the features of the Eclipse Web Tools
- Project (WTP) 1.0.x maintenance versions. Note: this 1.0.x
- version of WTP requires the Eclipse Project 3.1 SDK and
- corresponding pre-reqs.
- </description>
- </category-def>
- <category-def
- name="Web Tools Platform (WTP) Patches"
- label=" Web Tools Platform (WTP) Patches">
- <description
- url="http://download.eclipse.org/webtools/updates/index.html">
- This category contains the patches for for the Eclipse Web
- Tools Project (WTP).
+ label="Models and Model Development"
+ name="Models and Model Development">
+ <description>
+ Model creation and manipulation frameworks (e.g. EMF, GMF)
+ and specific models (SDO, JEM, XSD Infoset).
</description>
</category-def>
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteEnablingFeatures.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteEnablingFeatures.xml
deleted file mode 100644
index 863b9b1f4..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteEnablingFeatures.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site pack200="true" digestURL="http://download.eclipse.org/webtools/declaredUpdates" >
-<!--
-mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/declaredUpdates/site.xml&format=xml"
--->
-
- <description url="http://download.eclipse.org/webtools/declaredUpdates/index.html">
- The update site contains the features of the of Eclipse Web Tools Project (WTP)
- </description>
-
- <feature url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--0842282_233879.jar" id="org.apache.commons_logging.feature" version="1.0.4.v200606152055--0842282_233879">
- <category name="Enabling Features" />
- </feature>
-
- <feature url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--0842282939426_.jar" id="org.apache.jakarta_log4j.feature" version="1.2.8.v200605300321--0842282939426_">
- <category name="Enabling Features" />
- </feature>
-
- <feature url="features/org.apache.xerces.feature_2.8.0.v200605151647--08422828353873.jar" id="org.apache.xerces.feature" version="2.8.0.v200605151647--08422828353873">
- <category name="Enabling Features" />
- </feature>
-
-
- <category-def name="Enabling Features" label="Enabling Features">
- <description url="http://download.eclipse.org/webtools/updates/index.html">
- This category contains features used by WTP or even other projects that enable some functionality, but which by themselves are not very interesting.
- </description>
- </category-def>
-
-
-
-</site>
diff --git a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml b/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml
deleted file mode 100644
index 040f266e0..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/WebContent/siteWTPCallisto.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
- digestURL="http://download.eclipse.org/webtools/testUpdates/"
- pack200="true">
- <!--
- mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&format=xml"
- -->
- <description
- url="http://download.eclipse.org/webtools/testUpdates/index.html">
- The update site contains the features of the of Eclipse Web
- Tools Project (WTP)
- </description>
-
-
-
- <feature
- id="org.eclipse.wst"
- url="features/org.eclipse.wst_1.5.4.v200704200440-X3TmzmK-W-vP-Fs.jar"
- version="1.5.4.v200704200440-X3TmzmK-W-vP-Fs">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- id="org.eclipse.jst"
- url="features/org.eclipse.jst_1.5.4.v200704150219-kW-NuyxHh4-w7-n.jar"
- version="1.5.4.v200704150219-kW-NuyxHh4-w7-n">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- id="org.eclipse.wst.sdk"
- url="features/org.eclipse.wst.sdk_1.5.4.v200704200440-O2U9jyC-ZDAHEgs.jar"
- version="1.5.4.v200704200440-O2U9jyC-ZDAHEgs">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- id="org.eclipse.jst.sdk"
- url="features/org.eclipse.jst.sdk_1.5.4.v200704150219-dnUU6nyMbgExb_A.jar"
- version="1.5.4.v200704150219-dnUU6nyMbgExb_A">
- <category name="Web Tools Platform (WTP)" />
- </feature>
-
- <feature
- id="org.apache.commons_logging.feature"
- url="features/org.apache.commons_logging.feature_1.0.4.v200606152055--0842282_233879.jar"
- version="1.0.4.v200606152055--0842282_233879">
- <category name="Enabling Features" />
- </feature>
-
- <feature
- id="org.apache.jakarta_log4j.feature"
- url="features/org.apache.jakarta_log4j.feature_1.2.8.v200605300321--0842282939426_.jar"
- version="1.2.8.v200605300321--0842282939426_">
- <category name="Enabling Features" />
- </feature>
-
- <feature
- id="org.apache.xerces.feature"
- url="features/org.apache.xerces.feature_2.8.0.v200605151647--08422828353873.jar"
- version="2.8.0.v200605151647--08422828353873">
- <category name="Enabling Features" />
- </feature>
-
-
-
- <feature
- id="org.eclipse.jst.jsf.feature"
- url="features/org.eclipse.jst.jsf.feature_0.5.1.v20060829-OJnpNuKYI7O7SAU.jar"
- version="0.5.1.v20060829-OJnpNuKYI7O7SAU">
- <category name="Java Server Faces (JSF) -- Preview" />
- </feature>
-
-
- <feature
- id="org.eclipse.jst.jsf_sdk.feature"
- url="features/org.eclipse.jst.jsf_sdk.feature_0.5.1.v20060829-fX45f_dlc_3ccM8.jar"
- version="0.5.1.v20060829-fX45f_dlc_3ccM8">
- <category name="Java Server Faces (JSF) -- Preview" />
- </feature>
-
- <feature
- id="org.eclipse.dali"
- url="features/org.eclipse.dali_0.5.0.v200606270000--87cMN7N7crMMMR.jar"
- version="0.5.0.v200606270000--87cMN7N7crMMMR">
- <category name="EJB 3.0 Java Persistence (Dali JPA) -- Preview" />
- </feature>
-
-
- <feature
- id="org.eclipse.jem"
- patch="false"
- url="features/org.eclipse.jem_1.2.4.v200704181020--6zXJK0L0SE3a95.jar"
- version="1.2.4.v200704181020--6zXJK0L0SE3a95">
- <category name="Models and Model Development" />
- </feature>
- <feature
- id="org.eclipse.jem.sdk"
- url="features/org.eclipse.jem.sdk_1.2.4.v200704140333-GIHlkYKbOQv_rA7.jar"
- version="1.2.4.v200704140333-GIHlkYKbOQv_rA7">
- <category name="Models and Model Development" />
- </feature>
-
- <category-def
- label="EJB 3.0 Java Persistence (Dali JPA) -- Preview"
- name="EJB 3.0 Java Persistence (Dali JPA) -- Preview">
- <description
- url="http://download.eclipse.org/webtools/updates/index.html">
- This category contains features providing function to use
- and develop Object-Relational (O/R) mappings for EJB 3.0
- Java Persistence API (JPA) Entities.
- </description>
- </category-def>
-
- <category-def
- label="Enabling Features"
- name="Enabling Features">
- <description
- url="http://download.eclipse.org/webtools/updates/index.html">
- This category contains features used by WTP or even other
- projects that enable some functionality, but which by
- themselves are not very interesting.
- </description>
- </category-def>
-
- <category-def
- label="Java Server Faces (JSF) -- Preview"
- name="Java Server Faces (JSF) -- Preview">
- <description
- url="http://download.eclipse.org/webtools/updates/index.html">
- This category contains features providing function to use
- and develop Java Server Faces.
- </description>
- </category-def>
-
- <category-def
- label="Web Tools Platform (WTP)"
- name="Web Tools Platform (WTP)">
- <description
- url="http://download.eclipse.org/webtools/updates/index.html">
- This category contains the features of the Eclipse Web Tools
- Project (WTP).
- </description>
- </category-def>
-
-
- <category-def
- label="Models and Model Development"
- name="Models and Model Development">
- <description>
- Model creation and manipulation frameworks (e.g. EMF, GMF)
- and specific models (SDO, JEM, XSD Infoset).
- </description>
- </category-def>
-
-</site>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jem.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jem.xml
deleted file mode 100644
index fa1cb75ea..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jem.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update">
- <target name="update">
-
- <property name="updateSite" value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/updateSite/" />
- <echo message=" pulling update jars from ${updateSite}" />
-
-
-
-
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId" value="org.eclipse.jem" />
- <property name="version" value="1.2.4.v200704181020--6zXJK0L0SE3a95" />
- </ant>
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId" value="org.eclipse.jem.sdk" />
- <property name="version" value="1.2.4.v200704140333-GIHlkYKbOQv_rA7" />
- </ant>
-
- </target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jpa.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jpa.xml
deleted file mode 100644
index 01016d249..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jpa.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update">
- <target name="update">
-
- <property name="updateSite"
- value="file:///${user.home}/downloads/webtools/jpa/updates/" />
- <echo message=" pulling update jars from ${updateSite}" />
-
-
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId"
- value="org.eclipse.dali" />
- <property name="version"
- value="0.5.0.v200606270000--87cMN7N7crMMMR" />
-
- </ant>
-
-
- <!--
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId"
- value="org.eclipse.dali.tests" />
- <property name="version"
- value="0.5.0.v200606200003" />
- </ant>
- -->
- </target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jsf.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jsf.xml
deleted file mode 100644
index 8dfc0d171..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-jsf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update">
- <target name="update">
-
- <property name="updateSite"
- value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.3-200702082048/updateSite/" />
- <echo message=" pulling update jars from ${updateSite}" />
-
-
-
-
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId"
- value="org.eclipse.jst.jsf.feature" />
- <property name="version"
- value="0.5.1.v20060829-OJnpNuKYI7O7SAU" />
-
- </ant>
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId"
- value="org.eclipse.jst.jsf_sdk.feature" />
- <property name="version"
- value="0.5.1.v20060829-fX45f_dlc_3ccM8" />
- </ant>
-
-
-
- </target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml
deleted file mode 100644
index 82f78bb16..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/callisto-features-wtp.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update">
- <target name="update">
-
- <property name="updateSite" value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/updateSite/" />
- <echo message=" pulling update jars from ${updateSite}" />
-
-
-
-
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId" value="org.eclipse.wst" />
- <property name="version" value="1.5.4.v200704200440-X3TmzmK-W-vP-Fs" />
- </ant>
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId" value="org.eclipse.jst" />
- <property name="version" value="1.5.4.v200704150219-kW-NuyxHh4-w7-n" />
- </ant>
-
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId" value="org.eclipse.wst.sdk" />
- <property name="version" value="1.5.4.v200704200440-O2U9jyC-ZDAHEgs" />
- </ant>
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId" value="org.eclipse.jst.sdk" />
- <property name="version" value="1.5.4.v200704150219-dnUU6nyMbgExb_A" />
- </ant>
-
- <!--
- technically, seems Xerces should not have to be listed here,
- since is mirrored by above ... but currently is required to get all other
- files (e.g. site.xml files) to be correctly updated).
-
- Doesn't hurt, either, to have the redundancy, since other projects
- are dependent on it, so less likely to be forgotten and accidently
- removed in the future.
- -->
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId" value="org.apache.commons_logging.feature" />
- <property name="version" value="1.0.4.v200606152055--0842282_233879" />
- </ant>
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId" value="org.apache.jakarta_log4j.feature" />
- <property name="version" value="1.2.8.v200605300321--0842282939426_" />
- </ant>
- <ant antfile="updateMirrorProject.xml">
- <property name="featureId" value="org.apache.xerces.feature" />
- <property name="version" value="2.8.0.v200605151647--08422828353873" />
- </ant>
-
-
-
- </target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
index 25d6f703a..3ce622254 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/createDigests.xml
@@ -35,20 +35,20 @@
<arg
line="-application org.eclipse.update.core.siteOptimizer" />
<arg
- line="-digestBuilder -digestOutputDir=${updateSite} -siteXML=${updateSite}/${mainSiteFileName}" />
+ line="-digestBuilder -digestOutputDir=${update.site} -siteXML=${update.site}/${mainSiteFileName}" />
</java>
</target>
<target name="checkArgs">
- <fail message="eclipse.home and updateSite must be set.">
+ <fail message="eclipse.home and update.site must be set.">
<condition>
<and>
<not>
<isset property="eclipse.home" />
</not>
<not>
- <isset property="updateSite" />
+ <isset property="update.site" />
</not>
</and>
</condition>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml
index 329bdadc8..960959e82 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/createPack200s.xml
@@ -30,19 +30,19 @@
<arg
line="-application org.eclipse.update.core.siteOptimizer" />
<arg
- line="-jarProcessor -verbose -outputDir ${updateSite} -pack ${updateSite}" />
+ line="-jarProcessor -verbose -outputDir ${update.site} -pack ${update.site}" />
</java>
</target>
<target name="checkArgs">
- <fail message="eclipse.home and updateSite must be set.">
+ <fail message="eclipse.home and update.site must be set.">
<condition>
<and>
<not>
<isset property="eclipse.home" />
</not>
<not>
- <isset property="updateSite" />
+ <isset property="update.site" />
</not>
</and>
</condition>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource b/org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource
deleted file mode 100644
index fd68d8249..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/eclipseLocation.shsource
+++ /dev/null
@@ -1 +0,0 @@
-eclipseLocation=${HOME}/eclipse-ppc-33M7
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml
new file mode 100644
index 000000000..010268950
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jem.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ name="update"
+ default="update">
+ <target name="update">
+
+ <property
+ name="update.site"
+ value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/update.site/" />
+ <echo message=" pulling update jars from ${update.site}" />
+
+
+
+
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.eclipse.jem" />
+ <property
+ name="version"
+ value="1.2.4.v200704181020--6zXJK0L0SE3a95" />
+ </ant>
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.eclipse.jem.sdk" />
+ <property
+ name="version"
+ value="1.2.4.v200704140333-GIHlkYKbOQv_rA7" />
+ </ant>
+
+ </target>
+</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml
new file mode 100644
index 000000000..0a45e19d8
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jpa.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ name="update"
+ default="update">
+ <target name="update">
+
+ <property
+ name="update.site"
+ value="file:///${user.home}/downloads/webtools/jpa/updates/" />
+ <echo message=" pulling update jars from ${update.site}" />
+
+
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.eclipse.dali" />
+ <property
+ name="version"
+ value="0.5.0.v200606270000--87cMN7N7crMMMR" />
+
+ </ant>
+
+
+ <!--
+ <ant antfile="updateMirrorProject.xml">
+ <property name="featureId"
+ value="org.eclipse.dali.tests" />
+ <property name="version"
+ value="0.5.0.v200606200003" />
+ </ant>
+ -->
+ </target>
+</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml
new file mode 100644
index 000000000..f31d29316
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-jsf.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ name="update"
+ default="update">
+ <target name="update">
+
+ <property
+ name="update.site"
+ value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.3-200702082048/update.site/" />
+ <echo message=" pulling update jars from ${update.site}" />
+
+
+
+
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.eclipse.jst.jsf.feature" />
+ <property
+ name="version"
+ value="0.5.1.v20060829-OJnpNuKYI7O7SAU" />
+
+ </ant>
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.eclipse.jst.jsf_sdk.feature" />
+ <property
+ name="version"
+ value="0.5.1.v20060829-fX45f_dlc_3ccM8" />
+ </ant>
+
+
+
+ </target>
+</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml
new file mode 100644
index 000000000..35bafbb8a
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-callisto-wtp.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ name="update"
+ default="update">
+ <target name="update">
+
+ <property
+ name="update.site"
+ value="file://${user.home}/downloads/webtools/downloads/drops/R1.5/R-1.5.4-200705021353/update.site/" />
+ <echo message=" pulling update jars from ${update.site}" />
+
+
+
+
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.eclipse.wst" />
+ <property
+ name="version"
+ value="1.5.4.v200704200440-X3TmzmK-W-vP-Fs" />
+ </ant>
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.eclipse.jst" />
+ <property
+ name="version"
+ value="1.5.4.v200704150219-kW-NuyxHh4-w7-n" />
+ </ant>
+
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.eclipse.wst.sdk" />
+ <property
+ name="version"
+ value="1.5.4.v200704200440-O2U9jyC-ZDAHEgs" />
+ </ant>
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.eclipse.jst.sdk" />
+ <property
+ name="version"
+ value="1.5.4.v200704150219-dnUU6nyMbgExb_A" />
+ </ant>
+
+ <!--
+ technically, seems Xerces should not have to be listed here,
+ since is mirrored by above ... but currently is required to get all other
+ files (e.g. site.xml files) to be correctly updated).
+
+ Doesn't hurt, either, to have the redundancy, since other projects
+ are dependent on it, so less likely to be forgotten and accidently
+ removed in the future.
+ -->
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.apache.commons_logging.feature" />
+ <property
+ name="version"
+ value="1.0.4.v200606152055--0842282_233879" />
+ </ant>
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.apache.jakarta_log4j.feature" />
+ <property
+ name="version"
+ value="1.2.8.v200605300321--0842282939426_" />
+ </ant>
+ <ant antfile="updateMirrorProject.xml">
+ <property
+ name="featureId"
+ value="org.apache.xerces.feature" />
+ <property
+ name="version"
+ value="2.8.0.v200605151647--08422828353873" />
+ </ant>
+
+
+
+ </target>
+</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/features-wtp.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml
similarity index 94%
rename from org.eclipse.wtp.releng.webupdatesite/build-home/features-wtp.xml
rename to org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml
index 1782e405c..91667bb5f 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/features-wtp.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/features-europa-wtp.xml
@@ -7,9 +7,9 @@
message="-------- Project: WTP Responsible: david_williams" />
<!-- intentionally no site.xml in this particular site -->
<property
- name="updateSite"
- value="file://${user.home}/downloads/webtools/committers/drops/R2.0/S-2.0RC1-200705250432/updateSite" />
- <echo message=" pulling update jars from ${updateSite}" />
+ name="update.site"
+ value="file://${user.home}/downloads/webtools/committers/drops/R2.0/S-2.0RC1-200705250432/update.site" />
+ <echo message=" pulling update jars from ${update.site}" />
<ant antfile="updateMirrorProject.xml">
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/generateMirrorTags.jar b/org.eclipse.wtp.releng.webupdatesite/build-home/generateMirrorTags.jar
deleted file mode 100644
index 753abe43bb1c4fd99357dea5dbf77a40c27deec4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 30138
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
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
index f3c00fc16..7a2260299 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
@@ -4,6 +4,8 @@
# ${updateToolsDir}.
# This is typically the users ${HOME} directory
+# have to code this here, not include,
+# since normally the properties.shsource is in a different directory
updateToolsDir=org.eclipse.wtp.releng.webupdatesite
echo " "
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/mirrorMilestones.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/mirrorMilestones.xml
deleted file mode 100644
index 6f928da32..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/mirrorMilestones.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update" basedir=".">
- <!-- original example received from Richard Gronback from cross-project list (thanks Richard!) -->
- <!-- see http://help.eclipse.org/help31/index.jsp?topic=/org.eclipse.platform.doc.isv/reference/misc/update_standalone.html -->
-
- <target name="update">
- <echo message="Mirroring wtp milestones site to reduced site" />
- <java jar="${eclipseLocation}/startup.jar"
- fork="true"
- failonerror="false">
- <jvmarg value="-DcontinueOnError=true" />
- <arg value="-clean" />
- <arg value="-nosplash" />
- <arg value="-application" />
- <arg value="org.eclipse.update.core.standaloneUpdate" />
- <arg value="-data" />
- <arg value="${basedir}/buildworkspace" />
- <arg value="-debug" />
- <arg value="-consolelog" />
- <arg value="-command" />
- <arg value="mirror" />
- <arg value="-from" />
- <arg value="${updateSite}" />
- <arg value="-to" />
- <arg value="${localUpdateSitePath}" />
-
- </java>
-
- </target>
-</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource b/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource
new file mode 100644
index 000000000..d5b03287d
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/properties.shsource
@@ -0,0 +1,7 @@
+
+
+eclipseLocation=${HOME}/eclipse-ppc-33M7
+
+
+# should be no reason to ever change the following
+updateToolsDir=org.eclipse.wtp.releng.webupdatesite
\ No newline at end of file
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
index 48c1951a3..31191334d 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreateDigests.sh
@@ -8,7 +8,7 @@ updateSite=${HOME}/downloads/webtools/declaredUpdates
mainSiteFileName=site.xml
-source eclipseLocation.shsource
+source properties.shsource
-ant -f createDigests.xml -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite} -DmainSiteFileName=${mainSiteFileName}
+ant -f createDigests.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite} -DmainSiteFileName=${mainSiteFileName}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
index e458158d6..228334df9 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runCreatePack200s.sh
@@ -5,7 +5,7 @@
updateSite=${HOME}/downloads/webtools/testUpdates
#updateSite=${HOME}/downloads/webtools/declaredUpdates
-source eclipseLocation.shsource
+source properties.shsource
-ant -f createPack200s.xml -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite}
+ant -f createPack200s.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
index e67c1fa8d..a9d394fd1 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllCallistoProjects.sh
@@ -2,13 +2,12 @@
# script to run update, setting properties, for all projects
-# main entry point for Callisto update
updateSite=${HOME}/downloads/webtools/testUpdates
-mainSiteFileName=siteWTPCallisto.xml
-updateToolsDir=org.eclipse.wtp.releng.webupdatesite
-
-source eclipseLocation.shsource
+mainSiteFileName=siteCallisto.xml
+mainIndexFileName=indexCallisto.html
+
+source properties.shsource
if [ "${1}" == "-clean" ] ; then
@@ -22,18 +21,18 @@ if [ "${1}" == "-clean" ] ; then
rm -fr ${updateSite}/*
echo " Updating index and web site files, but not site xml files (yet)"
- rsync -v -p ${HOME}/${updateToolsDir}/WebContent/index.html ${updateSite}/index.html
+ rsync -v -p ${HOME}/${updateToolsDir}/WebContent/${mainIndexFileName} ${updateSite}/index.html
rsync -v -p ${HOME}/${updateToolsDir}/WebContent/*.jpg ${updateSite}
fi
-ant -f updateCallistoMirrorAll.xml -Declipse.home=${eclipseLocation} -DlocalUpdateSitePath=${updateSite}
+ant -f updateCallistoMirrorAll.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
# merge authored site.xml files with the most recent auto generated one
./runUpdateSiteXmlFiles.sh ${mainSiteFileName} ${updateSite}
-#ant -f createPack200s.xml -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite}
+# do create pack's later ... takes a long time
+#ant -f createPack200s.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
# run create Digests now, it's a good check if all is well
-ant -f createDigests.xml -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite} -DmainSiteFileName=${mainSiteFileName}
-
+ant -f createDigests.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite} -DmainSiteFileName=${mainSiteFileName}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
index 844b1b86f..beea70cd9 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateAllEuropaProjects.sh
@@ -2,13 +2,13 @@
# script to run update, setting properties, for all projects
-updateToolsDir=org.eclipse.wtp.releng.webupdatesite
-
updateSite=${HOME}/downloads/webtools/declaredUpdates
-
-source eclipseLocation.shsource
mainSiteFileName=siteEuropa.xml
+mainIndexFileName=indexEuropa.html
+
+source properties.shsource
+
if [ "${1}" == "-clean" ] ; then
@@ -22,18 +22,18 @@ if [ "${1}" == "-clean" ] ; then
rm -fr ${updateSite}/*
echo " Updating index and web site files, but not site xml files (yet)"
- rsync -v -p ${HOME}/${updateToolsDir}/WebContent/indexEuropa.html ${updateSite}/index.html
+ rsync -v -p ${HOME}/${updateToolsDir}/WebContent/${mainIndexFileName} ${updateSite}/index.html
rsync -v -p ${HOME}/${updateToolsDir}/WebContent/*.jpg ${updateSite}
fi
-ant -f updateEuropaMirrorAll.xml -Declipse.home=${eclipseLocation} -DlocalUpdateSitePath=${updateSite}
+ant -f updateEuropaMirrorAll.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
# merge authored site.xml files with the most recent auto generated one
./runUpdateSiteXmlFiles.sh ${mainSiteFileName} ${updateSite}
# do create pack's later ... takes a long time
-# ant -f createPack200s.xml -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite}
+# ant -f createPack200s.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite}
# run create Digests now, it's a good check if all is well
-ant -f createDigests.xml -Declipse.home=${eclipseLocation} -DupdateSite=${updateSite} -DmainSiteFileName=site.xml
+ant -f createDigests.xml -Declipse.home=${eclipseLocation} -Dupdate.site=${updateSite} -DmainSiteFileName=${mainSiteFileName}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateProjects.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateProjects.sh
deleted file mode 100644
index 5b3c2b8a3..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateProjects.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# script to run update, setting properties, for an individual project
-
-#updateSite=${HOME}/downloads/webtools/testUpdates
-updateSite=${HOME}/downloads/webtools/declaredUpdates
-
-echo "update site: ${updateSite}"
-
- eclipseLocation=${HOME}/eclipse-ppc-33M5
-
-
-project="${1}"
-if [ "${project}" != "" ]
-then
-
- ant -f features-${project}.xml -DeclipseLocation=${eclipseLocation} -DlocalUpdateSitePath=${updateSite} -Dosgi.arch=ppc -Dosgi.clean -Dosgi.debug=true -Declipse.consoleLog=true -DcontinueOnError=true
-
-
-else
- echo " Usage: ${0} <project> (where project is wtp, jsf, or jpa)"
-
-fi
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh
deleted file mode 100644
index 3eb5faf94..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFile.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# script to update site xml files, by merging new features from "mirror" command, with old "authored" content.
-
-main_name=${1}
-updateSite=${2}
-updateToolsDir=org.eclipse.wtp.releng.webupdatesite
-
-in_authored=${HOME}/${updateToolsDir}/WebContent/${main_name}
-# 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}
-
-# copy to discovery site
-# Note: here we are changing names from site specific site file name, to generic site.xml
-rsync -v -p ${in_authored} ${updateSite}/site.xml
-
-rm ${in_newFeatures}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
index 02e3e9878..efb64723f 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/runUpdateSiteXmlFiles.sh
@@ -1,8 +1,11 @@
+
#set variables
-updateToolsDir=${HOME}/org.eclipse.wtp.releng.webupdatesite
+
+
updateSiteFile=${1}
updateSite=${2}
+source properties.shsource
# save away a clean version of this site file, produced during mirroring commands,
@@ -11,5 +14,16 @@ mv ${updateSite}/site.xml ${updateSite}/.site.xml
# merge authored site.xml with the autogenerated one
-${updateToolsDir}/build-home/runUpdateSiteXmlFile.sh ${updateSiteFile} ${updateSite}
+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}
+
+# copy to discovery site
+# Note: here we are changing names from site specific site file name, to generic site.xml
+rsync -v -p ${in_authored} ${updateSite}/site.xml
+
+rm ${in_newFeatures}
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml
index 6c35b40f5..43fa03484 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateCallistoMirrorAll.xml
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="updatesite" default="all" basedir=".">
+<project
+ name="updateCallisto"
+ default="all"
+ basedir=".">
<target name="all">
- <ant antfile="callisto-features-jem.xml" />
- <ant antfile="callisto-features-wtp.xml" />
- <ant antfile="callisto-features-jsf.xml" />
- <ant antfile="callisto-features-jpa.xml" />
-
+ <ant antfile="features-callisto-jem.xml" />
+ <ant antfile="features-callisto-wtp.xml" />
+ <ant antfile="features-callisto-jsf.xml" />
+ <ant antfile="features-callisto-jpa.xml" />
+
<!-- make sure all can "read" (important for quicker http access, esp. when Eclipse.org overloaded) -->
- <chmod verbose="true" perm="o+rx" type="both">
- <fileset dir="${localUpdateSitePath}" />
+ <chmod
+ verbose="true"
+ perm="o+rx"
+ type="both">
+ <fileset dir="${update.site}" />
</chmod>
- <!-- needs work .. indexer doesn't work well from this ant script (needs paths fixed up)
- <ant antfile="indexer.xml">
- <property name="pluginJarPath"
- location="${localUpdateSitePath}" />
- </ant>
- -->
</target>
</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml
index 86787f12d..f2d7790ed 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateEuropaMirrorAll.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="updatesite" default="all" basedir=".">
+<project
+ name="update.site"
+ default="all"
+ basedir=".">
<target name="all">
- <ant antfile="features-wtp.xml" />
-
+ <ant antfile="features-europa-wtp.xml" />
+
<!-- make sure all can "read" (important for quicker http access, esp. when Eclipse.org overloaded) -->
- <chmod verbose="true" perm="o+rx" type="both">
- <fileset dir="${localUpdateSitePath}" />
+ <chmod
+ verbose="true"
+ perm="o+rx"
+ type="both">
+ <fileset dir="${update.site}" />
</chmod>
- <!-- needs work .. indexer doesn't work well from this ant script (needs paths fixed up)
- <ant antfile="indexer.xml">
- <property name="pluginJarPath"
- location="${localUpdateSitePath}" />
- </ant>
- -->
</target>
</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
index c7ac583d2..fb4d6499e 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/updateMirrorProject.xml
@@ -1,50 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="update" default="update" basedir=".">
-
-
-
- <property name="java15-home" value="${user.home}/ibm-java2-ppc-50/jre" />
- <property name="buildDirectory" value="${basedir}" />
-
- <target name="update">
- <echo message="Updating ${featureId} ${version}" />
-
- <java taskname="updateJob"
- fork="true"
- resultProperty="updateResult"
- failonerror="false"
- jvm="${java15-home}/bin/java"
- classname="org.eclipse.equinox.launcher.Main">
- <classpath>
- <fileset dir="${eclipse.home}/plugins">
- <include name="org.eclipse.equinox.launcher_*.jar" />
- </fileset>
- </classpath>
-
-
- <jvmarg value="-DcontinueOnError=true" />
- <arg value="-clean" />
- <arg value="-nosplash" />
- <arg value="-application" />
- <arg value="org.eclipse.update.core.standaloneUpdate" />
- <arg value="-data" />
- <arg value="${basedir}/buildworkspace" />
- <arg value="-debug" />
- <arg value="-consolelog" />
- <arg value="-command" />
- <arg value="mirror" />
- <arg value="-featureId" />
- <arg value="${featureId}" />
- <arg value="-version" />
- <arg value="${version}" />
- <arg value="-from" />
- <arg value="${updateSite}" />
- <arg value="-to" />
- <arg value="${localUpdateSitePath}" />
- <arg value="-ignoreMissingPlugins" />
- <arg value="true" />
-
- </java>
-
- </target>
+<project
+ name="update"
+ default="update"
+ basedir=".">
+
+
+
+ <property
+ name="java15-home"
+ value="${user.home}/ibm-java2-ppc-50/jre" />
+ <property
+ name="buildDirectory"
+ value="${basedir}" />
+
+ <target name="update">
+ <echo message="Updating ${featureId} ${version}" />
+
+ <java
+ taskname="updateJob"
+ fork="true"
+ resultProperty="updateResult"
+ failonerror="false"
+ jvm="${java15-home}/bin/java"
+ classname="org.eclipse.equinox.launcher.Main">
+ <classpath>
+ <fileset dir="${eclipse.home}/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar" />
+ </fileset>
+ </classpath>
+
+
+ <jvmarg value="-DcontinueOnError=true" />
+ <arg value="-clean" />
+ <arg value="-nosplash" />
+ <arg value="-application" />
+ <arg value="org.eclipse.update.core.standaloneUpdate" />
+ <arg value="-data" />
+ <arg value="${basedir}/buildworkspace" />
+ <arg value="-debug" />
+ <arg value="-consolelog" />
+ <arg value="-command" />
+ <arg value="mirror" />
+ <arg value="-featureId" />
+ <arg value="${featureId}" />
+ <arg value="-version" />
+ <arg value="${version}" />
+ <arg value="-from" />
+ <arg value="${update.site}" />
+ <arg value="-to" />
+ <arg value="${update.site}" />
+ <arg value="-ignoreMissingPlugins" />
+ <arg value="true" />
+
+ </java>
+
+ </target>
</project>
diff --git a/org.eclipse.wtp.releng.webupdatesite/testmail.xml b/org.eclipse.wtp.releng.webupdatesite/testmail.xml
deleted file mode 100644
index 5c689cb84..000000000
--- a/org.eclipse.wtp.releng.webupdatesite/testmail.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="updatesite" default="updatesite" basedir=".">
-<target name = "updatesite">
- <email
- mailhost="localhost"
- returnaddress="wtpBuild@eclipse.org"
- skipusers="true"
- subjectprefix="[wtp-R1.5-I-build]"
- buildresultsurl="${//cruisecontrol/buildresults/wtp-I">
-
- <always address="wtp-releng@eclipse.org" />
- </email>
-
-
-</target>
-</project>
\ No newline at end of file
--
GitLab