From b58793f811e333cfb0a19b62c76859b6e1955c25 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Sun, 8 Feb 2009 22:18:20 +0000
Subject: [PATCH] [releng] Dont build separate RSE-terminals package any more

---
 .../org.eclipse.rse.build/customTargets.xml   |  6 ------
 .../org.eclipse.rse.build/template/index.php  | 20 +++++++------------
 .../template/package.count                    |  2 +-
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index d4806471797..705a40c8be5 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -162,12 +162,6 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.terminals">
-		<property name="archiveName" value="RSE-terminals-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
 	<target name="unpackUpdateJarsForPackaging" depends="myInit">
 		<property name="tmpsite" value="${buildDirectory}/tmpsite" />
 		<mkdir dir="${tmpsite}/new/eclipse/features" />
diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php
index 283ecda73bf..06327ce8f8e 100755
--- a/releng/org.eclipse.rse.build/template/index.php
+++ b/releng/org.eclipse.rse.build/template/index.php
@@ -54,10 +54,12 @@
   <tbody>
     <tr><td><b>TM @buildId@ requires 
     	<a href="http://archive.eclipse.org/eclipse/downloads/">
-         Eclipse 3.3</a> or later for the SSH component; the SSH encoding fix
+         Eclipse 3.3</a> or later for the SSH component;</b> the SSH encoding fix
          (<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=224799">bug 224799</a>)
          requires <a href="http://download.eclipse.org/eclipse/downloads/">Eclipse 3.4</a>
          or later.
+         <b>RSE Import/Export</b> requires <b>Java 1.5</b> or higher, the rest of
+         RSE works with Java 1.4.
     </b></td></tr>
     <tr><td>
       Other components may work with earlier Eclipse versions, but these have not been tested.<br/>
@@ -68,7 +70,10 @@
     </td></tr> 
     <tr><td>
       Prerequisites for the remotecdt and discovery add-ons (CDT, EMF) can be retrieved from the
-      <a href="http://download.eclipse.org/releases/europa/">Europa Discovery Site</a>.
+      <a href="http://download.eclipse.org/releases/europa/">Europa</a>, 
+      <a href="http://download.eclipse.org/releases/ganymede/">Ganymede</a> or
+      <a href="http://download.eclipse.org/releases/galileo/">Galileo</a>
+      Discovery Sites</a>.
     </td></tr> 
 <!--
     <tr><td>
@@ -160,17 +165,6 @@
         	Tutorial code and example projects for developing against RSE SDK.
         	Includes Source.
         </td>
-    </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-terminals-@buildId@.zip">RSE-terminals-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-			Integration of the TM Terminal Widget into RSE, such that a Terminals Subsystem
-			is provided to show a tabbed view of Terminals similar to the 
-			Remote Command View. Implementations ship for Telnet and SSH, but the subsystem
-			is generic to use with other remote channels. The integration includes the
-			Terminal Widget, but requires RSE core runtime and RSE ssh or RSE telnet installed.
-        </td>
     </tr>
 	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
 		<td>All</td>
diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count
index d6b24041cf0..3c032078a4a 100755
--- a/releng/org.eclipse.rse.build/template/package.count
+++ b/releng/org.eclipse.rse.build/template/package.count
@@ -1 +1 @@
-19
+18