From fb0ed94aae920b03153d9ec3901b793a35bf8282 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Wed, 14 Nov 2007 15:34:07 +0000
Subject: [PATCH] Prepare for 3.0M3

---
 .../bin/mkTestUpdates.sh                      | 12 ++---
 releng/org.eclipse.rse.updatesite/site.xml    | 49 ++++++++++++++-----
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index 1e527a714eb..38a85201c4f 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -63,7 +63,7 @@ if [ `basename $SITE` = testUpdates ]; then
     mv -f index.html.new index.html
     sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/testUpdates,g' \
         -e 's,Project 2.0 Update,Project Test Update,g' \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_1 -->/d' \
+    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_2 -->/d' \
         site.xml > site.xml.new
     mv -f site.xml.new site.xml
     sed -e 's,Project 2.0 Update,Project Test Update,g' \
@@ -184,7 +184,7 @@ elif [ `basename $SITE` = signedUpdates ]; then
     mv -f index.html.new index.html
     sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/signedUpdates,g' \
         -e 's,Project 2.0 Update,Project Signed Test Update,g' \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_1 -->/d' \
+    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_2 -->/d' \
         site.xml > site.xml.new
     mv -f site.xml.new site.xml
     sed -e 's,Project 2.0 Update,Project Signed Test Update,g' \
@@ -219,7 +219,7 @@ being contributed to the Europa coordinated release train (Eclipse 3.3).' \
     	index.html > index.html.new
     mv -f index.html.new index.html
     ## keep 2.0.1 features in site.xml
-    ##	-e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_1 -->/d' \
+    ##	-e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_2 -->/d' \
     sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/updates/milestones,g' \
         -e 's,Project 2.0 Update,Project Milestone Update,g' \
         site.xml > site.xml.new
@@ -242,7 +242,7 @@ to test them before going live.' \
     	index.html > index.html.new
     mv -f index.html.new index.html
     ## keep 2.0.1 features in site.xml
-    ##	-e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_1 -->/d' \
+    ##	-e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_2 -->/d' \
     sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/updates/interim,g' \
         -e 's,Project 2.0 Update,Project Interim Update,g' \
         site.xml > site.xml.new
@@ -267,7 +267,7 @@ being contributed to the Ganymede coordinated release train (Eclipse 3.4).' \
     ## dont keep 2.0.x features in site.xml
     sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/updates/3.0,g' \
         -e 's,Project 2.0 Update,Project 3.0 Milestone Update,g' \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_1_patches -->/d' \
+    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_2 -->/d' \
         site.xml > site.xml.new
     mv -f site.xml.new site.xml
     sed -e 's,Project 2.0 Update,Project 3.0 Milestone Update,g' \
@@ -280,7 +280,7 @@ else
     stamp=`date +'%Y%m%d-%H%M'`
     rm index.html site.xml web/site.xsl
     cvs -q update -dPR
-    sed -e '/<!-- BEGIN_2_0_2 -->/,/<!-- END_2_0_2 -->/d' \
+    sed -e '/<!-- BEGIN_2_0_3 -->/,/<!-- END_2_0_3 -->/d' \
         site.xml > site.xml.new1
     sed -e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_0 -->/d' \
         site.xml.new1 > site.xml.new
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index a19381d732e..4a52d4e3b57 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -117,34 +117,61 @@
       </description>
    </category-def>
 <!-- END_2_0_1 -->
-<!-- BEGIN_2_0_1_patches -->
+<!-- BEGIN_2_0_2 -->
    <feature url="features/org.eclipse.rse.core_2.0.2.v20071030-7P-7DEB7sQRxTz0jQb.jar" id="org.eclipse.rse.core" version="2.0.2.v20071030-7P-7DEB7sQRxTz0jQb">
-      <category name="TM and RSE 2.0.1 patches (M20071030-2030)"/>
+      <category name="TM and RSE 2.0.2"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.dstore_2.0.1.v20070926-7F-4DUUEF6FALu.jar" id="org.eclipse.rse.dstore" version="2.0.1.v20070926-7F-4DUUEF6FALu">
+      <category name="TM and RSE 2.0.2"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.ftp_2.0.1.v20070926-7737__kE77Y7dDK4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.1.v20070926-7737__kE77Y7dDK4I7B">
+      <category name="TM and RSE 2.0.2"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.local_2.0.1.v20070705-7_-2AgI99h9l9l.jar" id="org.eclipse.rse.local" version="2.0.1.v20070705-7_-2AgI99h9l9l">
+      <category name="TM and RSE 2.0.2"/>
    </feature>
    <feature url="features/org.eclipse.rse_2.0.2.v20071030-7D-68mJIkR9WAviqV8z0U9vz-C.jar" id="org.eclipse.rse" version="2.0.2.v20071030-7D-68mJIkR9WAviqV8z0U9vz-C">
-      <category name="TM and RSE 2.0.1 patches (M20071030-2030)"/>
+      <category name="TM and RSE 2.0.2"/>
    </feature>
    <feature url="features/org.eclipse.rse.sdk_2.0.2.v20071030-7J-79E7ZoHPP5ZoeZ-oUe1z-wJnl.jar" id="org.eclipse.rse.sdk" version="2.0.2.v20071030-7J-79E7ZoHPP5ZoeZ-oUe1z-wJnl">
-      <category name="TM and RSE 2.0.1 patches (M20071030-2030)"/>
+      <category name="TM and RSE 2.0.2"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.ssh_2.0.1.v20070926-78-2_kE77Y7cAW.jar" id="org.eclipse.rse.ssh" version="2.0.1.v20070926-78-2_kE77Y7cAW">
+      <category name="TM and RSE 2.0.2"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.telnet_2.0.1.v20070704-637AAgI99h9mBW4I7B.jar" id="org.eclipse.rse.telnet" version="2.0.1.v20070704-637AAgI99h9mBW4I7B">
+      <category name="TM and RSE 2.0.2"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q">
+      <category name="TM and RSE 2.0.2"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.remotecdt_2.0.1.v20070926-4-18s733G3K5H.jar" id="org.eclipse.rse.remotecdt" version="2.0.1.v20070926-4-18s733G3K5H">
+      <category name="TM and RSE 2.0.2"/>
+   </feature>
+   <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr">
+      <category name="TM and RSE 2.0.2"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal" version="1.0.2.v20071030-1-17w31182141">
-      <category name="TM and RSE 2.0.1 patches (M20071030-2030)"/>
+      <category name="TM and RSE 2.0.2"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.serial_1.0.2.v20071030-1-17w31182141.jar" id="org.eclipse.tm.terminal.serial" version="1.0.2.v20071030-1-17w31182141">
-      <category name="TM and RSE 2.0.1 patches (M20071030-2030)"/>
+      <category name="TM and RSE 2.0.2"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.view_1.0.2.v20071023-1-17w31182134.jar" id="org.eclipse.tm.terminal.view" version="1.0.2.v20071023-1-17w31182134">
-      <category name="TM and RSE 2.0.1 patches (M20071030-2030)"/>
+      <category name="TM and RSE 2.0.2"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_1.0.2.v20071030-7_-7CAvNKwNabWDLhQglhNDDmGSL.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.2.v20071030-7_-7CAvNKwNabWDLhQglhNDDmGSL">
-      <category name="TM and RSE 2.0.1 patches (M20071030-2030)"/>
+      <category name="TM and RSE 2.0.2"/>
    </feature>
-   <category-def name="TM and RSE 2.0.1 patches (M20071030-2030)" label="TM and RSE 2.0.1 patches (M20071030-2030)">
+   <feature url="features/org.eclipse.rse.tests_2.0.1.v20070926-6-19oA55P5SAG.jar" id="org.eclipse.rse.tests" version="2.0.1.v20070926-6-19oA55P5SAG">
+      <category name="TM and RSE 2.0.2"/>
+   </feature>
+   <category-def name="TM and RSE 2.0.2" label="TM and RSE 2.0.2">
       <description>
-         Patches for features and add-ons of the 2.0.1 release of Target Management / RSE.
+         Features and add-ons of the 2.0.2 release of Target Management / RSE.
       </description>
    </category-def>
-<!-- END_2_0_1_patches -->
+<!-- END_2_0_2 -->
 <!-- BEGIN_3_0 -->
    <feature url="features/org.eclipse.rse.core_3.0.0.qualifier.jar" id="org.eclipse.rse.core" version="3.0.0.qualifier">
       <category name="TM and RSE 3.0"/>