From db74ee7fbbec45785641ffec7e6d7ed6dc01d0c9 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Wed, 9 Jun 2010 05:08:02 +0000
Subject: [PATCH] [releng] Add p2 categories

---
 .../bin/mkTestUpdates.sh                      | 27 ++++++++++---------
 .../org.eclipse.rse.updatesite/category.xml   | 26 +++++++++++++-----
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index 760626dc91a..804e6f35a42 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -501,19 +501,6 @@ if [ x${DO_STATS} = x1 ]; then
   result=$?
   echo "result: ${result}"
 fi
-echo "Creating P2 metadata (no download stats)..."
-java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-    -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
-    -updateSite ${SITE}/ \
-    -site file:${SITE}/site.xml \
-    -metadataRepository file:${SITE}/ \
-    -metadataRepositoryName "${TPVERSION} Update Site" \
-    -artifactRepository file:${SITE}/ \
-    -artifactRepositoryName "${TPVERSION} Artifacts" \
-    -compress \
-    -reusePack200Files \
-    -noDefaultIUs \
-    -vmargs -Xmx256M
 
 if [ x${DO_CATEGORIES} = x1 ]; then
   echo "Adding Categories..."
@@ -528,6 +515,20 @@ if [ x${DO_CATEGORIES} = x1 ]; then
   echo "result: ${result}"
 fi
 
+echo "Creating P2 metadata (no download stats)..."
+java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
+    -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+    -updateSite ${SITE}/ \
+    -site file:${SITE}/site.xml \
+    -metadataRepository file:${SITE}/ \
+    -metadataRepositoryName "${TPVERSION} Update Site" \
+    -artifactRepository file:${SITE}/ \
+    -artifactRepositoryName "${TPVERSION} Artifacts" \
+    -compress \
+    -reusePack200Files \
+    -noDefaultIUs \
+    -vmargs -Xmx256M
+
 cd $SITE
 chgrp -R dsdp-tmadmin .
 chmod -R g+w .
diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml
index 2016b3635fa..60d6ffff6db 100644
--- a/releng/org.eclipse.rse.updatesite/category.xml
+++ b/releng/org.eclipse.rse.updatesite/category.xml
@@ -16,23 +16,35 @@
       <category name="Terminal"/>
    </feature>
    <feature url="features/org.eclipse.tm.discovery_3.0.200.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.200.qualifier">
-      <category name="Incubation and Test"/>
+      <category name="Test and Incubation"/>
    </feature>
    <feature url="features/org.eclipse.rse.wince_0.2.100.qualifier.jar" id="org.eclipse.rse.wince" version="0.2.100.qualifier">
-      <category name="Incubation and Test"/>
+      <category name="Test and Incubation"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_3.2.0.qualifier.jar" id="org.eclipse.rse.tests" version="3.2.0.qualifier">
-      <category name="Incubation and Test"/>
+      <category name="Test and Incubation"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_3.1.100.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.100.qualifier">
-      <category name="Examples"/>
+      <category name="RSE Examples"/>
    </feature>
    <category-def name="RSE" label="RSE">
       <description>
          Remote System Explorer (RSE)
       </description>
    </category-def>
-   <category-def name="Terminal" label="Terminal"/>
-   <category-def name="Incubation and Test" label="Incubation and Test"/>
-   <category-def name="Examples" label="Examples"/>
+   <category-def name="Terminal" label="Terminal">
+      <description>
+         Stand-alone Terminal View
+      </description>
+   </category-def>
+   <category-def name="Test and Incubation" label="Test and Incubation">
+      <description>
+         Test and Incubation Plug-ins.
+      </description>
+   </category-def>
+   <category-def name="RSE Examples" label="RSE Examples">
+      <description>
+         Example code for programming against the RSE API.
+      </description>
+   </category-def>
 </site>