refactored specifiedConverter further: removed the default converter and forgot to renamed specifiedConverter to just converter

author: kmoore 2010-01-04 21:04:26 +0000
committer: kmoore 2010-01-04 21:04:26 +0000
commit: 28096602a832fbf503892b83054abcdb951e65d6 (patch)
tree: 62b1b56c3ca3a018920799cfd541e7eea3b0ed73 /jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt
parent: 5e04fff96fe69684507728dcf1732523572b6470 (diff)
download: webtools.dali-28096602a832fbf503892b83054abcdb951e65d6.tar.gz
webtools.dali-28096602a832fbf503892b83054abcdb951e65d6.tar.xz
webtools.dali-28096602a832fbf503892b83054abcdb951e65d6.zip
0 files changed, 0 insertions, 0 deletions
diff --git a/discovery/readme.txt b/discovery/readme.txt
deleted file mode 100644
index 28c4d2e1f..000000000
--- a/discovery/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The "discovery" folder holds the DSDP-TM Discovery Component.
-It depends on Eclipse Platform and Eclipse Modeling Framework (EMF).
-All these CVS modules should be named "org.eclipse.tm.discovery.*".
-See http://www.eclipse.org/dsdp/tm
diff --git a/releng/org.eclipse.rse.build/.cvsignore b/releng/org.eclipse.rse.build/.cvsignore
deleted file mode 100644
index f8b5b8240..000000000
--- a/releng/org.eclipse.rse.build/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-go.rb
diff --git a/releng/org.eclipse.rse.build/.project b/releng/org.eclipse.rse.build/.project
deleted file mode 100644
index a594b49dd..000000000
--- a/releng/org.eclipse.rse.build/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.build</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.rse.build/README_build.txt b/releng/org.eclipse.rse.build/README_build.txt
deleted file mode 100644
index 9a028475d..000000000
--- a/releng/org.eclipse.rse.build/README_build.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-Instructions for building TM and RSE
-------------------------------------
-
-1. Set up the build workspace
------------------------------
-ssh build.eclipse.org
-cd /shared/tools/tm/
-mkdir ws2_user
-cd ws2_user
-ln -s `pwd` $HOME/ws_32x
-ln -s /home/data/httpd/download.eclipse.org/tm $HOME/downloads-tm
-wget -O setup.sh "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh?revision=1.84.2.2&root=Tools_Project&pathrev=R3_2_maintenance"
-chmod a+x setup.sh
-./setup.sh
-
-
-2. Do an N-build
-----------------
-cd $HOME/ws_32x
-./doit_nightly.sh
-
-
-3. Do an I-build
-----------------
-On a local client PC, install Eclipse Platform Releng.Tools
-Have all TM plugins in the workspace (import tm-all-committer.psf)
-Synchronize CVS Workspace to HEAD
-Review all incoming changes
-Right-click > Team > Release...
-Select Mapfile "org.eclipse.rse.build"
-Press next ... tag and commit the Mapfiles
-ssh build.eclipse.org
-cd ws_32x
-./doit_irsbuild.sh I
-When build worked ok, tag org.eclipse.rse.build: e.g. I20070605-1200
-
-3a) Do an S-build
------------------
-Just like I-build, but also update 
-   org.eclipse.rse.build/template/buildNotes.php
-ssh build.eclipse.org
-cd ws_32x
-./doit_irsbuild.sh S 2.0RC3
-
-3b) Promote an S-build to official
-----------------------------------
-After testing the "invisible" S-build:
-ssh build.eclipse.org
-cd ws_32x/publish/S-3.1RC3*
-mv package.count.orig package.count
-
-3c) Promote an update site
---------------------------
-Any build generates its update site in $HOME/downlads-tm/testUpdates
-and $HOME/downloads-tm/signedUpdates . You need to manually copy these
-to its target repository, then re-generate repository metadata:
-
-cd $HOME/downloads-tm/updates/3.1milestones
-rm -rf plugins features
-cp -R ../../signedUpdates/plugins .
-cp -R ../../signedUpdates/features .
-cd bin
-cvs update
-./mkTestUpdates
-
-3d) Promote an S-build to Galileo
---------------------------------
-After S-build has been prepared (on signedUpdates)
-On local Eclipse client, checkout Galileo projects according to
-    http://wiki.eclipse.org/Galileo_Build
-and edit the build contribution.
-
-4) Convert a download to "signed" form
---------------------------------------
-Normally, only the TM update site is signed whereas the downloadable ZIPs
-are not. Downloadable ZIPs can be converted to signed, if the signed
-update site is available and installed. See
-
- org.eclipse.rse.build/bin/make_signed.sh
- 
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/about.html b/releng/org.eclipse.rse.build/about.html
deleted file mode 100644
index d4cc693f9..000000000
--- a/releng/org.eclipse.rse.build/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/archive/.cvsignore b/releng/org.eclipse.rse.build/archive/.cvsignore
deleted file mode 100644
index a17291e0f..000000000
--- a/releng/org.eclipse.rse.build/archive/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-drops
diff --git a/releng/org.eclipse.rse.build/archive/build_types.html b/releng/org.eclipse.rse.build/archive/build_types.html
deleted file mode 100644
index 131c40e84..000000000
--- a/releng/org.eclipse.rse.build/archive/build_types.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<title>Eclipse Corner</title>
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000">
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font face="Arial,Helvetica" color="#ffffff">Eclipse 
-      Project Build Types</font></b></td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td> 
-      <p><b><font face="arial,helvetica,geneva" size="-1">Releases</font></b> 
-        <br>
-        <font size="-1" face="arial,helvetica,geneva">Releases are builds 
-        that have been declared major releases by the development team - for example 
-        &quot;R1.0&quot;. Releases are the right builds for people who want to 
-        be on a stable, tested release, and don't need the latest greatest features 
-        and improvements. Release builds always have an &quot;R&quot; at the beginning 
-        of the name i.e. R1.0, R2.0 etc. Non-release builds are named according to the 
-        date of the build - for example 20060427 is the build from April 27, 2006.</font><br>
-      </p>
-    </td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">Stable Builds</font></b> 
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Stable builds are integration 
-      builds that have been found to be stable enough for most people to use. 
-      They are promoted from integration build to stable build by the architecture 
-      team after they have been used for a few days and deemed reasonably stable. 
-      The latest stable build is the right build for people who want to stay up 
-      to date with what is going on in the latest development stream, and don't 
-      mind putting up with a few problems n in order to get the latest greatest 
-      features and bug fixes. The latest stable build is the one the development 
-      team likes people to be using, because of the valuable and timely feedback. 
-      </font></td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td>
-      <p><b><font face="arial,helvetica,geneva" size="-1">Integration Builds</font></b> 
-        <br>
-        <font size="-1" face="arial,helvetica,geneva"> Periodically, component 
-        teams version off their work in what they believe is a stable, consistent 
-        state, and they update the build configuration to indicate that the next 
-        integration build should take this version of the component. Integration 
-        builds are built from these stable component versions that have been specified 
-        by each component team as the best version available. Integration builds 
-        may be promoted to stable builds after a few days of testing. Integration 
-        builds are built whenever new stable component versions are released into 
-        the build.</font></p>
-      </td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">Nightly Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Nightly builds are produced 
-      every night from whatever has been released into the HEAD stream of the 
-      CVS repository. They are completely untested and will almost always have 
-      major problems. Many will not work at all. These drops are normally only 
-      useful to developers actually working on the Eclipse Project.</font></td>
-  </tr>
-  <tr>
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">Maintenance Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Maintenance builds are produced
-       periodically to incorporate fixes into an existing release. They are typically
-       built from tagged plug-in and feature pojects in a maintenance stream of the CVS 
-       repository (i.e. R1_0_maintenance). Maintenance builds are promoted to a minor 
-       or service release (i.e. R1.1 or R1.0.1) after development teams have deemed one 
-       to be stable following one or more test-fix pass cycles.</font></td>
-  </tr> 
-</table>
-<h3>&nbsp;</h3>
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/archive/dlconfig.txt b/releng/org.eclipse.rse.build/archive/dlconfig.txt
deleted file mode 100644
index dd682ba91..000000000
--- a/releng/org.eclipse.rse.build/archive/dlconfig.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-dropPrefix[]=R&dropPrefix[]=S&
-dropType[]=Archived Release&dropType[]=Archived Stable Build&
diff --git a/releng/org.eclipse.rse.build/archive/index.php b/releng/org.eclipse.rse.build/archive/index.php
deleted file mode 100644
index 23a1a7c45..000000000
--- a/releng/org.eclipse.rse.build/archive/index.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<html><head>
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css">
-<title>Target Management Project Archived Downloads</title></head>
-<body>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=left width="72%"> <font class=indextop>Target Management project<br/>archived downloads</font> 
-      <br>
-      <font class=indexsub>archived downloads from the TM project</font><br>
-</td>
-    <td width="28%"><img src="http://www.eclipse.org/images/Idea.jpg" height=86 width=120></td>
-  </tr>
-
-</table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-	
-	<tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Archived Downloads</font></b></td>
-  </tr>
-  
-	<tr> <td> <p>On this
-page you can find the archived 
-<a href="build_types.html">builds</a> for the Remote System Explorer (RSE),
-provided by the 
-<a href="http://www.eclipse.org/tm/">Target Management</a> project.
-Archived builds consist of older releases and not propagated to Eclipse mirrors. 
-<!--
-To get started run the program and go through the
-user and developer documentation provided in the online help system.
--->
-To get started, see the build notes provided with each drop, run the
-program and go through the online user and developer documentation,
-or take a look at the project's online
-<a href="http://www.eclipse.org/tm/tutorial/index.php">getting started</a>
-pages.
-
-If you have problems downloading the drops, contact the 
-<font face="arial,helvetica,geneva" size="-1"><a href="mailto:webmaster@eclipse.org">webmaster</a></font>.
-If you have problems installing or getting the workbench to run, 
-check out the 
-<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">Target Management FAQ</a>,
-or try posting a question to the 
-<a href="http://www.eclipse.org/forums/eclipse.tm">eclipse.tm Forum</a>.
-All downloads are provided under the terms and conditions of the 
-<a href="http://www.eclipse.org/legal/epl/notice.php">Eclipse.org
-Software User Agreement</a> unless otherwise specified. </p>
-
-<p>
-Current builds are available 
-<a href="http://download.eclipse.org/tm/downloads/index.php">here</a>.
-For information about different kinds of builds look
-<a href="build_types.html" target="_top">here</a>. 
-</p>
-
-<p/>
-</td></tr>
-	
-  <tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Archived
-      Downloads</font></b></td>
-  </tr>
-  </table>
-  <?php
-	$fileHandle = fopen("dlconfig.txt", "r");
-	while (!feof($fileHandle)) {
-		$aLine = fgets($fileHandle, 4096);
-		parse_str($aLine);
-	}
-	fclose($fileHandle);
-	
-	for ($i = 0; $i < count($dropType); $i++) {
-		$typeToPrefix[$dropType[$i]] = $dropPrefix[$i];
-	}
-	
-	$aDirectory = dir("drops");
-	while ($anEntry = $aDirectory->read()) {
-
-		// Short cut because we know aDirectory only contains other directories.
-		if ($anEntry != "." && $anEntry!="..") {
-			$aDropDirectory = dir("drops/".$anEntry);
-			$fileCount = 0;
-			while ($aDropEntry = $aDropDirectory->read()) {
-				if (stristr($aDropEntry, ".zip") || stristr($aDropEntry, ".tar")) {
-					// Count the files in the directory
-					$fileCount = $fileCount + 1;
-				}
-			}
-			//See http://at2.php.net/manual/en/class.dir.php
-			$aDropDirectory->close();
-			// Read the count file
-			$countFile = "drops/".$anEntry."/package.count";
-			$indexFile = "drops/".$anEntry."/index.php";
-			if (file_exists($countFile) && file_exists($indexFile)) {
-				$anArray = file($countFile);
-	
-				// If a match - process the directory
-				if ($anArray[0] == $fileCount) {
-					$parts = explode("-", $anEntry);
-					if (count($parts) == 2) {
-
-						//N-builds and I-builds	
-						$datePart = $parts[0];
-						$timePart = $parts[1];
-						$buildtype = substr($datePart, 0, 1);
-						$buckets[$buildtype][] = $anEntry;
-			
-						$year = substr($datePart, 1, 4);
-						$month = substr($datePart, 5, 2);
-						$day = substr($datePart, 7, 2);
-						$hour = substr($timePart,0,2);
-						$minute = substr($timePart,2,2);
-						$timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
-					
-						$timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
-			
-						if ($timeStamp > $latestTimeStamp[$buildtype]) {
-							$latestTimeStamp[$buildtype] = $timeStamp;
-							$latestFile[$buildtype] = $anEntry;
-						}
-
-					} else if (count($parts) == 3) {
-
-						//S-builds and R-builds
-						$buckets[$parts[0]][] = $anEntry;
-			
-						$timePart = $parts[2];
-						$year = substr($timePart, 0, 4);
-						$month = substr($timePart, 4, 2);
-						$day = substr($timePart, 6, 2);
-						$hour = substr($timePart,8,2);
-						$minute = substr($timePart,10,2);
-						$timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
-					
-						$timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
-			
-						if ($timeStamp > $latestTimeStamp[$parts[0]]) {
-							$latestTimeStamp[$parts[0]] = $timeStamp;
-							$latestFile[$parts[0]] = $anEntry;
-						}
-					}
-				}
-			}
-		}
-	}
-	$aDirectory->close();
- ?>
- 
-<table width="100%" cellspacing=0 cellpadding=3 align=center>
-<td align=left>
-<TABLE  width="100%" CELLSPACING=0 CELLPADDING=3>
-<tr>
-	<td width=\"30%\"><b>Build Type</b></td>
-	<td><b>Build Name</b></td>
-	<td><b>Build Date</b></td>
-</tr>
-
-<?php
-	foreach($dropType as $value) {
-		$prefix=$typeToPrefix[$value];
-		$fileName = $latestFile[$prefix];
-		echo "<tr>
-			<td width=\"30%\">$value</td>";
-		
-		$parts = explode("-", $fileName);
-		if (count($parts) == 2) {
-			$buildName=$fileName;
-		} else {
-			$buildName=$parts[1];
-		}
-		
-		// Uncomment the line below if we need click through licenses.
-		// echo "<td><a href=license.php?license=drops/$fileName>$buildName</a></td>";
-		
-		// Comment the line below if we need click through licenses.
-		echo "<td><a href=\"drops/$fileName/index.php\">$buildName</a></td>";
-		
-		echo "<td>$timeStamps[$fileName]</td>";
-		echo "</tr>";
-	}
-?>
-</table>
-</table>
-&nbsp;
-<?php
-	foreach($dropType as $value) {
-		$prefix=$typeToPrefix[$value];
-		echo "
-		<table width=\"100%\" cellspacing=0 cellpadding=3 align=center>
-		<tr bgcolor=\"#999999\">
-		<td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value";
-		echo "s</font></b></a></td>
-		</TR>
-		<TR>
-		<td align=left>
-		<TABLE  width=\"100%\" CELLSPACING=0 CELLPADDING=3>
-		<tr>
-		<td width=\"30%\"><b>Build Name</b></td>
-		<td><b>Build Date</b></td>
-		</tr>";
-		
-		$aBucket = $buckets[$prefix];
-		if (isset($aBucket)) {
-			rsort($aBucket);
-			foreach($aBucket as $innerValue) {
-				$parts = explode("-", $innerValue);
-				if (count($parts) == 2) {
-					$buildName=$innerValue;
-				} else {
-					$buildName=$parts[1];
-				}
-				echo "<tr>";
-				
-					// Uncomment the line below if we need click through licenses.
-					// echo "<td><a href=\"license.php?license=drops/$innerValue\">$buildName</a></td>";
-					
-					// Comment the line below if we need click through licenses.
-					echo "<td><a href=\"drops/$innerValue/index.php\">$buildName</a></td>";
-
-					echo "<td>$timeStamps[$innerValue]</td>
-					</tr>";
-			}
-		}
-		echo "</table></table>&nbsp;";
-	}
-?>
-
-&nbsp;
-</body></html>
diff --git a/releng/org.eclipse.rse.build/bin/batch_sign.sh b/releng/org.eclipse.rse.build/bin/batch_sign.sh
deleted file mode 100755
index a3f2bce82..000000000
--- a/releng/org.eclipse.rse.build/bin/batch_sign.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#:#
-#:# Script to sign all ZIP files in a directory
-#:#
-#:# Usage:
-#:#    batch_sign.sh {directory}
-#:# Examples:
-#:#    batch_sign.sh publish/S-1.0M5-200611100500
-
-#nothing we do should be hidden from the world
-umask 22
-
-#Use Java5 on build.eclipse.org
-#export PATH=/shared/tools/tm/jdk-1.5/bin:$PATH
-export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
-#export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
-
-curdir=`pwd`
-
-#Get parameters
-dirToSign=$1
-usage=0
-if [ "$dirToSign" = "" ]; then
-  usage=1
-elif [ ! -d "$dirToSign" ]; then
-  usage=1
-fi
-if [ $usage = 1 ]; then
-  grep '^#:#' $0 | grep -v grep | sed -e 's,^#:#,,'
-  exit 0
-fi
-
-#sign the zipfiles
-cd "$dirToSign"
-RDIR=`pwd`
-mkdir -p signed
-nameToSign=`basename $RDIR`
-ZIPS=`ls *.zip *.jar`
-STAGING=/home/data/httpd/download-staging.priv/tools/tm
-STDIR=${STAGING}/${nameToSign}
-mkdir -p ${STDIR}
-cp ${ZIPS} ${STDIR}
-cd ${STDIR}
-mkdir out
-for x in $ZIPS ; do
-  sign $x nomail ${STDIR}/out
-done
-echo "Waiting for signature..."
-sleep 300
-TRIES=20
-MISSING="$ZIPS"
-while [ "$MISSING" != "" -a ${TRIES} -gt 0 ]; do
-  MISSING_NEW=""
-  sleep 60
-  for x in $MISSING ; do
-    if [ -f ${STDIR}/out/$x ]; then
-      echo "Done: TRIES=${TRIES}, $x"
-      cp -f ${STDIR}/out/$x ${RDIR}/signed/$x
-      chmod ugo+r ${RDIR}/signed/$x
-    else
-      MISSING_NEW="${MISSING_NEW} $x"
-    fi
-  done
-  echo "Signed: TRIES=${TRIES}, Missing ${MISSING_NEW}"
-  MISSING="${MISSING_NEW}"
-  TRIES=`expr $TRIES - 1`
-done
-rm -rf ${STDIR}
-
-cd "$curdir"
-if [ "$MISSING" != "" ]; then
-  echo "batch_sign failed: ${MISSING}"
-  exit 1
-fi
-echo "batch_sign complete"
-exit 0
diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
deleted file mode 100755
index 8e3c2d6c8..000000000
--- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#:#
-#:# Bootstrapping script to perform S-builds and R-builds on build.eclipse.org
-#:# Will build based on HEAD of all mapfiles, and update the test32Updates as well
-#:#
-#:# Usage:
-#:#    doit_irsbuild.sh {buildType} [buildId] [maptag]
-#:# Examples:
-#:#    doit_irsbuild.sh R 1.0
-#:#    doit_irsbuild.sh S 1.0M5 S1_0M5
-#:#    doit_irsbuild.sh I
-
-#nothing we do should be hidden from the world
-umask 22
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-echo ${mydir}
-
-#Use Java5 on build.eclipse.org
-#export PATH=/shared/tools/tm/jdk-1.5/bin:$PATH
-export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
-#export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
-
-
-#Get parameters
-mapTag=HEAD
-buildType=$1
-buildId=$2
-case x$buildType in
-  xP|xN|xI|xS) ok=1 ;;
-  xR|xM) mapTag=R3_2_maintenance ; ok=1 ;;
-  xJ) mapTag=R3_1_maintenance ; ok=1 ;;
-  xK|xL) mapTag=R3_0_maintenance ; ok=1 ;;
-  *) ok=0 ;;
-esac
-if [ "$3" != "" ]; then
-  mapTag=$3
-fi
-if [ $ok != 1 ]; then
-  grep '^#:#' $0 | grep -v grep | sed -e 's,^#:#,,'
-  cd ${curdir}
-  exit 0
-fi
-
-#Remove old logs and builds
-echo "Removing old logs and builds..."
-cd $HOME/ws_32x
-#rm log-*.txt
-if [ -d working/build ]; then
-  rm -rf working/build
-fi
-if [ -d working/package ]; then
-  rm -rf working/package
-fi
-
-#Do the main job
-echo "Updating builder from CVS..."
-cd org.eclipse.rse.build
-stamp=`date +'%Y%m%d-%H%M'`
-CHANGES=`cvs -nq update -r ${mapTag} | head -1`
-if [ "${CHANGES}" = "" ]; then
-  echo "Build ${buildType}${buildId} : ${mapTag} : ${stamp}"
-  echo "Build canceled, no mapfile or config changed in org.eclipse.rse.build."
-  exit 0
-fi
-log=$HOME/ws_32x/log-${buildType}$stamp.txt
-touch $log
-#cvs -q update -RPd >> $log 2>&1
-cvs -q update -r ${mapTag} -RPd >> $log 2>&1
-daystamp=`date +'%Y%m%d*%H'`
-
-echo "Running the builder..."
-./nightly.sh ${mapTag} ${buildType} ${buildId} >> $log 2>&1
-tail -30 $log
-
-#update the main download and archive pages: build.eclipse.org only
-if [ -d /home/data/httpd/archive.eclipse.org/tm/downloads ]; then
-  cd /home/data/httpd/archive.eclipse.org/tm/downloads
-  cvs -q update -RPd >> $log 2>&1
-  chgrp tools.tm * CVS/* 2>/dev/null
-  cd /home/data/httpd/download.eclipse.org/tm/downloads
-  cvs -q update -RPd >> $log 2>&1
-  chgrp tools.tm * CVS/*
-
-  #Fixup permissions and group id on download.eclpse.org (just to be safe)
-  echo "Fixup: chgrp -R tools.tm drops/${buildType}*${daystamp}*"
-  chgrp -R tools.tm drops/${buildType}*${daystamp}*
-  chmod -R g+w drops/${buildType}*${daystamp}*
-fi
-
-#Check the publishing
-cd $HOME/ws_32x/publish
-DIRS=`ls -dt ${buildType}*${daystamp}* | head -1 2>/dev/null`
-cd ${DIRS}
-FILES=`ls RSE-SDK-*.zip 2>/dev/null`
-echo "FILES=$FILES"
-if [ -f package.count -a "$FILES" != "" ]; then
-  echo "package.count found, release seems ok"
-  if [ ${buildType} = S -o ${buildType} = R ]; then
-    #hide the release for now until it is tested
-    #mirrors will still pick it up
-    mv package.count package.count.orig
-    #Do not sign stable or R-builds since we want that signing done 
-    #via the update site in order to ensure that features get signed
-    #DO_SIGN=1
-  fi
-  
-  # Always sign maintenance builds for immediate consumption in patches
-  case x${buildType} in
-    xJ|xK|xL|xM)  DO_SIGN=1 ;;
-  esac
-  
-  #if [ "$DO_SIGN" = "1" ]; then
-    #sign the zipfiles
-    #temporarily disabled, this is not a good use of processing power!
-    #mkdir signer
-    #cp rseserver-*-windows.zip signer
-    #cd signer
-    #${mydir}/batch_sign.sh `pwd`
-    #cd ..
-  #fi
-
-  if [ ${buildType} = N -a -d ../N.latest ]; then
-    #update the doc server
-    rm -f ../N.latest/RSE-*.zip
-    rm -f ../N.latest/TM-*.zip
-    cp -f RSE-SDK-*.zip ../N.latest/RSE-SDK-latest.zip
-    cp -f TM-discovery-*.zip ../N.latest/TM-discovery-latest.zip
-    chgrp tools.tm ../N.latest/*.zip
-    chmod g+w ../N.latest/*.zip
-    if [ -d /shared/tools/tm/public_html/tm/downloads/drops/N.latest ]; then
-      cp -f ../N.latest/* /shared/tools/tm/public_html/tm/downloads/drops/N.latest/
-      chmod -R g+w /shared/tools/tm/public_html/tm/downloads/drops
-    fi
-  fi
-
-  if [ ${buildType} != N ]; then
-      #Update the test32Updates site
-      echo "Refreshing update site"
-      cd $HOME/downloads-tm/test32Updates/bin
-      cvs update
-      ./mkTestUpdates.sh
-      #Update the signed32Updates site
-      echo "Refreshing signed32Updates site"
-      cd $HOME/downloads-tm/signed32Updates/bin
-      cvs update
-      ./mkTestUpdates.sh
-  fi
-  
-  cd "$curdir"
-else
-  echo "package.count missing, release seems failed"
-fi
-chgrp tools.tm $log
diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh
deleted file mode 100755
index 84950208d..000000000
--- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2010 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#Bootstrapping script to perform N-builds on build.eclipse.org
-
-#nothing we do should be hidden from the world
-umask 22
-
-#Use Java5 on build.eclipse.org
-#export PATH=/shared/tools/tm/jdk-1.5/bin:$PATH
-export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
-#export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH
-
-curdir=`pwd`
-
-#Remove old logs and builds
-echo "Removing old logs and builds..."
-cd $HOME/ws_32x
-rm log-N*.txt
-if [ -d working/build ]; then
-  rm -rf working/build
-fi
-if [ -d working/package ]; then
-  rm -rf working/package
-fi
-
-#Do the main job
-echo "Updating builder from CVS..."
-cd org.eclipse.rse.build
-stamp=`date +'%Y%m%d-%H%M'`
-log=$HOME/ws_32x/log-N$stamp.txt
-touch $log
-cvs -q update -RPd >> $log 2>&1
-daystamp=`date +'%Y%m%d-%H'`
-
-echo "Running the builder..."
-./nightly.sh >> $log 2>&1
-tail -30 $log
-
-#update the main download and archive pages: build.eclipse.org only
-if [ -d /home/data/httpd/archive.eclipse.org/tm/downloads ]; then
-  cd /home/data/httpd/archive.eclipse.org/tm/downloads
-  cvs -q update -RPd >> $log 2>&1
-  chgrp tools.tm * CVS/* 2>/dev/null
-  cd /home/data/httpd/download.eclipse.org/tm/downloads
-  cvs -q update -RPd >> $log 2>&1
-  chgrp tools.tm * CVS/* 2>/dev/null
-
-  #Fixup permissions and group id on download.eclpse.org (just to be safe)
-  chgrp -R tools.tm drops/${buildType}*${daystamp}* 2>/dev/null
-  chmod -R g+w drops/${buildType}*${daystamp}* 2>/dev/null
-fi
-
-#Copy latest SDK in order to give access to DOC server
-cd $HOME/ws_32x/publish
-if [ -d N.latest ]; then
-  FILES=`ls -t N${daystamp}*/RSE-SDK-N${daystamp}*.zip | head -1 2>/dev/null`
-  echo "FILES=$FILES"
-  if [ "$FILES" != "" ]; then
-    rm N.latest/RSE-SDK-N*.zip 2>/dev/null
-    cd `dirname ${FILES}`
-    cp -f RSE-SDK-N*.zip ../N.latest/RSE-SDK-latest.zip
-    cp -f TM-discovery-*.zip ../N.latest/TM-discovery-latest.zip
-    cd ../N.latest
-    chgrp tools.tm *.zip
-    chmod g+w *.zip
-    if [ -d /shared/tools/tm/public_html/tm/downloads/drops/N.latest ]; then
-      cp -f * /shared/tools/tm/public_html/tm/downloads/drops/N.latest/
-      chmod -R g+w /shared/tools/tm/public_html/tm/downloads/drops
-    fi
-  fi
-fi
-
-#Cleanup old nightly builds (leave only last 5 in place)
-cd $HOME/ws_32x/publish
-ls -d N201* | sort | head -n-5 | xargs rm -rf
-
diff --git a/releng/org.eclipse.rse.build/bin/make_signed.sh b/releng/org.eclipse.rse.build/bin/make_signed.sh
deleted file mode 100755
index ab4acbb13..000000000
--- a/releng/org.eclipse.rse.build/bin/make_signed.sh
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-#  Copyright (c) 2008, 2010 Wind River Systems, Inc. and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#  Martin Oberhuber (Wind River) - initial API and implementation
-#*******************************************************************************
-#
-# Usage: make sure that appropriate signed update site is referenced in UPDATE_SITE,
-# and current directory is a download. Will create signed downloads in subdirectory.
-#
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-cd "${curdir}"
-tmpdir=/tmp/${USER}.$$
-
-# Accept environment variables set outside the script
-if [ "${UPDATE_SITE}" = "" ]; then
-  UPDATE_SITE=$HOME/downloads-tm/updates/3.2milestones
-fi
-if [ "${SIGNED_JAR_SOURCE}" = "" ]; then
-  SIGNED_JAR_SOURCE=${tmpdir}/eclipse_ext/tm
-fi
-if [ "${BASEBUILDER}" = "" ]; then
-  BASEBUILDER=$HOME/ws_32x/eclipse
-fi
-if [ "${DROPDIR}" = "" ]; then
-  DROPDIR=${curdir}
-fi
-have_sdk=`ls ${DROPDIR} | grep 'RSE-SDK.*zip$'`
-if [ "${have_sdk}" = "" ]; then
-  echo "No drop found in DROPDIR. Please cd to your drop, or setenv DROPDIR."
-  exit 1
-fi
-echo ""
-echo "Making a TM/RSE drop signed, based on an update site."
-echo ""
-echo "UPDATE_SITE: ${UPDATE_SITE}"
-echo "SIGNED_JAR_SOURCE: ${SIGNED_JAR_SOURCE}"
-echo "BASEBUILDER: ${BASEBUILDER}"
-echo "DROPDIR: ${DROPDIR}"
-echo ""
-if [ "$1" != "-go" ]; then
-  echo "use -go to actually perform the operation."
-  exit 0
-fi
-
-#Use Java5 on build.eclipse.org
-#export PATH=/shared/tools/tm/jdk-1.5/bin:$PATH
-export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
-#export PATH=${HOME}/ws_32x/IBMJava2-ppc-142/bin:$PATH
-
-if [ ! -d ${tmpdir} ]; then
-  mkdir -p ${tmpdir}
-  if [ ! -d ${tmpdir} ]; then
-    echo "ERROR: could not create tmpdir in ${tmpdir}"
-    exit 1
-  fi
-fi
-OUTPUT=${tmpdir}/output.$$
-RESULT=${tmpdir}/result.$$
-TMPD=${tmpdir}/tmp.$$
-
-# Provision update site into SIGNED_JAR_SOURCE
-cd ${tmpdir}
-if [ ! -d "${SIGNED_JAR_SOURCE}/eclipse" ]; then
-  mkdir -p "${SIGNED_JAR_SOURCE}/eclipse"
-  echo "Provisioning with repo2runnable..."
-  ${BASEBUILDER}/eclipse -nosplash \
-    -data install-ws -consolelog -clean \
-    -application org.eclipse.equinox.p2.repository.repo2runnable \
-    -source file:${UPDATE_SITE} \
-    -destination file:${SIGNED_JAR_SOURCE}/eclipse \
-    -vmargs \
-      -Xms128M -Xmx256M -XX:PermSize=128M -XX:MaxPermSize=256M 
-  retval=$?
-  echo "result: ${retval}"
-fi
-
-if [ ! -d ${SIGNED_JAR_SOURCE}/server ]; then
-  mkdir ${SIGNED_JAR_SOURCE}/server
-fi
-have_server=`ls "${SIGNED_JAR_SOURCE}"/server/*.jar 2>/dev/null`
-if [ "${have_server}" = "" ]; then
-  signed_server=""
-  if [ -d "${DROPDIR}/signed" ]; then
-    signed_server=`ls ${DROPDIR}/signed | grep 'rseserver-.*\.zip'`
-  fi
-  if [ "${signed_server}" = "" ]; then
-    win_server=`ls ${DROPDIR} | grep 'rseserver-.*-windows\.zip'`
-    if [ "${win_server}" = "" ]; then
-      echo "Error: No rseserver found in DROPDIR."
-      cd ${curdir}
-      rm -rf ${tmpdir}
-      exit 1
-    fi
-    if [ ! -d /home/data/httpd/download-staging.priv/tools/tm ]; then
-      echo "Error: Must run on build.eclipse.org to sign"
-    fi
-    cd /home/data/httpd/download-staging.priv/tools/tm
-    SIGN_TMP=tmp.$$
-    mkdir ${SIGN_TMP}
-    cd ${SIGN_TMP}
-    cp ${DROPDIR}/${win_server} .
-    sign ${win_server} nomail `pwd`/out
-    while [ ! -f out/${win_server} ]; do
-      echo "Waiting for sign..."
-      sleep 30
-    done
-    unzip out/${win_server} clientserver.jar
-    result=`jarsigner -verify clientserver.jar | head -1`
-    while [ "$result" != "jar verified." ]; do
-      echo "Waiting for verification..."
-      sleep 30
-      unzip out/${win_server} clientserver.jar
-      result=`jarsigner -verify clientserver.jar | head -1`
-    done
-    signed_server=`echo ${win_server} | sed -e 's,-windows,-windows-signed,'`
-    echo "Signing OK, copy to ${tmpdir}/signed/${signed_server}"
-    mkdir -p ${tmpdir}/signed
-    cp out/${win_server} ${tmpdir}/signed/${signed_server}
-    cd ..
-    rm -rf ${SIGN_TMP}
-  fi
-  cd ${SIGNED_JAR_SOURCE}/server
-  if [ -f ${tmpdir}/signed/${signed_server} ]; then
-    unzip ${tmpdir}/signed/${signed_server}
-  elif [ -f {$DROPDIR}/signed/${signed_server} ]; then
-    unzip ${DROPDIR}/signed/${signed_server}
-  fi
-  have_server=`ls *.jar 2>/dev/null`
-  cd "${curdir}"
-  if [ "${have_server}" = "" ]; then
-    echo 'ERROR: signed rseserver-*.zip not found!'
-    echo "Please sign a server zip on build.eclipse.org, upload and retry."
-    rm -rf ${tmpdir}
-    exit 1
-  fi
-fi
-
-if [ ! -d ${TMPD} ]; then
-  mkdir -p ${TMPD} 
-fi
-if [ ! -d ${OUTPUT} ]; then
-  mkdir -p ${OUTPUT} 
-fi
-if [ ! -d ${RESULT} ]; then
-  mkdir -p ${RESULT} 
-fi
-cd ${DROPDIR}
-for zip in `ls *.zip *.tar` ; do
-  cd ${TMPD}
-  case ${zip} in
-    *.zip) unzip -q ${DROPDIR}/${zip} ;;
-    *.tar) tar xf ${DROPDIR}/${zip} ;;
-  esac
-  case ${zip} in
-    rseserver*) SIGNED_JARS=${SIGNED_JAR_SOURCE}/server ;;
-    *) SIGNED_JARS=${SIGNED_JAR_SOURCE} ;;
-  esac
-  REF=`find . -name 'epl-v10.html'`
-  FILES=`find . -name '*.jar' -o -name 'META-INF'`
-  for f in ${FILES} ; do
-    printf "${f}: "
-    if [ -f ${SIGNED_JARS}/${f} ]; then
-      cp -f ${SIGNED_JARS}/${f} ./${f}
-      touch -r ${REF} ./${f}
-      echo "signed"
-    elif [ -d ${SIGNED_JARS}/${f} ]; then
-      cp -Rf ${SIGNED_JARS}/${f}/* ${f}
-      touch -r ${REF} ${f}/*
-      echo "signed"
-    else
-      echo "."
-    fi
-  done
-  ##cp ${curdir}/${zip} ${OUTPUT}
-  case ${zip} in
-    *.zip) zip -r -o -q ${OUTPUT}/${zip} * ;;
-    *.tar) tar cfv ${OUTPUT}/${zip} * ; touch -r ${REF} ${OUTPUT}/${zip};
-  esac
-  rm -rf *
-  signed_server=`ls "${OUTPUT}" | grep 'rseserver-.*-signed\.zip'`
-  if [ "${signed_server}" != "" ]; then
-    rm "${OUTPUT}/${signed_server}"
-  fi
-  cd ${RESULT}
-  case ${zip} in
-     rseserver*) mkdir ${zip} ; cd ${zip} ;
-        case ${zip} in
-           *.zip) unzip -q -o ${OUTPUT}/${zip} ;;
-           *.tar) tar xf ${OUTPUT}/${zip} ;;
-        esac
-        ;;
-     *) unzip -q -o ${OUTPUT}/${zip} ;;
-  esac
-done
-rm -rf ${TMPD}
-
-echo "--------------------------------------"
-echo "DONE"
-echo "--------------------------------------"
-cd "${DROPDIR}"
-echo "MAIN:---------------------------------"
-diff -r ${RESULT} ${SIGNED_JAR_SOURCE}
-for f in `ls rseserver-*.zip rseserver-*.tar` ; do
-  echo "${f}:-----------------------------------"
-  diff -r -b ${RESULT}/${f} ${SIGNED_JAR_SOURCE}/server
-done
-cd "${curdir}"
-echo ""
-echo "ls ${OUTPUT}"
-ls ${OUTPUT}
-echo ""
-cd "${DROPDIR}"
-if [ ! -d ${DROPDIR}.unsigned ]; then
-  DROPBASE=`basename "${DROPDIR}"`
-  mkdir ../${DROPBASE}.unsigned
-  tar cf - . | (cd ../${DROPBASE}.unsigned ; tar xf -) 
-  chmod -R g+w ../${DROPBASE}.unsigned
-fi
-echo "cp -f ${OUTPUT}/* ."
-echo "rm -rf ${tmpdir}"
diff --git a/releng/org.eclipse.rse.build/bin/rename_build.sh b/releng/org.eclipse.rse.build/bin/rename_build.sh
deleted file mode 100755
index bfe98133e..000000000
--- a/releng/org.eclipse.rse.build/bin/rename_build.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Wind River Systems, Inc - initial API and implementation
-#*******************************************************************************
-#
-## Rename a build for release
-## usage:
-##     cd drops/I20090916-0905
-##     rename_build.sh R 3.1.1 200909160905
-##
-## Creates ../R-3.1.1-200909160905 and prepares renamed build there
-#
-case x$1 in
-  xR) tgtBuild=Release ;;
-  xM) tgtBuild=Maintenance ;;
-  xI) tgtBuild=Integration ;;
-  xS) tgtBuild=Stable ;;
-  *) grep '^##' $0
-        exit 0
-        ;;
-esac
-tgtType=$1
-tgtVer=$2
-tgtDate=$3
-tgtDir=${tgtType}-${tgtVer}-${tgtDate}
-
-if [ ! -f package.count ]; then
-  echo ERROR: package.count not found. Please cd to source build before running.
-  exit 1
-fi
-if [ -d ../$tgtDir ]; then
-  echo ERROR: target dir ../$tgtDir already exists
-  exit 1
-fi
-srcVer=`ls RSE-SDK-*.zip | sed -e 's,RSE-SDK-,,' -e 's,\.zip,,'`
-if [ ! -f RSE-runtime-${srcVer}.zip ]; then
-  echo ERROR: RSE-runtime-${srcVer}.zip not found, incorrect source?
-  exit 1
-fi
-echo "Renaming Release: ${srcVer} --> ${tgtVer} into ../${tgtDir}"
-
-mkdir ../${tgtDir}
-for x in `ls` ; do
-  if [ -f ${x} ]; then
-    case $x in
-    *-signed.zip)
-      ;;
-    *.zip|*.tar)
-      y=`echo $x | sed -e "s,${srcVer},${tgtVer},"`
-      cp ${x} ../${tgtDir}/${y}
-      ;;
-    index.php|buildNotes.php)
-      cat ${x} | sed -e "s,/${srcVer},/${tgtDir},g" \
-        -e "s,${srcVer},${tgtVer},g" \
-        -e "/TM/s,Integration,${tgtBuild},g" \
-        -e "/TM/s,Maintenance,${tgtBuild},g" \
-        -e "/TM/s,Stable,${tgtBuild},g" \
-        > ../${tgtDir}/${x}
-      ;;
-    package.count)
-      cp ${x} ../${tgtDir}/${x}.orig
-      ;;
-    *)
-      cp ${x} ../${tgtDir}/${x}
-      ;;
-    esac
-  fi
-done
-
-echo ""
-echo "Done, dont forget to rename package.count.orig into package.count when verified."
-echo ""
diff --git a/releng/org.eclipse.rse.build/bin/update_global_cvs_tags.sh b/releng/org.eclipse.rse.build/bin/update_global_cvs_tags.sh
deleted file mode 100755
index 859388a1c..000000000
--- a/releng/org.eclipse.rse.build/bin/update_global_cvs_tags.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2007, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber (Wind River) - initial API and implementation
-#*******************************************************************************
-#
-# This script can be used to apply a release tag or branch tag globally
-# to those files of the TM CVS Repository that are usually not seen. It
-# needs to run from command-line because under Eclipse, these top-level
-# modules and files would require checking out the entire TM module tree;
-# from commandline, this works with checking out the top-level directories
-# only.
-#
-# These files are named "readme.txt" in the top-level CVS modules, and
-# contribute to the tags shown in the Eclipse CVS Repository Explorer
-# when expanding the "Branches" or the "Tags" node.
-#
-# Before running this script, customize the "cvs tag" commands below.
-#
-curdir=`pwd`
-#CVSROOT=:ext:moberhuber@dev.eclipse.org:/cvsroot/tools
-CVSROOT=/cvsroot/tools
-export CVSROOT
-TOPMODULES="\
-  org.eclipse.tm.rse \
-  org.eclipse.tm.rse/doc \
-  org.eclipse.tm.rse/examples \
-  org.eclipse.tm.rse/features \
-  org.eclipse.tm.rse/plugins \
-  org.eclipse.tm.rse/releng \
-  org.eclipse.tm.rse/tests \
-  org.eclipse.tm.core \
-  org.eclipse.tm.core/discovery \
-  org.eclipse.tm.core/terminal \
-  org.eclipse.tm.core/wince \
-"
-###  org.eclipse.tm.core/thirdparty \
-cvs co -l $TOPMODULES
-##exit 0
-for topmod in $TOPMODULES ; do
-  cd $topmod
-  cvs update -l -f -r R3_2_maintenance .
-  #cvs update -l -A .
-  cvs tag R3_2_2
-  cd $curdir
-done
diff --git a/releng/org.eclipse.rse.build/bootstrap.sh b/releng/org.eclipse.rse.build/bootstrap.sh
deleted file mode 100644
index cd5a70dce..000000000
--- a/releng/org.eclipse.rse.build/bootstrap.sh
+++ /dev/null
@@ -1,242 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2005, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - Adapt for TM / RSE
-#*******************************************************************************
-# User specific environment and startup programs
-umask 002
-
-BASE_PATH=.:/bin:/usr/bin:/usr/bin/X11:/usr/local/bin:/usr/bin:/usr/X11R6/bin
-LD_LIBRARY_PATH=.
-BASH_ENV=$HOME/.bashrc
-USERNAME=`whoami`
-xhost +$HOSTNAME
-DISPLAY=:0.0
-CVS_RSH=ssh
-ulimit -c unlimited
-export CVS_RSH USERNAME BASH_ENV LD_LIBRARY_PATH DISPLAY
-
-proc=$$
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-#notification list
-recipients=
-
-#sets skip.performance.tests Ant property
-skipPerf=""
-
-#sets skip.tests Ant property
-skipTest=""
-
-#sets sign Ant property
-sign=""
-
-tagMaps=""
-
-#sets fetchTag="HEAD" for nightly builds if required
-tag=""
-
-#Basebuilder for Eclipse 3.2.1 maintenance
-#buildProjectTags=v20060529
-buildProjectTags=r321_v20060830
-
-#updateSite property setting
-updateSite=""
-
-#flag indicating whether or not mail should be sent to indicate build has started
-mail=""
-
-#flag used to build based on changes in map files
-compareMaps=""
-
-#buildId - build name
-buildId=""
-
-#buildLabel - name parsed in php scripts <buildType>-<buildId>-<datestamp>
-buildLabel=""
-
-# tag for build contribution project containing .map files
-mapVersionTag=HEAD
-
-# directory in which to export builder projects
-#builderDir=/builds/eclipsebuilder
-builderDir=$mydir/../working/build
-
-# buildtype determines whether map file tags are used as entered or are replaced with HEAD
-buildType=N
-
-# directory where to copy build
-#postingDirectory=/builds/transfer/files/master/downloads/drops
-postingDirectory=$mydir/../publish
-
-
-# flag to indicate if test build
-testBuild=""
-
-# path to javadoc executable
-javadoc=""
-
-# value used in buildLabel and for text replacement in index.php template file
-builddate=`date +%Y%m%d`
-buildtime=`date +%H%M`
-timestamp=$builddate$buildtime
-
-
-# process command line arguments
-usage="usage: $0 [-notify emailaddresses][-test][-buildDirectory directory][-buildId name][-buildLabel directory name][-tagMapFiles][-mapVersionTag tag][-builderTag tag][-bootclasspath path][-compareMaps][-skipPerf] [-skipTest][-updateSite site][-sign] M|N|I|S|R"
-
-if [ $# -lt 1 ]
-then
-		 echo >&2 "$usage"
-		 exit 1
-fi
-
-while [ $# -gt 0 ]
-do
-		 case "$1" in
-		 		 -buildId) buildId="$2"; shift;;
-		 		 -buildLabel) buildLabel="$2"; shift;;
-		 		 -mapVersionTag) mapVersionTag="$2"; shift;;
-		 		 -tagMapFiles) tagMaps="-DtagMaps=true";;
-		 		 -skipPerf) skipPerf="-Dskip.performance.tests=true";;
-		 		 -skipTest) skipTest="-Dskip.tests=true";;
-		 		 -buildDirectory) builderDir="$2"; shift;;
-		 		 -notify) recipients="$2"; shift;;
-		 		 -test) postingDirectory="/builds/transfer/files/bogus/downloads/drops";testBuild="-Dtest=true";;
-		 		 -builderTag) buildProjectTags="$2"; shift;;
-		 		 -compareMaps) compareMaps="-DcompareMaps=true";;
-		 		 -updateSite) updateSite="-DupdateSite=$2";shift;;
-		 		 -sign) sign="-Dsign=true";;
-		 		 -*)
-		 		 		 echo >&2 $usage
-		 		 		 exit 1;;
-		 		 *) break;;		 # terminate while loop
-		 esac
-		 shift
-done
-
-# After the above the build type is left in $1.
-buildType=$1
-
-# Set default buildId and buildLabel if none explicitly set
-if [ "$buildId" = "" ]
-then
-		 buildId=$buildType$builddate-$buildtime
-fi
-
-if [ "$buildLabel" = "" ]
-then
-		 buildLabel=$buildId
-fi
-
-#Set the tag to HEAD for Nightly builds
-if [ "$buildType" = "N" ]
-then
-        tag="-DfetchTag=HEAD"
-        versionQualifier="-DforceContextQualifier=$buildId"
-fi
-
-# tag for eclipseInternalBuildTools on ottcvs1
-internalToolsTag=$buildProjectTags
-
-# tag for exporting org.eclipse.releng.basebuilder
-baseBuilderTag=$buildProjectTags
-
-# tag for exporting the custom builder
-customBuilderTag=$buildProjectTags
-
-if [ -e $builderDir ]
-then
-		 builderDir=$builderDir$timestamp
-fi
-
-# directory where features and plugins will be compiled
-buildDirectory=$builderDir/src
-
-mkdir -p $builderDir
-cd $builderDir
-
-#check out org.eclipse.releng.basebuilder
-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co -r $baseBuilderTag org.eclipse.releng.basebuilder
-
-#check out org.eclipse.rse.build
-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools co -r $customBuilderTag org.eclipse.tm.rse/releng/org.eclipse.rse.build
-if [ "$tagMaps" == "-DtagMaps=true" ]; then  
-  cvs -d moberhuber@dev.eclipse.org:/cvsroot/tools rtag -r $customBuilderTag v$buildId org.eclipse.tm.rse/releng/org.eclipse.rse.build
-fi
-
-if [ "$HOSTNAME" == "utils" ]
-then
-	#Running on build.eclipse.org
-	java15_home=/shared/tools/tm/jdk-1.5
-	#java14_home=/shared/webtools/apps/IBMJava2-ppc64-142
-	java14_home=/shared/webtools/apps/IBMJava2-ppc-142
-    javadoc="-Djavadoc15=$java15_home/bin/javadoc"
-    PATH=$java15_home/jre/bin:$PATH;export PATH
-elif [ "$HOSTNAME" == "parser.wrs.com" ]
-then
-	#Running on parser
-	java15_home=/opt/jdk1.5.0_06
-	java14_home=/opt/j2sdk1.4.2_12
-    javadoc="-Djavadoc15=$java15_home/bin/javadoc"
-    PATH=$java15_home/jre/bin:$PATH;export PATH
-fi
-
-mkdir -p $postingDirectory/$buildLabel
-chmod -R 755 $builderDir
-
-#default value of the bootclasspath attribute used in ant javac calls.  
-bootclasspath="$java14_home/jre/lib/rt.jar:$java14_home/jre/lib/jsse.jar"
-bootclasspath_15="$java15_home/jre/lib/rt.jar"
-
-cd $builderDir/org.eclipse.rse.build
-
-echo buildId=$buildId >> monitor.properties 
-echo timestamp=$timestamp >> monitor.properties 
-echo buildLabel=$buildLabel >> monitor.properties 
-echo recipients=$recipients >> monitor.properties
-echo log=$postingDirectory/$buildLabel/index.php >> monitor.properties
-
-#the base command used to run AntRunner headless
-antRunner="`which java` -Xmx500m -jar ../org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=ppc -application org.eclipse.ant.core.antRunner"
-
-#clean drop directories
-#	$antRunner -buildfile eclipse/helper.xml cleanSites
-
-echo recipients=$recipients
-echo postingDirectory=$postingDirectory
-echo builderTag=$buildProjectTags
-echo buildDirectory=$buildDirectory
-echo bootclasspath=$bootclasspath
-echo bootclasspath_15=$bootclasspath_15
-
-#full command with args
-buildCommand="$antRunner -q -buildfile buildAll.xml $mail $testBuild $compareMaps -DmapVersionTag=$mapVersionTag -DpostingDirectory=$postingDirectory -Dbootclasspath=$bootclasspath -DbuildType=$buildType -D$buildType=true -DbuildId=$buildId -Dbuildid=$buildId -DbuildLabel=$buildLabel -Dtimestamp=$timestamp -DmapCvsRoot=:ext:sdimitro@dev.eclipse.org:/cvsroot/eclipse $skipPerf $skipTest $tagMaps -DJ2SE-1.5=$bootclasspath_15 -DJ2SE-1.4=$bootclasspath -DCDC-1.0/Foundation-1.0=$bootclasspath_foundation -DlogExtension=.xml $javadoc $updateSite $sign -DgenerateFeatureVersionSuffix=true -Djava15-home=$builderDir/jdk/linuxppc/ibm-java2-ppc-50/jre -listener org.eclipse.releng.build.listeners.EclipseBuildListener"
-
-#capture command used to run the build
-echo $buildCommand>command.txt
-
-#run the build
-$buildCommand
-retCode=$?
-
-if [ $retCode != 0 ]
-then
-        echo "Build failed (error code $retCode)."
-        exit -1
-fi
-
-#clean up
-rm -rf $builderDir
-
-
diff --git a/releng/org.eclipse.rse.build/build.pl b/releng/org.eclipse.rse.build/build.pl
deleted file mode 100644
index ba1b29876..000000000
--- a/releng/org.eclipse.rse.build/build.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/perl
-#*******************************************************************************
-# Copyright (c) 2006, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# David Dykstal (IBM) - initial API and implementation
-# Martin Oberhuber (Wind River) - ongoing maintenance
-#*******************************************************************************
-
-# Build script for Remote System Explorer
-# Authors: Dave Dykstal, Kushal Munir
-# java and cvs have to be in the path
-
-use warnings;
-use File::Spec;
-
-sub ask($$) {
-	my ($question, $default, $message, $ans); 
-	($question, $default) = @_;
-	$message = "${question} (default is ${default}): "; 
-	print STDERR $message;
-	$ans = <STDIN>;
-	chomp $ans;
-	$ans = $ans ? $ans : $default;
-	return $ans;
-}
-
-sub makeAbsolute($) {
-	my $path = File::Spec->canonpath($_[0]);
-	if (!File::Spec->file_name_is_absolute($path)) {
-		$current = `pwd`;
-		chomp($current);
-		$path = File::Spec->catdir($current, $path);
-		$path = File::Spec->canonpath($path);
-	}
-	return $path;
-}
-
-# $eclipse is the location of the basic PDE and plugins to compile against
-# This should include the org.eclipse.pde.build project
-$eclipse = "../eclipse"; 
-
-# $basebuilder" is the location of the Eclipse Releng basebuilder
-# This can also be set to ${eclipse}
-$basebuilder = "../org.eclipse.releng.basebuilder";
-
-# $builder is the location of the custom build scripts customTargets.xml and build.properties
-# (i.e. the contents of org.eclipse.rse.build)
-$builder = ".";
-
-# $working is where the build is actually done, does not need to exist
-$working = "../working";
-
-# make these absolute paths
-$eclipse = makeAbsolute($eclipse);
-$basebuilder = makeAbsolute($basebuilder);
-$builder = makeAbsolute($builder);
-$working = makeAbsolute($working);
-$plugins = File::Spec->catdir($basebuilder, "plugins");
-$pdeBuildGlob = File::Spec->catdir($plugins, "org.eclipse.pde.build*");
-
-# Find the base build scripts: genericTargets.xml and build.xml
-@candidates = glob($pdeBuildGlob);
-$n = @candidates;
-if ($n == 0) {
-	die("PDE Build was not found.");
-}
-if ($n > 1) {
-	die("Too many versions of PDE Build were found.");
-}
-$pdeBuild = $candidates[0];
-
-$buildDirectory = "$working/build";
-$packageDirectory = "$working/package";
-$publishDirectory = "$working/publish";
-
-$tag = ask("Enter tag to fetch from CVS", "HEAD");
-$buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable, J/M=Maintenance, K/L=Legacy)", "P");
-($sec, $minute, $hour, $mday, $mon, $year) = localtime();
-$mydstamp = sprintf("%4.4d%2.2d%2.2d", $year + 1900, ($mon + 1), $mday);
-$mytstamp = sprintf("%2.2d%2.2d", $hour, $minute, $sec);
-$timeStamp = "${mydstamp}-${mytstamp}";
-$buildId = $buildType . $timeStamp;
-$buildId = ask("Enter the build id", $buildType . $timeStamp);
-
-# default value of the bootclasspath attribute used in ant javac calls.
-# these pathes are valid on build.eclipse.org  
-$bootclasspath = "/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar";
-$bootclasspath_15 = "/shared/common/jdk-1.5.0_16/jre/lib/rt.jar";
-#$bootclasspath_16 = "$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar";
-#$bootclasspath_foundation = "/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar";
-$bootclasspath_foundation11 = "/shared/tools/tm/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip";
-
-$incantation = "java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main ";
-$incantation .= "-application org.eclipse.ant.core.antRunner ";
-$incantation .= "-buildfile ${pdeBuild}/scripts/build.xml ";
-$incantation .= "-DbuildDirectory=${buildDirectory} ";
-$incantation .= "-DpackageDirectory=${packageDirectory} ";
-$incantation .= "-DpublishDirectory=${publishDirectory} ";
-$incantation .= "-Dbuilder=${builder} ";
-$incantation .= "-DbaseLocation=${eclipse} ";
-$incantation .= "-DbuildType=${buildType} ";
-$incantation .= "-DbuildId=${buildId} ";
-$incantation .= "-DmapVersionTag=${tag} ";
-$incantation .= "-Dmydstamp=${mydstamp} ";
-$incantation .= "-Dmytstamp=${mytstamp} ";
-if ($buildType =~ "N") {
-	$incantation .= "-DforceContextQualifier=${buildId} ";
-	$incantation .= "-DfetchTag=HEAD ";
-}
-$incantation .= "-DdoPublish=true ";
-$incantation .= "-Dbootclasspath=${bootclasspath} ";
-$incantation .= "-DJ2SE-1.4=${bootclasspath} ";
-$incantation .= "-DJ2SE-1.5=${bootclasspath_15} ";
-$incantation .= "-DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} ";
-#$incantation .= "postBuild ";
-
-
-print("${incantation}\n");
-
-system($incantation);
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/build.properties b/releng/org.eclipse.rse.build/build.properties
deleted file mode 100644
index a57d71c37..000000000
--- a/releng/org.eclipse.rse.build/build.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-#  Copyright (c) 2001, 2010 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#  IBM Corporation - initial API and implementation
-#  Martin Oberhuber (Wind River) - Fix bug 153655 incorrect source features
-###############################################################################
-outputUpdateJars=true
-archivePrefix=eclipse
-collectingFolder=${archivePrefix}
-buildType=P
-buildId=unknown
-buildLabel=${buildId}
-mapVersionTag=HEAD
-
-#this is set to the tag from the map file unless forced here
-#forceContextQualifier=vYYYYMMDD
-
-#adds checksum suffix to directory names
-generateFeatureVersionSuffix=true
-generateAPIDescription=true
-generateSourceReferences=true
-
-##Packager
-collPlace=eclipse
-collBase=.
-# configs=linux,gtk,ppc & *,*,*
-archivesFormat =\
-linux, gtk, ppc-zip &\
-	*,*,*-zip
-# bootclasspath=${java.home}/lib/rt.jar:${java.home}/lib/jsse.jar
-baseos=linux
-basews=gtk
-basearch=ppc
-#runPackager=true
-### We do not build individual source bundles yet because Eclipse 3.3 dont understand it
-individualSourceBundles=true
-
-#Compiler options
-javacFailOnError=false
-javacDebugInfo=on
-#javacVerbose=true
-#compilerArg=-enableJavadoc
-#This fixes a problem with the IBM 1.5 VM, see bug 158358
-compilerArg=-inlineJSR -enableJavadoc -warn:+javadoc
-
-zipargs=
-tarargs=--owner=0 --group=0
-
-#Runtime libs - needed for headless build of Apache Commons Net
-#J2SE-1.2=../jres/1.2.2/lib/rt.jar
diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb
deleted file mode 100644
index 321b54fdd..000000000
--- a/releng/org.eclipse.rse.build/build.rb
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/usr/bin/ruby
-#*******************************************************************************
-# Copyright (c) 2006, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# David Dykstal (IBM) - initial API and implementation
-# Martin Oberhuber (Wind River) - ongoing maintenance
-#*******************************************************************************
-
-# Build script for Remote System Explorer
-# Author: Dave Dykstal, Kushal Munir
-# Prerequisites:
-# written in ruby
-# java and cvs have to be in the path
-
-require "ftools"
-
-def ask(question, default)
-	message = "#{question} (default is #{default}): " 
-	STDERR.print message
-	answer = readline().strip
-	answer = answer.empty? ? default : answer
-	return answer
-end
-
-# "eclipse" is the location of the basic PDE and plugins to compile against
-# This should include the org.eclipse.pde.build project
-eclipse	= "../eclipse" 
-
-# "basebuilder" is the location of the Eclipse Releng basebuilder
-# This can be set to #{eclipse}
-basebuilder = "../org.eclipse.releng.basebuilder"
-
-# "builder" is the location of the custom build scripts customTargets.xml and build.properties
-# (i.e. the contents of org.eclipse.rse.build)
-builder	= "."
-
-# "working" is where the build is actually done, does not need to exist
-working = "../working"
-
-# make these absolute paths
-eclipse = File.expand_path(eclipse)
-basebuilder = File.expand_path(basebuilder)
-builder = File.expand_path(builder)
-working = File.expand_path(working)
-
-# Find the base build scripts: genericTargets.xml and build.xml
-candidates = Dir["#{basebuilder}/plugins/org.eclipse.pde.build*"]
-if (candidates.size == 0) then 
-	raise("PDE Build was not found.")
-end
-if (candidates.size > 1) then
-	raise("Too many versions of PDE Build were found.")
-end
-pdeBuild = candidates[0]
-
-buildDirectory = "#{working}/build"
-packageDirectory = "#{working}/package"
-publishDirectory = "#{working}/publish"
-
-tag = ask("Enter tag to fetch from CVS", "HEAD")
-buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable, J/M=Maintenance, K/L=Legacy)", "P")
-mydstamp = Time.now.strftime("%Y%m%d")
-mytstamp = Time.now.strftime("%H%M")
-buildId = ask("Enter the build id", buildType + mydstamp + "-" + mydstamp)
-
-# default value of the bootclasspath attribute used in ant javac calls.
-# these pathes are valid on build.eclipse.org  
-bootclasspath = "/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar"
-bootclasspath_15 = "/shared/common/jdk-1.5.0_16/jre/lib/rt.jar"
-#bootclasspath_16 = "$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar"
-#bootclasspath_foundation = "/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
-bootclasspath_foundation11 = "/shared/tools/tm/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
-
-command = "java -cp #{basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
-command += "-application org.eclipse.ant.core.antRunner "
-command += "-buildfile #{pdeBuild}/scripts/build.xml "
-command += "-DbuildDirectory=#{buildDirectory} "
-command += "-DpackageDirectory=#{packageDirectory} "
-command += "-DpublishDirectory=#{publishDirectory} "
-command += "-Dbuilder=#{builder} "
-command += "-DbaseLocation=#{eclipse} "
-command += "-DbuildType=#{buildType} "
-command += "-DbuildId=#{buildId} "
-command += "-DmapVersionTag=#{tag} "
-command += "-Dmydstamp=#{mydstamp} "
-command += "-Dmytstamp=#{mytstamp} "
-if ("#{buildType}" == "N") then
-	command += "-DforceContextQualifier=#{buildId} "
-	command += "-DfetchTag=HEAD "
-end
-command += "-DdoPublish=true "
-command += "-Dbootclasspath=#{bootclasspath} "
-command += "-DJ2SE-1.4=#{bootclasspath} "
-command += "-DJ2SE-1.5=#{bootclasspath_15} "
-command += "-DCDC-1.1/Foundation-1.1=#{bootclasspath_foundation11} "
-#command += "postBuild "
-
-puts(command)
-
-system(command)
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/copyrights/NOTES.txt b/releng/org.eclipse.rse.build/copyrights/NOTES.txt
deleted file mode 100644
index 7d80a45f6..000000000
--- a/releng/org.eclipse.rse.build/copyrights/NOTES.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-Standardizing Copyright Headers
--------------------------------
-Some have "and others" on the Copyright line, others not.
-Some like to indent their Contributors, others not.
-Some have "All rights reserved." on the Copyright line, others below. STANDARD IS below
-! MV is even missing the "All rights reserved." completely!
-Some have a dot after "and others.", others not. -- STANDARD IS and others.
-Some have a dot after "Inc", others not. -- STANDARD IS DOT
-Some have a comma before ", Inc" others not. -- STANDARD IS COMMA
-Some have trailing space, others not. -- STANDARD IS no trailing space
-Some have an EPL Copyright, but formatted differently (in terms of line breaks)
-
-
-AdvancedCopyrightTool:
-Looks like it deletes all Contributors ?!?
-Falls back to Eclipse/IBM Copyright if no exact match on 1st line
-Matches the line with the ${date} only
-
-234873 -- jun 18,08 -- extends
-140936 -- dec 31,08 -- delete space
-
-
-Take Care on HTML:
-* about.html must not change date
-* about.html has <blockquote>apache and stuff
-
-
-Improvements:
-* Fix insertion of space in IBM copyright
-* Handle .html files (from docs)
-* Allow fuzzy replacement of Copyright Year only
-* Should we only act if it is EPL, i.e. not only company name but also license match?
-MUST HAVE:
-* It must be capable of adding "and others." if not already there. And do a corresponding fuzzy match.
-
-
-IBM can standardize: "All rights reserved." on newline; always "And others."; 
-- We have 818 where "All rights reserved." is on the Copyright line!
-- In case of IBM, some have "and others.", some not.
-
-
-Statistics:
-- 818 with "All rights reserved." on first line - should always be 2nd!
-- 730 of 2887 are non-IBM
-- 269 (461) are also not "Wind River Systems, Inc. and others"
-- 217 (52) are also not "Radoslav Gerganov" -- rse.wince
-- 111 (106) are also not "Symbian Software Ltd" -- tm.discovery
-- 105 (6) are also not "Celunite, Inc" -- services.telnet
-- 72 (33) are also not "MontaVista Software, Inc"
-- 26 (46) are also not "Wind River Systems, Inc"
-- 24 (2) are also not "PalmSource, Inc" -- rse.services
-- 9 (15) are also not "Takuya Miyamoto" -- rse.importexport
-- rest are OK
-
-Final Regex:
-Copyright [(cC)]+ [0-9, -]+
-Final filter:
-IBM Corporation|Wind River Systems|Radoslav Gerganov|Symbian Software Ltd|Celunite, Inc|MontaVista Software, Inc|PalmSource, Inc|Takuya Miyamoto
-
-What to do:
-1. Fix the Wind River ones to be consistent
-2. Advanced tool: dont match for "and others." but re-add it if it was not there. (Preference ?!?)
-3. Advanced tool: if it is EPL and replacement takes place, insert standard EPL. (Preference ?!?)
-4. Advanced tool: write documentation, and attach it to context help of Copyrights Tool Preference.
-   (what it does, when if falls back etc)
-3. What to do with diffs in punctuation -- "Inc" vs ", Inc" vs ", Inc." 
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/copyrights/ibmCopyright.txt b/releng/org.eclipse.rse.build/copyrights/ibmCopyright.txt
deleted file mode 100644
index af6d8a638..000000000
--- a/releng/org.eclipse.rse.build/copyrights/ibmCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} IBM Corporation and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-    IBM Corporation - initial API and implementation
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/copyrights/mvCopyright.txt b/releng/org.eclipse.rse.build/copyrights/mvCopyright.txt
deleted file mode 100644
index db51430dc..000000000
--- a/releng/org.eclipse.rse.build/copyrights/mvCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} MontaVista Software, Inc. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-Yu-Fen Kuo      (MontaVista) - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/copyrights/palmCopyright.txt b/releng/org.eclipse.rse.build/copyrights/palmCopyright.txt
deleted file mode 100644
index f3b0d2a24..000000000
--- a/releng/org.eclipse.rse.build/copyrights/palmCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} PalmSource, Inc. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0 
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors: 
-Ewa Matejska (PalmSource)
diff --git a/releng/org.eclipse.rse.build/copyrights/radoCopyright.txt b/releng/org.eclipse.rse.build/copyrights/radoCopyright.txt
deleted file mode 100644
index 7651f7d7b..000000000
--- a/releng/org.eclipse.rse.build/copyrights/radoCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} Radoslav Gerganov and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-   Radoslav Gerganov - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/copyrights/symbianCopyright.txt b/releng/org.eclipse.rse.build/copyrights/symbianCopyright.txt
deleted file mode 100644
index 471fb3e72..000000000
--- a/releng/org.eclipse.rse.build/copyrights/symbianCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} Symbian Software Ltd. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-  Javier Montalvo Orus (Symbian) - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/copyrights/takuyaCopyright.txt b/releng/org.eclipse.rse.build/copyrights/takuyaCopyright.txt
deleted file mode 100644
index 1db8e8353..000000000
--- a/releng/org.eclipse.rse.build/copyrights/takuyaCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} Takuya Miyamoto and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-    Takuya Miyamoto - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/copyrights/wrCopyright.txt b/releng/org.eclipse.rse.build/copyrights/wrCopyright.txt
deleted file mode 100644
index 50c4bba64..000000000
--- a/releng/org.eclipse.rse.build/copyrights/wrCopyright.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) ${date} Wind River Systems, Inc. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-Martin Oberhuber (Wind River) - initial API and implementation
diff --git a/releng/org.eclipse.rse.build/customAssembly.xml b/releng/org.eclipse.rse.build/customAssembly.xml
deleted file mode 100644
index 0d94a43e1..000000000
--- a/releng/org.eclipse.rse.build/customAssembly.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!--
-     Copyright (c) 2008, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- =====================================================================
-	    
-	    The Following Properties are available in all targets:
-		 - eclipse.base : the base folder everything will be collected into
-		 - eclipse.plugins : the plugins folder
-		 - eclipse.features: the features folder
-		 - archiveFullPath : the full path of the final archive once it is created
-		 
-		 ===================================================================== -->
-		 
-	<!-- =====================================================================  -->
-	<!-- Called after each invocation of the gather.bin.parts target on the     -->
-	<!-- individual plugins and features.                                       -->
-	<!-- Available properties are:                                              -->
-	<!--   projectLocation: location of the project being gathered              -->
-	<!--   projectName: symbolic name with version (org.eclipse.foo_1.0.0.v123) -->
-	<!--   target.folder: the destination, eclipse/plugins or eclipse/features  -->
-	<!--                                                                        -->
-	<!-- The generated pattern is that plugins/features are gathered into the   -->
-	<!-- folder ${target.folder}/${projectName}                                 -->
-	<!-- =====================================================================  -->
-	<target name="gather.bin.parts">	
-	</target>
-
-	
-	<!-- ===================================================================== -->
-	<!-- Called after invoking the gather.bin.parts targets for all plugins    -->
-	<!-- and features. Results exist as folders and have not yet been jarred.  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-		<!-- <target name="hideServerStuff"> -->
-			<mkdir dir="${buildDirectory}/hidden"/>
-			<move todir="${buildDirectory}/hidden">
-				<fileset dir="${buildDirectory}/plugins">
-					<include name="**/clientserver.jar"/>
-					<include name="**/dstore_core.jar"/>
-					<include name="**/dstore_extra_server.jar"/>
-					<include name="**/dstore_miners.jar"/>
-					<include name="**/clientserversrc.zip"/>
-					<include name="**/dstore_coresrc.zip"/>
-					<include name="**/dstore_extra_serversrc.zip"/>
-					<include name="**/dstore_minerssrc.zip"/>
-				</fileset>
-			</move>
-			<mkdir dir="${buildDirectory}/hidden.tmp"/>
-			<move todir="${buildDirectory}/hidden.tmp">
-				<fileset dir="${buildDirectory}/tmp">
-					<include name="**/clientserver.jar"/>
-					<include name="**/dstore_core.jar"/>
-					<include name="**/dstore_extra_server.jar"/>
-					<include name="**/dstore_miners.jar"/>
-					<include name="**/clientserversrc.zip"/>
-					<include name="**/dstore_coresrc.zip"/>
-					<include name="**/dstore_extra_serversrc.zip"/>
-					<include name="**/dstore_minerssrc.zip"/>
-				</fileset>
-			</move>
-		<!-- </target> -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Called just prior to signing a jar                                    -->
-	<!-- In addititon to the properties listed above:						   -->
-	<!--    - source : plugins or features directory                           -->
-	<!--    - elementName: element being signed without .jar                   -->
-	<!--                   (eg "org.eclipse.foo_1.0.0"                         -->
-	<!-- ===================================================================== -->
-	<target name="pre.jarSigning">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Called after all plugins and features have been jarred                -->
-	<!-- (and potentially signed)                                              -->
-	<!-- ===================================================================== -->
-	<target name="post.jarUp">
-		<!-- <target name="revealServerStuff"> -->
-			<move todir="${buildDirectory}/tmp">
-				<fileset dir="${buildDirectory}/hidden.tmp" includes="**" />
-			</move>
-			<delete dir="${buildDirectory}/hidden.tmp"/>
-			<move todir="${buildDirectory}/plugins">
-				<fileset dir="${buildDirectory}/hidden" includes="**" />
-			</move>
-			<delete dir="${buildDirectory}/hidden"/>
-		<!-- </target> -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Called just before the archive file is built                          -->
-	<!-- In addititon to the properties listed above:						   -->
-	<!--    - rootFolder : the folder containing the root files                -->
-	<!-- ===================================================================== -->
-	<target name="pre.archive">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
deleted file mode 100644
index 0faeeeaae..000000000
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ /dev/null
@@ -1,563 +0,0 @@
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Run a given ${target} on all elements being built -->
-	<!-- Add one <ant> task for each top level element being built. -->
-	<!-- ===================================================================== -->
-	<target name="allElements">
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.sdk" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.useractions" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.wince" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.examples" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.tests" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.discovery" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.terminal.sdk" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.tm.terminal.local.sdk" />
-		</ant>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Targets to assemble the built elements for particular configurations  -->
-	<!-- These generally call the generated assemble scripts (named in         -->
-	<!-- ${assembleScriptName}) but may also add pre and post processing       -->
-	<!-- Add one target for each root element and each configuration           -->
-	<!-- ===================================================================== -->
-
-	<target name="assemble.org.eclipse.rse">
-		<property name="archiveName" value="RSE-runtime-${buildId}.zip"/>
-		<property name="copyOrbit" value="true"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.sdk">
-		<property name="archiveName" value="RSE-SDK-${buildId}.zip"/>
-		<property name="copyOrbit" value="true"/>
-		<property name="copyOrbitSrc" value="true"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.useractions">
-		<property name="archiveName" value="RSE-useractions-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.examples">
-		<property name="archiveName" value="RSE-examples-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.wince">
-		<property name="archiveName" value="RSE-wince-incubation-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.rse.tests">
-		<property name="archiveName" value="RSE-tests-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.tm.discovery">
-		<property name="archiveName" value="TM-discovery-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.tm.terminal.sdk">
-		<property name="archiveName" value="TM-terminal-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
-	<target name="assemble.org.eclipse.tm.terminal.local.sdk">
-		<property name="archiveName" value="TM-terminal-local-incubation-${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" />
-		<mkdir dir="${tmpsite}/new/eclipse/plugins" />
-		<exec executable="unzip" dir="${buildDirectory}/${buildLabel}">
-			<arg line="-q ${archiveName} -d ${tmpsite}" />
-		</exec>
-		<property name="orbitDest" value="${tmpsite}/eclipse"/>
-		<antcall target="copyOrbitBundlesToUpdateSite"/>
-		<copy todir="${buildUpdateSitePath}">
-		    <fileset dir="${tmpsite}/eclipse"/>
-		</copy>
-
-		<unpackUpdateJars site="${tmpsite}/eclipse" output="${tmpsite}/new/eclipse"/>
-		<antcall target="packageLicenseFiles"/>
-		<zip destfile="${buildDirectory}/${buildLabel}/${archiveName}"
-			basedir="${tmpsite}/new"
-	  	/>
-		<delete dir="${tmpsite}"/>
-	</target>
-
-	<target name="copyOrbitBundlesToUpdateSite" depends="copyOrbit,copyOrbitSrc">
-	</target>
-
-	<target name="copyOrbit" if="copyOrbit">
-		<copy todir="${orbitDest}/plugins">
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.apache.commons.net_*.jar"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="copyOrbitSrc" if="copyOrbitSrc">
-		<copy todir="${orbitDest}/plugins">
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="org.apache.commons.net.source_*.jar"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="packageLicenseFiles">
-		<copy file="${builder}/template/epl-v10.html" todir="${tmpsite}/new/eclipse"/>
-		<copy file="${builder}/template/notice.html" todir="${tmpsite}/new/eclipse"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Place the map files into the "maps" directory, specify version tags -->
-	<!-- ===================================================================== -->
-	<target name="getMapFiles">
-		<copy todir="${buildDirectory}/maps">
-			<fileset dir="${builder}/maps" includes="*.map" />
-		</copy>
-		<replace dir="${buildDirectory}/maps" token="@tag@" value="${mapVersionTag}">
-			<include name="*.map"/>
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before setup -->
-	<!-- ===================================================================== -->
-	<target name="preSetup" depends="myInit">
-		<echo message="builder = ${builder}"/>
-		<echo message="builderDirectory = ${builderDirectory}"/>
-		<echo message="buildProperties = ${buildProperties}"/>
-		<echo message="customTargets = ${customTargets}"/>
-		<echo message="genericTargets = ${genericTargets}"/>
-		<echo message="buildId = ${buildId}"/>
-		<echo message="buildName = ${buildName}"/>
-		<echo message="buildType = ${buildType}"/>
-		<echo message="buildLabel = ${buildLabel}"/>
-		<echo message="tstamp = ${mydstamp}-${mytstamp} of ${dateLong}"/>
-		<echo message="archivePrefix = ${archivePrefix}"/>
-		<echo message="collectingFolder = ${collectingFolder}"/>
-	</target>
-
-	<target name="myInit">
-		<tstamp>
-			<format property="dateLong" pattern="MMM d, yyyy"/>
-		</tstamp>
-		<property name="messagefile" value="message.in"/>
-		<property name="xxmailto" value="tm-cvs-commit@eclipse.org"/>
-		<property name="mailto" value="martin.oberhuber@windriver.com"/>
-		<property name="remotedir" value="moberhuber@dev.eclipse.org:downloads-tm/downloads/drops"/>
-		<condition property="doNBuild">
-		    <equals arg1="${fetchTag}" arg2="HEAD"/>
-		</condition>
-		<condition property="doUpload">
-			<equals arg1="${publishDirectory}" arg2=""/>
-		</condition>
-		<condition property="doCopy">
-			<not><equals arg1="${publishDirectory}" arg2=""/></not>
-		</condition>
-		<condition property="dropDir" value="${buildType}-${buildId}-${mydstamp}${mytstamp}" else="${buildId}">
-			<or>
-				<equals arg1="${buildType}" arg2="S"/>
-				<equals arg1="${buildType}" arg2="R"/>
-				<and>
-					<equals arg1="${buildType}" arg2="M"/>
-					<not><matches pattern="M[0-9-]*" string="${buildId}"/></not>
-				</and>
-				<and>
-					<equals arg1="${buildType}" arg2="J"/>
-					<not><matches pattern="J[0-9-]*" string="${buildId}"/></not>
-				</and>
-				<and>
-					<equals arg1="${buildType}" arg2="K"/>
-					<not><matches pattern="K[0-9-]*" string="${buildId}"/></not>
-				</and>
-				<and>
-					<equals arg1="${buildType}" arg2="L"/>
-					<not><matches pattern="L[0-9-]*" string="${buildId}"/></not>
-				</and>
-			</or>
-		</condition>
-		<property name="buildUpdateSitePath" value="${packageDirectory}/${dropDir}/updates"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after setup but before starting the build proper -->
-	<!-- ===================================================================== -->
-	<target name="postSetup">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="preFetchOrbitBundles" depends="myInit" if="doNBuild">
-		<!-- fetch Orbit stuff first in order to ensure we get      -->
-		<!-- the latest released version even in case of an N-build -->
-		<!--
-		<ant antfile="${genericTargets}" target="fetchElement">
-			<property name="type" value="plugin" />
-			<property name="id" value="org.apache.commons.net" />
-		</ant>
-		-->
-		<mkdir dir="${buildDirectory}/plugins"/>
-		<eclipse.fetch
-			elements="plugin@org.apache.commons.net"
-			buildDirectory="${buildDirectory}"
-			directory="${buildDirectory}/directory.txt"
-			fetchTag=""
-			configInfo="*,*,*"
-			baseLocation="${baseLocation}"
-		/>
-		<!-- Run generated fetch script -->
-		<ant antfile="${buildDirectory}/fetch_org.apache.commons.net.xml">
-			<property name="featureOnly" value="true"/>
-			<property name="featureAndPlugins" value="true"/>
-		</ant>
-	</target>
-
-	<target name="preFetchOrbitSource" depends="myInit">
-		<!-- fetch Orbit stuff since I'm not sure how to get sources -->
-		<mkdir dir="${buildDirectory}/plugins"/>
-		<eclipse.fetch
-			elements="plugin@org.apache.commons.net.source"
-			buildDirectory="${buildDirectory}"
-			directory="${buildDirectory}/directory.txt"
-			fetchTag=""
-			configInfo="*,*,*"
-			baseLocation="${baseLocation}"
-		/>
-		<!-- Run generated fetch script -->
-		<ant antfile="${buildDirectory}/fetch_org.apache.commons.net.source.xml">
-			<property name="featureOnly" value="true"/>
-			<property name="featureAndPlugins" value="true"/>
-		</ant>
-	</target>
-
-	<target name="preFetch" depends="preFetchOrbitBundles,preFetchOrbitSource">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after fetching the build elements -->
-	<!-- ===================================================================== -->
-	<target name="postFetch">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="preGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after generating the build scripts. -->
-	<!-- ===================================================================== -->
-	<target name="postGenerate">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="preProcess">
-		<condition property="buildIdForMappings" value="${buildId} (${mydstamp}-${mytstamp})" else="${buildId}">
-			<or>
-				<equals arg1="${buildType}" arg2="S"/>
-				<equals arg1="${buildType}" arg2="R"/>
-			</or>
-		</condition>
-		<replace dir="${buildDirectory}/plugins" value="${buildIdForMappings}" token="@build@">
-			<include name="**/about.mappings" />
-		</replace>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after running the build.xmls for the elements being built. -->
-	<!-- ===================================================================== -->
-	<target name="postProcess">
-		<antcall target="allElements">
-			<param name="target" value="gatherLogs" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-		<antcall target="serverruntime" />
-		<antcall target="allElements">
-			<param name="target" value="gatherSources" />
-		</antcall>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running package. -->
-	<!-- ===================================================================== -->
-	<target name="prePackage">
-		<echo message="builder - all - customTargets.xml - prePackage"/>
-		<!-- TODO? -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running package. -->
-	<!-- ===================================================================== -->
-	<target name="postPackage">
-		<echo message="builder - all - customTargets.xml - postPackage"/>
-		<!-- TODO? -->
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the build is done. -->
-	<!-- ===================================================================== -->
-	<target name="postBuild" depends="myInit">
-		<mkdir dir="${packageDirectory}/${dropDir}" />
-		<move todir="${packageDirectory}/${dropDir}">
-			<fileset dir="${buildDirectory}/${buildLabel}" includes="RSE-*.zip,TM-*.zip"/>
-		</move>
-		<move todir="${packageDirectory}/${dropDir}">
-			<fileset dir="${buildDirectory}/${buildLabel}" includes="rseserver-*"/>
-		</move>
-		<copy todir="${packageDirectory}/${dropDir}" file="${buildDirectory}/directory.txt"/>
-		<!-- Create and analyze the compilelog.txt file -->
-		<concat destfile="${packageDirectory}/${dropDir}/compilelog.txt">
-			<fileset dir="${buildDirectory}/plugins" includes="**/*.log"/>
-		</concat>
-		<loadfile property="compileLog" srcFile="${packageDirectory}/${dropDir}/compilelog.txt"/>
-		<condition property="hasErrors">
-			<contains string="${compileLog}" substring=" ERROR"/>
-		</condition>
-		<!-- Create the index.php file -->
-		<copy todir="${packageDirectory}/${dropDir}">
-			<fileset dir="${builder}/template/" includes="*.php,*.gif,package.count"/>
-		</copy>
-		<condition property="buildTypeLong" value="Private"><equals arg1="${buildType}" arg2="P"/></condition>
-		<condition property="buildTypeLong" value="Nightly"><equals arg1="${buildType}" arg2="N"/></condition>
-		<condition property="buildTypeLong" value="Integration"><equals arg1="${buildType}" arg2="I"/></condition>
-		<condition property="buildTypeLong" value="Stable"><equals arg1="${buildType}" arg2="S"/></condition>
-		<condition property="buildTypeLong" value="Release"><equals arg1="${buildType}" arg2="R"/></condition>
-		<condition property="buildTypeLong" value="Maintenance"><equals arg1="${buildType}" arg2="J"/></condition>
-		<condition property="buildTypeLong" value="Maintenance"><equals arg1="${buildType}" arg2="M"/></condition>
-		<condition property="buildTypeLong" value="Legacy"><equals arg1="${buildType}" arg2="K"/></condition>
-		<condition property="buildTypeLong" value="Legacy"><equals arg1="${buildType}" arg2="L"/></condition>
-		<replace file="${packageDirectory}/${dropDir}/index.php">
-			<replacefilter token="@buildTypeLong@" value="${buildTypeLong}"/>
-			<replacefilter token="@dateLong@" value="${dateLong}"/>
-			<replacefilter token="@dropDir@" value="${dropDir}"/>
-			<replacefilter token="@buildId@" value="${buildId}"/>
-		</replace>
-		<replace file="${packageDirectory}/${dropDir}/buildNotes.php">
-			<replacefilter token="@dateLong@" value="${dateLong}"/>
-			<replacefilter token="@buildId@" value="${buildId}"/>
-		</replace>
-		<antcall target="publish"/>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do to test the build results -->
-	<!-- ===================================================================== -->
-	<target name="test">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do to publish the build results -->
-	<!-- ===================================================================== -->
-	<target name="publish" if="doPublish">
-		<antcall target="publishCopy"/>
-		<antcall target="publishUpload"/>
-		<antcall target="mail"/>
-	</target>
-
-	<target name="publishCopy" depends="myInit" if="doCopy" unless="hasErrors">
-		<mkdir dir="${publishDirectory}/${dropDir}" />
-		<copy todir="${publishDirectory}/${dropDir}">
-			<fileset dir="${packageDirectory}/${dropDir}" includes="*.zip,*.tar,*.php,*.txt,*.gif,package.count" />
-		</copy>
-	</target>
-
-	<target name="publishUpload" depends="myInit" if="doUpload" unless="hasErrors">
-		<exec dir="${packageDirectory}" executable="scp">
-			<arg line="-r ${dropDir} ${remotedir}"/>
-		</exec>
-	</target>
-
-	<target name="mail" depends="myInit">
-		<antcall target="mailPass"/>
-		<antcall target="mailFail"/>
-	</target>
-	
-	<target name="mailPass" unless="hasErrors">
-		<copy file="${builder}/${messagefile}" tofile="${buildDirectory}/message.txt" overwrite="true"/>
-		<replace file="${buildDirectory}/message.txt">
-			<replacefilter token="@dropDir@" value="${dropDir}"/>
-		</replace>
-		<mail subject="RSE Build ${buildId} completed"
- 			tolist="${mailto}" from="martin.oberhuber@windriver.com">
-			<message src="${buildDirectory}/message.txt"/>
-		</mail>
-	</target>
-
-	<target name="mailFail" if="hasErrors">
-		<mail subject="RSE Build ${buildId} failed"
-			tolist="${mailto}" from="martin.oberhuber@windriver.com">
-			<message src="${packageDirectory}/${dropDir}/compilelog.txt"/>
-		</mail>
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="You must specify a target when invoking this file" />
-	</target>
-
-	<!-- =====================================================================
-	     Specialized targets to build the server runtime.           
-	     ===================================================================== -->
-
-	<target name="serverruntime">
-
-		<property name="working" value="${buildDirectory}/${buildLabel}/rseserver"/>
-		<mkdir dir="${working}" />
-		<mkdir dir="${working}/jars" />
-
-		<copy todir="${working}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="**" />
-		</copy>
-
-		<copy todir="${working}/jars">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core" includes="dstore_core.jar" />
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.extra" includes="dstore_extra_server.jar" />
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services" includes="clientserver.jar" />
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="dstore_miners.jar" />
-		</copy>
-
-		<antcall target="rseserver-os-tar">
-			<param name="os" value="unix"/>
-			<param name="eol" value="lf"/>
-		</antcall>
-		<antcall target="rseserver-os-tar">
-			<param name="os" value="macosx"/>
-			<param name="eol" value="lf"/>
-		</antcall>
-		<antcall target="rseserver-os-tar">
-			<param name="os" value="linux"/>
-			<param name="eol" value="lf"/>
-		</antcall>
-		<antcall target="rseserver-os-zip">
-			<param name="os" value="windows"/>
-			<param name="eol" value="crlf"/>
-		</antcall>
-
-		<delete dir="${working}" />
-
-	</target>
-
-	<target name="rseserver-os-tar" depends="rseserver-os-collect">
-		<tar destfile="${buildDirectory}/${buildLabel}/rseserver-${buildId}-${os}.tar">
-			<tarfileset dir="${working}/collector" mode="755" includes="*.pl,*.sh" />
-			<tarfileset dir="${working}/collector" mode="644" excludes="*.pl,*.sh" />
-		</tar>
-		<delete dir="${working}/collector" />
-	</target>
-	<target name="rseserver-os-zip" depends="rseserver-os-collect">
-		<zip destfile="${buildDirectory}/${buildLabel}/rseserver-${buildId}-${os}.zip" basedir="${working}/collector" includes="*"/>
-		<delete dir="${working}/collector" />
-	</target>
-
-	<target name="rseserver-os-collect">
-		<mkdir dir="${working}/collector" />
-		<copy todir="${working}/collector">
-			<fileset dir="${working}/scripts/${os}" includes="*"/>
-			<fileset dir="${working}/data" includes="*"/>
-		</copy>
-		<replace file="${working}/collector/build.dat">
-			<replacefilter token="@build@" value="${buildId}"/>
-			<replacefilter token="@version@" value="${mapVersionTag}"/>
-		</replace>
-		<fixcrlf srcdir="${working}/collector" eol="${eol}" eof="asis" includes="*"/>
-		<copy todir="${working}/collector">
-			<fileset dir="${working}/jars" includes="*"/>
-			<fileset dir="${builder}/template" includes="notice.html,epl-v10.html" />
-		</copy>
-	</target>
-
-	<!-- =====================================================================
-	     Specialized targets hide/reveal the server stuff so it doesn't get packaged
-	     in the client.          
-	     ===================================================================== -->
-
-	<!-- ===================================================================== -->
-	<!-- Zip the docs                                                          -->
-	<!-- ===================================================================== -->
-	<target name="zipDoc">
-		<zip destfile="${buildDirectory}\plugins\${docPluginID}\doc.zip" filesonly="false" defaultexcludes="true">
-			<fileset dir="${buildDirectory}\plugins\${docPluginID}" defaultexcludes="true">
-				<include name="**/*.gif" />
-				<include name="**/*.html" />
-				<include name="**/*.htm" />
-				<include name="**/*.GIF" />
-				<include name="**/*.HTML" />
-				<include name="**/*.HTM" />
-				<include name="**/*.css" />
-			</fileset>
-		</zip>
-	</target>
-	
-</project>
diff --git a/releng/org.eclipse.rse.build/downloads/.cvsignore b/releng/org.eclipse.rse.build/downloads/.cvsignore
deleted file mode 100644
index a17291e0f..000000000
--- a/releng/org.eclipse.rse.build/downloads/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-drops
diff --git a/releng/org.eclipse.rse.build/downloads/build_types.html b/releng/org.eclipse.rse.build/downloads/build_types.html
deleted file mode 100644
index 759069c19..000000000
--- a/releng/org.eclipse.rse.build/downloads/build_types.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<title>Eclipse Corner</title>
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000">
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font face="Arial,Helvetica" color="#ffffff">Eclipse 
-      Project Build Types</font></b></td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td> 
-      <p><b><font face="arial,helvetica,geneva" size="-1">R - Releases</font></b> 
-        <br>
-        <font size="-1" face="arial,helvetica,geneva">Releases are builds 
-        that have been declared major releases by the development team - for example 
-        &quot;R1.0&quot;. Releases are the right builds for people who want to 
-        be on a stable, tested release, and don't need the latest greatest features 
-        and improvements. Release builds always have an &quot;R&quot; at the beginning 
-        of the name i.e. R1.0, R2.0 etc. Non-release builds are named according to the 
-        date of the build - for example 20060427 is the build from April 27, 2006.</font><br>
-      </p>
-    </td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">S - Stable Builds</font></b> 
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Stable builds are integration 
-      builds that have been found to be stable enough for most people to use. 
-      They are promoted from integration build to stable build by the architecture 
-      team after they have been used for a few days and deemed reasonably stable. 
-      The latest stable build is the right build for people who want to stay up 
-      to date with what is going on in the latest development stream, and don't 
-      mind putting up with a few problems n in order to get the latest greatest 
-      features and bug fixes. The latest stable build is the one the development 
-      team likes people to be using, because of the valuable and timely feedback. 
-      </font></td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td>
-      <p><b><font face="arial,helvetica,geneva" size="-1">I - Integration Builds</font></b> 
-        <br>
-        <font size="-1" face="arial,helvetica,geneva"> Periodically, component 
-        teams version off their work in what they believe is a stable, consistent 
-        state, and they update the build configuration to indicate that the next 
-        integration build should take this version of the component. Integration 
-        builds are built from these stable component versions that have been specified 
-        by each component team as the best version available. Integration builds 
-        may be promoted to stable builds after a few days of testing. Integration 
-        builds are built whenever new stable component versions are released into 
-        the build.</font></p>
-      </td>
-  </tr>
-  <tr> 
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">N - Nightly Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Nightly builds are produced 
-      every night from whatever has been released into the HEAD stream of the 
-      CVS repository. They are completely untested and will almost always have 
-      major problems. Many will not work at all. These drops are normally only 
-      useful to developers actually working on the Eclipse Project.</font></td>
-  </tr>
-  <tr>
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">J,M - Maintenance Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Maintenance builds are produced
-       periodically to incorporate fixes into an existing release. They are typically
-       built from tagged plug-in and feature pojects in a maintenance stream of the CVS 
-       repository (i.e. R1_0_maintenance). Maintenance builds are promoted to a minor 
-       or service release (i.e. R1.1 or R1.0.1) after development teams have deemed one 
-       to be stable following one or more test-fix pass cycles.</font></td>
-  </tr> 
-  <tr>
-    <td align=right valign=top><img src="http://www.eclipse.org/images/Adarrow.gif" border=0 height=16 width=16></td>
-    <td><b><font face="arial,helvetica,geneva" size="-1">K,L - Legacy Builds</font></b>
-      <br>
-      <font size="-1" face="arial,helvetica,geneva"> Legacy builds are maintenance builds
-       for some older release, after the usual service releases (n.n.2 release). 
-       Legacy builds do not intend to culminate into any release, and are produced for
-       escalated fixes only on request. Typically, companies requesting a legacy build
-       need to contribute the resources for doing that build themselves.</font></td>
-  </tr> 
-</table>
-<h3>&nbsp;</h3>
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/downloads/dlconfig.txt b/releng/org.eclipse.rse.build/downloads/dlconfig.txt
deleted file mode 100644
index 5c592f9ab..000000000
--- a/releng/org.eclipse.rse.build/downloads/dlconfig.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-dropPrefix[]=R&dropPrefix[]=S&dropPrefix[]=I&dropPrefix[]=N&dropPrefix[]=J&dropPrefix[]=L&
-dropType[]=Latest Release&dropType[]=3.2 Stream Stable Build&dropType[]=3.2 Stream Integration Build&dropType[]=3.2 Stream Nightly Build&dropType[]=3.1.x Stream Maintenance Build&dropType[]=3.0.x Stream Legacy Build&
diff --git a/releng/org.eclipse.rse.build/downloads/index.php b/releng/org.eclipse.rse.build/downloads/index.php
deleted file mode 100644
index e42cd680b..000000000
--- a/releng/org.eclipse.rse.build/downloads/index.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<html><head>
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css">
-<title>Target Management Project RSE Downloads</title></head>
-<body>
-
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=left width="72%"> <font class=indextop>Target Management project<br/>RSE downloads</font> 
-      <br>
-      <font class=indexsub>latest downloads from the TM project</font><br>
-</td>
-    <td width="28%"><img src="http://www.eclipse.org/images/Idea.jpg" height=86 width=120></td>
-  </tr>
-
-</table>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-	
-	<tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Download Information</font></b></td>
-  </tr>
-  
-	<tr> <td> <p>On this
-page you can find the latest 
-<a href="build_types.html">builds</a> for the Remote System Explorer (RSE),
-provided by the 
-<a href="http://www.eclipse.org/tm/">Target Management</a> project.
-<!--
-To get started run the program and go through the
-user and developer documentation provided in the online help system.
--->
-To get started, see the build notes provided with each drop, run the
-program and go through the online user and developer documentation,
-or take a look at the project's online
-<a href="http://www.eclipse.org/tm/tutorial/index.php">getting started</a>
-pages.
-
-If you have problems downloading the drops, contact the 
-<font face="arial,helvetica,geneva" size="-1"><a href="mailto:webmaster@eclipse.org">webmaster</a></font>.
-If you have problems installing or getting the workbench to run, 
-check out the 
-<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">Target Management FAQ</a>,
-or try posting a question to the 
-<a href="http://www.eclipse.org/forums/eclipse.tm">eclipse.tm Forum</a>.
-All downloads are provided under the terms and conditions of the 
-<a href="http://www.eclipse.org/legal/epl/notice.php">Eclipse.org
-Software User Agreement</a> unless otherwise specified. </p>
-
-<p>
-<b>Other eclipse.org project</b> downloads are available
-<a href="http://www.eclipse.org/downloads/index.php">here</a>.<br/>
-If you just want the latest drops (no dstore server), you can also get them from the 
-<a href="http://download.eclipse.org/tm/updates/3.2">TM 3.2 update site</a> (latest release), or the
-<a href="http://download.eclipse.org/tm/updates/3.2milestones">TM 3.2 milestone site</a> (stable milestones).</p>
-
-<p>
-For information about different kinds of builds look
-<a href="build_types.html" target="_top">here</a>.
-
-<img src="http://www.eclipse.org/images/new.gif">
-For access to archived builds, look 
-<a href="http://archive.eclipse.org/tm/downloads/index.php" target="_top">here</a>.
-</p>
-
-<p/>
-<!--
-<p>Builds can also be installed via Update Manager, from an existing installation of Eclipse, by following these  
-<a href="http://download.eclipse.org/tm/downloads/updates/index.php" target="_self">steps</a>.
-</p>
--->
-</td></tr>
-	
-  <tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Latest 
-      Downloads</font></b></td>
-  </tr>
-  </table>
-  <?php
-	$fileHandle = fopen("dlconfig.txt", "r");
-	while (!feof($fileHandle)) {
-		$aLine = fgets($fileHandle, 4096);
-		parse_str($aLine);
-	}
-	fclose($fileHandle);
-	
-	for ($i = 0; $i < count($dropType); $i++) {
-		$typeToPrefix[$dropType[$i]] = $dropPrefix[$i];
-	}
-	
-	$aDirectory = dir("drops");
-	while ($anEntry = $aDirectory->read()) {
-
-		// Short cut because we know aDirectory only contains other directories.
-		if ($anEntry != "." && $anEntry!="..") {
-			$aDropDirectory = dir("drops/".$anEntry);
-			$fileCount = 0;
-			while ($aDropEntry = $aDropDirectory->read()) {
-				if (stristr($aDropEntry, ".zip") || stristr($aDropEntry, ".tar")) {
-					// Count the files in the directory
-					$fileCount = $fileCount + 1;
-				}
-			}
-			//See http://at2.php.net/manual/en/class.dir.php
-			$aDropDirectory->close();
-			// Read the count file
-			$countFile = "drops/".$anEntry."/package.count";
-			$indexFile = "drops/".$anEntry."/index.php";
-			if (file_exists($countFile) && file_exists($indexFile)) {
-				$anArray = file($countFile);
-	
-				// If a match - process the directory
-				if ($anArray[0] == $fileCount) {
-					$parts = explode("-", $anEntry);
-					if (count($parts) == 2) {
-
-						//N-builds and I-builds	
-						$datePart = $parts[0];
-						$timePart = $parts[1];
-						$buildtype = substr($datePart, 0, 1);
-						$buckets[$buildtype][] = $anEntry;
-			
-						$year = substr($datePart, 1, 4);
-						$month = substr($datePart, 5, 2);
-						$day = substr($datePart, 7, 2);
-						$hour = substr($timePart,0,2);
-						$minute = substr($timePart,2,2);
-						$timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
-					
-						$timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
-			
-						if ($timeStamp > $latestTimeStamp[$buildtype]) {
-							$latestTimeStamp[$buildtype] = $timeStamp;
-							$latestFile[$buildtype] = $anEntry;
-						}
-
-					} else if (count($parts) == 3) {
-
-						//S-builds and R-builds
-						$buckets[$parts[0]][] = $anEntry;
-			
-						$timePart = $parts[2];
-						$year = substr($timePart, 0, 4);
-						$month = substr($timePart, 4, 2);
-						$day = substr($timePart, 6, 2);
-						$hour = substr($timePart,8,2);
-						$minute = substr($timePart,10,2);
-						$timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
-					
-						$timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
-			
-						if ($timeStamp > $latestTimeStamp[$parts[0]]) {
-							$latestTimeStamp[$parts[0]] = $timeStamp;
-							$latestFile[$parts[0]] = $anEntry;
-						}
-					}
-				}
-			}
-		}
-	}
-	$aDirectory->close();
- ?>
- 
-<table width="100%" cellspacing=0 cellpadding=3 align=center>
-<td align=left>
-<TABLE  width="100%" CELLSPACING=0 CELLPADDING=3>
-<tr>
-	<td width=\"30%\"><b>Build Type</b></td>
-	<td><b>Build Name</b></td>
-	<td><b>Build Date</b></td>
-</tr>
-
-<?php
-	foreach($dropType as $value) {
-		$prefix=$typeToPrefix[$value];
-		$fileName = $latestFile[$prefix];
-		echo "<tr>
-			<td width=\"30%\">$value</td>";
-		
-		$parts = explode("-", $fileName);
-		if (count($parts) == 2) {
-			$buildName=$fileName;
-		} else {
-			$buildName=$parts[1];
-		}
-		
-		// Uncomment the line below if we need click through licenses.
-		// echo "<td><a href=license.php?license=drops/$fileName>$buildName</a></td>";
-		
-		// Comment the line below if we need click through licenses.
-		echo "<td><a href=\"drops/$fileName/index.php\">$buildName</a></td>";
-		
-		echo "<td>$timeStamps[$fileName]</td>";
-		echo "</tr>";
-	}
-?>
-</table>
-</table>
-&nbsp;
-<?php
-	foreach($dropType as $value) {
-		$prefix=$typeToPrefix[$value];
-		echo "
-		<table width=\"100%\" cellspacing=0 cellpadding=3 align=center>
-		<tr bgcolor=\"#999999\">
-		<td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value";
-		echo "s</font></b></a></td>
-		</TR>
-		<TR>
-		<td align=left>
-		<TABLE  width=\"100%\" CELLSPACING=0 CELLPADDING=3>
-		<tr>
-		<td width=\"30%\"><b>Build Name</b></td>
-		<td><b>Build Date</b></td>
-		</tr>";
-		
-		$aBucket = $buckets[$prefix];
-		if (isset($aBucket)) {
-			rsort($aBucket);
-			foreach($aBucket as $innerValue) {
-				$parts = explode("-", $innerValue);
-				if (count($parts) == 2) {
-					$buildName=$innerValue;
-				} else {
-					$buildName=$parts[1];
-				}
-				echo "<tr>";
-				
-					// Uncomment the line below if we need click through licenses.
-					// echo "<td><a href=\"license.php?license=drops/$innerValue\">$buildName</a></td>";
-					
-					// Comment the line below if we need click through licenses.
-					echo "<td><a href=\"drops/$innerValue/index.php\">$buildName</a></td>";
-
-					echo "<td>$timeStamps[$innerValue]</td>
-					</tr>";
-			}
-		}
-		echo "</table></table>&nbsp;";
-	}
-?>
-
-&nbsp;
-</body></html>
diff --git a/releng/org.eclipse.rse.build/fetchBuilder.pl b/releng/org.eclipse.rse.build/fetchBuilder.pl
deleted file mode 100755
index e4c3cd7cf..000000000
--- a/releng/org.eclipse.rse.build/fetchBuilder.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl
-#*******************************************************************************
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# David Dykstal (IBM) - initial API and implementation
-# Martin Oberhuber (Wind River) - ongoing maintenance
-#*******************************************************************************
-use warnings;
-
-print STDERR "Which tag do you want to fetch? (default is HEAD): ";
-$answer = <STDIN>;
-chomp($answer);
-$tag = $answer ? $answer : "HEAD";
-
-$incantation = "cvs ";
-$incantation .= '-d :pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools ';
-$incantation .= "checkout ";
-$incantation .= "-r ${tag} ";
-$incantation .= "-d builder ";
-$incantation .= "org.eclipse.tm.rse/releng/org.eclipse.rse.build ";
-
-print($incantation);
-system($incantation);
-
-print("\n");
-print("Builder has been fetched and is in the builder subdirectory\n");
diff --git a/releng/org.eclipse.rse.build/go.sh b/releng/org.eclipse.rse.build/go.sh
deleted file mode 100755
index b6d88e3a8..000000000
--- a/releng/org.eclipse.rse.build/go.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-# go.sh -- build script like nightly build but for testing stuff without
-# fetch in a local workspace
-#
-# Prerequisites:
-# - Eclipse 3.2 installed or linked from ../eclipse
-# - org.eclipse.releng.basebuilder checked out to ../org.eclipse.releng.basebuilder
-#
-#author: martin oberhuber
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-# pathes: see build.rb for reference
-cd "$mydir/../eclipse" ; eclipse=`pwd`
-cd "$mydir/../org.eclipse.releng.basebuilder" ; basebuilder=`pwd`
-cd "$mydir/../working" ; working=`pwd`
-cd "$mydir/../publish" ; publishDirectory=`pwd`
-cd "$mydir" ; builder=`pwd`
-
-# Find the base build scripts: genericTargets.xml and build.xml
-pdeBuild="${basebuilder}/plugins/org.eclipse.pde.build"
-buildDirectory="${working}/build"
-packageDirectory="${working}/package"
-
-tag="HEAD"
-buildType="N"
-mydstamp=`date +'%Y%m%d'`
-mytstamp=`date +'%H%M'`
-timestamp="${mydstamp}-${mytstamp}"
-buildId="${buildType}${timestamp}"
-rm -rf "${buildDirectory}"
-
-# default value of the bootclasspath attribute used in ant javac calls.
-# these pathes are valid on build.eclipse.org  
-bootclasspath="/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar"
-bootclasspath_15="/shared/common/jdk-1.5.0_16/jre/lib/rt.jar"
-#bootclasspath_16="$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar"
-#bootclasspath_foundation="/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
-bootclasspath_foundation11="/shared/tools/tm/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
-
-command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
-command="$command -application org.eclipse.ant.core.antRunner "
-command="$command -buildfile ${pdeBuild}/scripts/build.xml "
-command="$command -DbuildDirectory=${buildDirectory} "
-command="$command -DpackageDirectory=${packageDirectory} "
-command="$command -DpublishDirectory=${publishDirectory} "
-command="$command -Dbuilder=${builder} "
-command="$command -DbaseLocation=${eclipse} "
-command="$command -DbuildType=${buildType} "
-command="$command -DbuildId=${buildId} "
-command="$command -DmapVersionTag=${tag} "
-command="$command -DdoPublish=true "
-command="$command -DforceContextQualifier=${buildId} "
-command="$command -DfetchTag=HEAD "
-command="$command -DskipFetch "
-command="$command -Dmydstamp=${mydstamp} "
-command="$command -Dmytstamp=${mytstamp} "
-#command="$command -Dbootclasspath=${bootclasspath} "
-#command="$command -DJ2SE-1.4=${bootclasspath} "
-#command="$command -DJ2SE-1.5=${bootclasspath_15} "
-#command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "
-#command="$command -DJ2SE-1.2=../jres/1.2.2/lib/rt.jar "
-#command="$command postBuild "
-
-echo "$command"
-exec $command
diff --git a/releng/org.eclipse.rse.build/maps/discovery.map b/releng/org.eclipse.rse.build/maps/discovery.map
deleted file mode 100644
index 29156036d..000000000
--- a/releng/org.eclipse.rse.build/maps/discovery.map
+++ /dev/null
@@ -1,10 +0,0 @@
-feature@org.eclipse.tm.discovery=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature
-plugin@org.eclipse.rse.discovery=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery
-plugin@org.eclipse.tm.discovery.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv
-plugin@org.eclipse.tm.discovery.engine=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine
-plugin@org.eclipse.tm.discovery.model=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model
-plugin@org.eclipse.tm.discovery.model.edit=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit
-plugin@org.eclipse.tm.discovery.protocol.dnssd=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd
-plugin@org.eclipse.tm.discovery.transport.udp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp
-plugin@org.eclipse.tm.discovery.view=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view
-plugin@org.eclipse.tm.discovery.wizard=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
deleted file mode 100644
index d8b5fc22d..000000000
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ /dev/null
@@ -1,64 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-!*** Project's plugins, features and fragments
-feature@org.eclipse.rse=R32x_v201106081352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
-feature@org.eclipse.rse.core=R32x_v201105041224,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
-feature@org.eclipse.rse.dstore=R32x_v201105041224,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
-feature@org.eclipse.rse.examples=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
-feature@org.eclipse.rse.ftp=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
-feature@org.eclipse.rse.local=R32x_v201105041224,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
-feature@org.eclipse.rse.sdk=R32x_v201106081352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
-feature@org.eclipse.rse.ssh=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
-feature@org.eclipse.rse.telnet=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
-feature@org.eclipse.rse.terminals=R32x_v201106081352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature
-feature@org.eclipse.rse.tests=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature
-feature@org.eclipse.rse.useractions=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions-feature
-!!feature@org.eclipse.rse.useractions.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions.wrapper-feature
-!!feature@org.eclipse.tm.releng.master=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature
-plugin@org.eclipse.dstore.core=R32x_v201201102013,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
-plugin@org.eclipse.dstore.doc.isv=v201005221130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
-plugin@org.eclipse.dstore.extra=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
-plugin@org.eclipse.rse=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse
-plugin@org.eclipse.rse.connectorservice.dstore=v201005281600,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
-plugin@org.eclipse.rse.connectorservice.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
-plugin@org.eclipse.rse.connectorservice.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh
-plugin@org.eclipse.rse.connectorservice.telnet=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet
-plugin@org.eclipse.rse.core=R32x_v201110041609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
-plugin@org.eclipse.rse.doc.isv=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv
-plugin@org.eclipse.rse.doc.user=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user
-plugin@org.eclipse.rse.dstore.security=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
-plugin@org.eclipse.rse.efs=v201005262000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs
-plugin@org.eclipse.rse.efs.ui=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs.ui
-plugin@org.eclipse.rse.examples.daytime=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime
-plugin@org.eclipse.rse.examples.tutorial=R32x_v201108311442,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial
-plugin@org.eclipse.rse.files.ui=R32x_v201201161603,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
-plugin@org.eclipse.rse.importexport=R32x_v201104131324,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport
-plugin@org.eclipse.rse.processes.ui=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
-plugin@org.eclipse.rse.sdk=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
-plugin@org.eclipse.rse.services.dstore=R32x_v201112131340,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
-plugin@org.eclipse.rse.services.files.ftp=v201004072040,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
-plugin@org.eclipse.rse.services.local=R32x_v201105271758,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
-plugin@org.eclipse.rse.services.ssh=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
-plugin@org.eclipse.rse.services.telnet=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet
-plugin@org.eclipse.rse.services=R32x_v201112131340,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
-plugin@org.eclipse.rse.shells.ui=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
-plugin@org.eclipse.rse.subsystems.files.core=R32x_v201201121623,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
-plugin@org.eclipse.rse.subsystems.files.dstore=R32x_v201108311442,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
-plugin@org.eclipse.rse.subsystems.files.ftp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
-plugin@org.eclipse.rse.subsystems.files.local=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
-plugin@org.eclipse.rse.subsystems.files.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ssh
-plugin@org.eclipse.rse.subsystems.processes.core=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core
-plugin@org.eclipse.rse.subsystems.processes.dstore=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore
-plugin@org.eclipse.rse.subsystems.processes.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
-plugin@org.eclipse.rse.subsystems.processes.shell.linux=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux
-plugin@org.eclipse.rse.subsystems.shells.core=R32x_v2011061349,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
-plugin@org.eclipse.rse.subsystems.shells.dstore=v201008191400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
-plugin@org.eclipse.rse.subsystems.shells.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
-plugin@org.eclipse.rse.subsystems.shells.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
-plugin@org.eclipse.rse.subsystems.shells.telnet=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet
-plugin@org.eclipse.rse.subsystems.terminals.core=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core
-plugin@org.eclipse.rse.subsystems.terminals.ssh=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh
-plugin@org.eclipse.rse.terminals.ui=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui
-plugin@org.eclipse.rse.tests=v201006050745,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
-plugin@org.eclipse.rse.tests.framework=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
-plugin@org.eclipse.rse.ui=R32x_v201201102013,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
-plugin@org.eclipse.rse.useractions=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map
deleted file mode 100644
index 05035d242..000000000
--- a/releng/org.eclipse.rse.build/maps/terminal.map
+++ /dev/null
@@ -1,16 +0,0 @@
-feature@org.eclipse.tm.terminal=R32x_v201106081352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
-feature@org.eclipse.tm.terminal.local=v201006041240,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature
-feature@org.eclipse.tm.terminal.local.sdk=R32x_v201106081352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local.sdk-feature
-feature@org.eclipse.tm.terminal.sdk=R32x_v201106081352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
-feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
-feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature
-feature@org.eclipse.tm.terminal.telnet=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet-feature
-feature@org.eclipse.tm.terminal.test=v201006042100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test-feature
-feature@org.eclipse.tm.terminal.view=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature
-plugin@org.eclipse.tm.terminal=R32x_v201106081352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal
-plugin@org.eclipse.tm.terminal.local=v201006041322,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local
-plugin@org.eclipse.tm.terminal.serial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial
-plugin@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh
-plugin@org.eclipse.tm.terminal.telnet=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet
-plugin@org.eclipse.tm.terminal.test=v201006050745,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test
-plugin@org.eclipse.tm.terminal.view=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/maps/testdrivers.map b/releng/org.eclipse.rse.build/maps/testdrivers.map
deleted file mode 100644
index abc0ee77a..000000000
--- a/releng/org.eclipse.rse.build/maps/testdrivers.map
+++ /dev/null
@@ -1,6 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-
-!*** Special entries from eclipse
-
-plugin@org.eclipse.test=v20100118,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-fragment@org.eclipse.ant.optional.junit=v20080717,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
diff --git a/releng/org.eclipse.rse.build/maps/tmcore.map b/releng/org.eclipse.rse.build/maps/tmcore.map
deleted file mode 100644
index 3bed665a1..000000000
--- a/releng/org.eclipse.rse.build/maps/tmcore.map
+++ /dev/null
@@ -1,2 +0,0 @@
-plugin@org.apache.commons.net,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.commons.net_2.0.0.v200905272248.jar
-plugin@org.apache.commons.net.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.commons.net.source_2.0.0.v200905272248.jar
diff --git a/releng/org.eclipse.rse.build/maps/wince.map b/releng/org.eclipse.rse.build/maps/wince.map
deleted file mode 100644
index a457e988e..000000000
--- a/releng/org.eclipse.rse.build/maps/wince.map
+++ /dev/null
@@ -1,6 +0,0 @@
-feature@org.eclipse.rse.wince=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.rse.wince-feature
-!! feature@org.eclipse.rse.wince.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.wince.wrapper-feature
-plugin@org.eclipse.rse.subsystems.wince=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.rse.subsystems.wince
-plugin@org.eclipse.tm.rapi=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi
-plugin@org.eclipse.tm.rapi.examples=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.examples
-plugin@org.eclipse.tm.rapi.tests=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.tests
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/message.in b/releng/org.eclipse.rse.build/message.in
deleted file mode 100644
index c97e2a4b0..000000000
--- a/releng/org.eclipse.rse.build/message.in
+++ /dev/null
@@ -1,6 +0,0 @@
-The build is available at
-
-	http://download.eclipse.org/tm/downloads/drops/@dropDir@
-
-Cheers,
-the RSE nightly build...
diff --git a/releng/org.eclipse.rse.build/monitor.properties b/releng/org.eclipse.rse.build/monitor.properties
deleted file mode 100755
index 7e115672c..000000000
--- a/releng/org.eclipse.rse.build/monitor.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# properties file used by the class org.eclipse.releng.build.listeners.EclipseBuildListener
-
-#prefix added to subject line of build related email messages
-buildSubjectPrefix=[RSE-build]
-
-#email information for sending build failure notices
-host=localhost
-sender=moberhuber@eclipse.org
-
-#the http Url to Eclipse drop directories
-httpUrl=http://download.eclipse.org/tm/downloads/drops
-
-#the ftp Url to Eclipse drop directories
-#ftpUrl=ftp://download.eclipse.org
-
-#use comma separated list for recipients
-#build log name.This file is copied into drop directory until files.count file updated with correct number of zip files
-#additional information added a build time by build shell script
-#buildid, timestamp, buildLabel, email notification list, buildlog location
diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh
deleted file mode 100755
index 7178a19af..000000000
--- a/releng/org.eclipse.rse.build/nightly.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2010 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#nightly build for RSE - to be executed on build.eclipse.org
-#
-# Usage:
-#   nightly.sh [mapVersionTag] [buildType] [buildId]
-# Examples:
-#   nightly.sh HEAD I
-#   nightly.sh HEAD S 1.0RC3
-#
-# Prerequisites:
-# - Eclipse 3.2 installed or linked from ../eclipse
-# - org.eclipse.releng.basebuilder checked out to ../org.eclipse.releng.basebuilder
-#
-#author: martin oberhuber
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-# pathes: see build.rb for reference
-cd "$mydir/../eclipse" ; eclipse=`pwd`
-cd "$mydir/../org.eclipse.releng.basebuilder" ; basebuilder=`pwd`
-cd "$mydir/../working" ; working=`pwd`
-cd "$mydir/../publish" ; publishDirectory=`pwd`
-cd "$mydir" ; builder=`pwd`
-
-# SPECIAL 3.2m6: Build with target platform 3.5m6 rather than basebuilder
-# basebuilder=${eclipse}
-
-# Find the base build scripts: genericTargets.xml and build.xml
-cd "${basebuilder}/plugins"
-if [ -f org.eclipse.equinox.launcher.jar ]; then
-  launcher=org.eclipse.equinox.launcher.jar
-else
-  launcher=`ls org.eclipse.equinox.launcher_*.jar | sort | tail -1`
-fi
-pdeBuild=`ls -d org.eclipse.pde.build* | sort | tail -1`
-cd "${builder}"
-pdeBuild="${basebuilder}/plugins/${pdeBuild}"
-buildDirectory="${working}/build"
-packageDirectory="${working}/package"
-
-tag="HEAD"
-if [ "$1" != "" ]; then
-  tag="$1"
-fi
-buildType="N"
-if [ "$2" != "" ]; then
-  buildType="$2"
-fi
-mydstamp=`date +'%Y%m%d'`
-mytstamp=`date +'%H%M'`
-timestamp="${mydstamp}-${mytstamp}"
-buildId="${buildType}${timestamp}"
-if [ "$3" != "" ]; then
-  buildId="$3"
-fi
-rm -rf "${buildDirectory}"
-
-# default value of the bootclasspath attribute used in ant javac calls.
-# these pathes are valid on build.eclipse.org  
-bootclasspath="/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/rt.jar:/shared/tools/tm/JDKs/win32/j2sdk1.4.2_19/jre/lib/jsse.jar"
-bootclasspath_15="/shared/common/jdk-1.5.0_16/jre/lib/rt.jar"
-#bootclasspath_16="$builderDir/jdk/win32_16/jdk6/jre/lib/rt.jar"
-#bootclasspath_foundation="/shared/common/Java_ME_platform_SDK_3.0_EA/runtimes/cdc-hi/lib/rt.jar"
-bootclasspath_foundation11="/shared/tools/tm/JDKs/win32/j9_cdc11/lib/jclFoundation11/classes.zip"
-
-
-command="java -cp ${basebuilder}/plugins/${launcher} org.eclipse.core.launcher.Main "
-command="$command -application org.eclipse.ant.core.antRunner "
-command="$command -buildfile ${pdeBuild}/scripts/build.xml "
-command="$command -DbuildDirectory=${buildDirectory} "
-command="$command -DpackageDirectory=${packageDirectory} "
-command="$command -DpublishDirectory=${publishDirectory} "
-command="$command -Dbuilder=${builder} "
-command="$command -DbaseLocation=${eclipse} "
-command="$command -DbuildType=${buildType} "
-command="$command -DbuildId=${buildId} "
-command="$command -DmapVersionTag=${tag} "
-command="$command -Dmydstamp=${mydstamp} "
-command="$command -Dmytstamp=${mytstamp} "
-if [ "$buildType" = "N" ]; then
-  command="$command -DforceContextQualifier=${buildId} "
-  command="$command -DfetchTag=HEAD "
-fi
-command="$command -DdoPublish=true "
-command="$command -Dbootclasspath=${bootclasspath} "
-command="$command -DJ2SE-1.4=${bootclasspath} "
-command="$command -DJ2SE-1.5=${bootclasspath_15} "
-command="$command -DCDC-1.1/Foundation-1.1=${bootclasspath_foundation11} "
-#command="$command postBuild "
-
-echo "$command"
-exec $command
diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh
deleted file mode 100755
index cee157340..000000000
--- a/releng/org.eclipse.rse.build/setup.sh
+++ /dev/null
@@ -1,285 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2010 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-#
-# setup.sh : Set up an environment for building TM / RSE
-# Works on build.eclipse.org -- may need to be adjusted
-# for other hosts.
-#
-# This must be run in $HOME/ws_32x in order for the mkTestUpdateSite.sh
-# script to find the published packages
-#
-# Bootstrapping: Get this script by
-# export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools
-# cvs co -r R3_2_maintenance org.eclipse.tm.rse/releng/org.eclipse.rse.build
-# sh org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh
-#
-# - OR -
-#
-# wget -O setup.sh "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.rse/releng/org.eclipse.rse.build/setup.sh?rev=HEAD&cvsroot=Tools_Project&content-type=text/plain"
-# sh setup.sh
-# ./doit_ibuild.sh
-# cd test32Updates/bin
-# mkTestUpdates.sh
-
-curdir=`pwd`
-
-uname_s=`uname -s`
-uname_m=`uname -m`
-case ${uname_s}${uname_m} in
-  Linuxppc*) ep_arch=linux-gtk-ppc
-             cdt_arch=linux.ppc
-             ;;
-  Linuxx86_64*) ep_arch=linux-gtk-x86_64 
-                cdt_arch=linux.x86_64
-                ;;
-  Linuxx86*) ep_arch=linux-gtk
-             cdt_arch=linux.x86
-             ;;
-esac
-
-# prepare the base Eclipse installation in folder "eclipse"
-ep_rel="R-"
-ep_ver=3.6.1
-ep_date="-201009090800"
-P2_disabled=false
-P2_no_dropins=false
-if [ ! -f eclipse/plugins/org.eclipse.swt_3.6.1.v3655c.jar ]; then
-  curdir2=`pwd`
-  if [ ! -d eclipse -o -h eclipse ]; then
-    if [ -d eclipse-${ep_ver}-${ep_arch} ]; then
-      rm -rf eclipse-${ep_ver}-${ep_arch}
-    fi
-    mkdir eclipse-${ep_ver}-${ep_arch}
-    cd eclipse-${ep_ver}-${ep_arch}
-  else
-    rm -rf eclipse
-  fi
-  # Eclipse SDK: Need the SDK so we can link into docs
-  echo "Getting Eclipse SDK..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}${ep_ver}${ep_date}/eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz"
-  tar xfvz eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz
-  rm eclipse-SDK-${ep_ver}-${ep_arch}.tar.gz
-  cd "${curdir2}"
-  if [ ! -d eclipse -o -h eclipse ]; then
-    if [ -e eclipse ]; then 
-      rm eclipse
-    fi
-    ln -s eclipse-${ep_ver}-${ep_arch}/eclipse eclipse
-  fi
-fi
-if [ ! -f eclipse/startup.jar ]; then
-  curdir2=`pwd`
-  cd eclipse/plugins
-  if [ -h ../startup.jar ]; then
-    rm ../startup.jar
-  fi
-  LAUNCHER=`ls org.eclipse.equinox.launcher_*.jar | sort | tail -1`
-  if [ "${LAUNCHER}" != "" ]; then
-    echo "eclipse LAUNCHER=${LAUNCHER}" 
-    ln -s plugins/${LAUNCHER} ../startup.jar
-  else
-    echo "Eclipse: NO startup.jar LAUNCHER FOUND!"
-  fi
-  cd ${curdir2}
-fi
-
-if ${P2_no_dropins} ; then
-  #P2 disabled?
-  DROPIN=.
-  DROPUP=.
-else
-  #P2 enabled
-  DROPIN=eclipse/dropins
-  DROPUP=../..
-fi
-
-# EMF 2.5.0
-EMFBRANCH=2.5.0
-EMFREL=R
-EMFDATE=200906151043
-EMFVER=2.5.0
-if [ ! -f ${DROPIN}/eclipse/plugins/org.eclipse.emf.doc_${EMFBRANCH}.v${EMFDATE}.jar ]; then
-  # Need EMF 2.4 SDK for Service Discovery ISV Docs Backlinks
-  echo "Getting EMF SDK..."
-  cd ${DROPIN}
-  wget "http://download.eclipse.org/modeling/emf/emf/downloads/drops/${EMFBRANCH}/${EMFREL}${EMFDATE}/emf-xsd-SDK-${EMFVER}.zip"
-  unzip -o emf-xsd-SDK-${EMFVER}.zip
-  rm emf-xsd-SDK-${EMFVER}.zip
-  cd ${DROPUP}
-fi
-if [ ! -f eclipse/plugins/org.junit_3.8.2.v3_8_2_v20100427-1100/junit.jar ]; then
-  # Eclipse Test Framework
-  echo "Getting Eclipse Test Framework..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}${ep_ver}${ep_date}/eclipse-test-framework-${ep_ver}.zip"
-  unzip -o eclipse-test-framework-${ep_ver}.zip
-  rm eclipse-test-framework-${ep_ver}.zip
-fi
-if [ ! -f ${DROPIN}/eclipse/plugins/gnu.io.rxtx_2.1.7.4_v20071016.jar ]; then
-  echo "Getting RXTX..."
-  cd ${DROPIN}
-  #wget "http://rxtx.qbang.org/eclipse/downloads/RXTX-SDK-I20071016-1945.zip"
-  #unzip -o RXTX-SDK-I20071016-1945.zip
-  #rm RXTX-SDK-I20071016-1945.zip
-  wget "http://download.eclipse.org/athena/runnables/RXTX-runtime-I20071016-1945.zip"
-  unzip -o RXTX-runtime-I20071016-1945.zip
-  rm RXTX-runtime-I20071016-1945.zip
-  cd ${DROPUP}
-fi
-
-# Sonatype / Tycho app for generating p2 download stats
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=310132
-if [ ! -f ${DROPIN}/org.sonatype.tycho.p2.updatesite_0.9.0.201005191712.jar ]; then
-  echo "Getting Download Stats Generator..."
-  cd ${DROPIN}
-  wget "https://bugs.eclipse.org/bugs/attachment.cgi?id=171500" -O addStats_v3.zip
-  unzip -o addStats_v3.zip
-  rm addStats_v3.zip
-  cd ${DROPUP}
-fi
-
-# CDT Runtime
-#CDTREL=6.0.0
-#CDTVER=200902031437
-#CDTNAME=cdt-master-5.0.0.zip
-#CDTLOC=releases/ganymede/dist/${CDTNAME}
-CDTREL=7.0.1
-CDTFEAT=7.0.1
-CDTVER=201009241320
-CDTNAME=cdt-master-${CDTREL}-I${CDTVER}.zip
-CDTLOC=builds/${CDTREL}/I.I${CDTVER}/${CDTNAME}
-if [ ! -f eclipse/plugins/org.eclipse.cdt_${CDTFEAT}.${CDTVER}.jar ]; then
-  echo "Getting CDT Runtime..."
-  wget "http://download.eclipse.org/tools/cdt/${CDTLOC}"
-  CDTTMP=`pwd`/tmp.$$
-  mkdir ${CDTTMP}
-  cd ${CDTTMP}
-  unzip ../${CDTNAME}
-  cd ..
-  #java -jar eclipse/startup.jar \
-  LAUNCHER=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar | sort | tail -1`
-  java -jar ${LAUNCHER} \
-    -application org.eclipse.update.core.standaloneUpdate \
-    -command install \
-    -from file://${CDTTMP} \
-    -featureId org.eclipse.cdt.platform \
-    -version ${CDTFEAT}.${CDTVER}
-  java -jar ${LAUNCHER} \
-    -application org.eclipse.update.core.standaloneUpdate \
-    -command install \
-    -from file://${CDTTMP} \
-    -featureId org.eclipse.cdt \
-    -version ${CDTFEAT}.${CDTVER}
-  rm -rf ${CDTTMP}
-  rm ${CDTNAME}
-fi
-
-# checkout the basebuilder
-#baseBuilderTag=R36_RC4
-baseBuilderTag=r36x_v20110209
-if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.core_3.6.1.v20100902_r361.jar \
-  -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.6.1.R36x_v20100823/pdebuild.jar \
-  -o ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.p2.metadata.generator_1.0.200.v20100503a.jar ]; then
-  if [ -d org.eclipse.releng.basebuilder ]; then
-    echo "Re-getting basebuilder from CVS..."
-    rm -rf org.eclipse.releng.basebuilder
-  else
-    echo "Getting basebuilder from CVS..."
-  fi
-  cvs -Q -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co -r ${baseBuilderTag} org.eclipse.releng.basebuilder
-fi
-if [ ! -f org.eclipse.releng.basebuilder/startup.jar ]; then
-  curdir2=`pwd`
-  cd org.eclipse.releng.basebuilder/plugins
-  if [ -h ../startup.jar ]; then
-    rm ../startup.jar
-  fi
-  LAUNCHER=`ls org.eclipse.equinox.launcher_*.jar | sort | tail -1`
-  if [ "${LAUNCHER}" != "" ]; then
-    echo "basebuilder: LAUNCHER=${LAUNCHER}" 
-    ln -s plugins/${LAUNCHER} ../startup.jar
-  else 
-    echo "basebuilder: NO LAUNCHER FOUND"
-  fi
-  cd ${curdir2}
-fi
-
-# checkout the RSE builder
-if [ -f org.eclipse.rse.build/CVS/Entries ]; then
-  echo "Updating org.eclipse.rse.build from CVS"
-  cd org.eclipse.rse.build
-  cvs -q update -r R3_2_maintenance -dPR
-  cd ..
-else
-  if [ -d org.eclipse.rse.build ]; then
-    echo "Re-getting org.eclipse.rse.build from CVS"
-    rm -rf org.eclipse.rse.build
-  else
-    echo "Getting org.eclipse.rse.build from CVS"
-  fi
-  cvs -q -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools co -r R3_2_maintenance -Rd org.eclipse.rse.build org.eclipse.tm.rse/releng/org.eclipse.rse.build
-fi
-
-# prepare directories for the build
-echo "Preparing directories and symbolic links..."
-if [ ! -d working/package ]; then
-  mkdir -p working/package
-fi
-if [ ! -d working/build ]; then
-  mkdir -p working/build
-fi
-if [ ! -d publish ]; then
-  D=/home/data/httpd/download.eclipse.org/tm/downloads/drops
-  if [ -d ${D} ]; then ln -s ${D} publish; else mkdir publish; fi
-fi
-if [ ! -d test32Updates ]; then
-  D=/home/data/httpd/download.eclipse.org/tm/test32Updates
-  if [ -d ${D} ]; then ln -s ${D} test32Updates; else mkdir test32Updates; fi
-fi
-if [ ! -d updates ]; then
-  D=/home/data/httpd/download.eclipse.org/tm/updates
-  if [ -d ${D} ]; then ln -s ${D} updates; else mkdir updates; fi
-fi
-if [ ! -d staging ]; then
-  D=/home/data/httpd/download-staging.priv/tools/tm
-  if [ -d ${D} ]; then ln -s ${D} staging; else mkdir staging; fi
-fi
-
-# create symlinks as needed
-if [ ! -h doit_irsbuild.sh ]; then
-  ln -s org.eclipse.rse.build/bin/doit_irsbuild.sh .
-fi
-if [ ! -h doit_nightly.sh ]; then
-  ln -s org.eclipse.rse.build/bin/doit_nightly.sh .
-fi
-if [ ! -h setup.sh ]; then
-  if [ -f setup.sh ]; then rm -f setup.sh; fi
-  ln -s org.eclipse.rse.build/setup.sh .
-fi
-chmod a+x doit_irsbuild.sh doit_nightly.sh
-cd org.eclipse.rse.build
-chmod a+x build.pl build.rb go.sh nightly.sh setup.sh
-cd ..
-
-echo "Your build environment is now created."
-echo ""
-echo "Run \"./doit_irsbuild.sh M\" to create an M-build."
-echo ""
-echo "Test the test32Updates, then copy them to updates:"
-echo "cd updates"
-echo "rm -rf plugins features"
-echo "cp -R ../test32Updates/plugins ."
-echo "cp -R ../test32Updates/features ."
-echo "cd bin"
-echo "cvs update"
-echo "./mkTestUpdates.sh"
-
-exit 0
diff --git a/releng/org.eclipse.rse.build/team/preferences.txt b/releng/org.eclipse.rse.build/team/preferences.txt
deleted file mode 100644
index 880d318bf..000000000
--- a/releng/org.eclipse.rse.build/team/preferences.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Linked add-ons:
----------------
-* 3rd Party Software - TM+RSE:
-  emf, releng.tools, j9.launching, RXTX
-* 3rd Party Software - TCF:
-  Subclipse, CDT
-* 3rd Party Software - Wind River:
-  Coretools, Findbugs, Retriever
-
-
-Preferences:
-------------
-* JRE: Add JDK 1.4, 1.5, CDC
-* SSH2 Home
-* User Dict
-* API Tooling Baseline
-* CVS Repo
-* Text on perspective bars off
-
-
-Working Sets:
--------------
-rse-core
-rse-other
-tm-discovery
-tm-releng
-tm-terminal
diff --git a/releng/org.eclipse.rse.build/template/.cvsignore b/releng/org.eclipse.rse.build/template/.cvsignore
deleted file mode 100644
index cba5080f0..000000000
--- a/releng/org.eclipse.rse.build/template/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-buildNotes.php.html
-index.php.html
diff --git a/releng/org.eclipse.rse.build/template/FAIL.gif b/releng/org.eclipse.rse.build/template/FAIL.gif
deleted file mode 100755
index 28bba6610..000000000
--- a/releng/org.eclipse.rse.build/template/FAIL.gif
+++ /dev/null
diff --git a/releng/org.eclipse.rse.build/template/OK.gif b/releng/org.eclipse.rse.build/template/OK.gif
deleted file mode 100755
index 689e5234f..000000000
--- a/releng/org.eclipse.rse.build/template/OK.gif
+++ /dev/null
diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
deleted file mode 100755
index 8a5c6ec36..000000000
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css" type="text/css">
-<title>Build Notes for TM @buildId@</title>
-</head>
-
-<body>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" width="80%">
-		<p><b><font class=indextop>Build Notes for TM @buildId@</font></b><br>
-		@dateLong@ </p>
-		</td>
-	</tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">New and Noteworthy</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-<ul>
-<li>TM @buildId@ <b>requires Eclipse 3.4 or later</b>.
-  <b>Import/Export, Telnet and FTP require Java 1.5</b>, the rest of
-  RSE runs on Java 1.4.
-  Platform Runtime is the minimum requirement for core RSE and Terminal.
-  Discovery needs EMF.</li>
-<li>Highlights of Bugs fixed since <a href="http://download.eclipse.org/tm/downloads/drops/R-3.2.1-201009070720/index.php">TM 3.2.1</a>:
-<ul>
-  <li>RSE Paste to Local Files has been fixed for Vista and Windows 7 hosts
-      [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=334006">334006</a>].</li>
-  <li>A number of fixes have been applied to the Terminal: resizing, ANSI escape sequence interpretation, color rendering, middle mouse button paste all work more reliably now
-      [<a href="https://bugs.eclipse.org/bugs/buglist.cgi?bug_id=335408,335410,335411,335412,335413">335408,335410,335411,335412,335413</a>].</li>
-</ul>
-</li>
-<li>At least 36 bugs were resolved: Use 
-  <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?negate0=1;field0-0-0=target_milestone;type0-0-1=regexp;field0-0-1=target_milestone;resolution=FIXED;resolution=WONTFIX;resolution=WORKSFORME;value0-0-2=3\.2\.1;chfieldto=2011-03-01;chfield=resolution;query_format=advanced;chfieldfrom=2010-07-01;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;field0-0-2=target_milestone;value0-0-1=3\.3;type0-0-0=regexp;value0-0-0=[23]\.[01]\..*;component=Core;component=RSE;component=Terminal;product=Target%20Management;type0-0-2=regexp"> -->
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED;resolution=WONTFIX;resolution=WORKSFORME;query_format=advanced;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;component=Core;component=RSE;component=Terminal;target_milestone=3.2.2;product=Target%20Management">
-  this query</a> to show the list of bugs fixed since
-  <a href="http://download.eclipse.org/tm/downloads/drops/R-3.2.1-201009070720/">
-  TM 3.2.1</a>
-  [<a href="http://download.eclipse.org/tm/downloads/drops/R-3.2.1-201009070720/buildNotes.php">build notes</a>].</li>
-<li>For details on checkins, see
-  <a href="http://dsdp.eclipse.org/dsdp/tm/searchcvs.php">TM SearchCVS</a>, the
-  <a href="http://download.eclipse.org/tm/downloads/drops/N-changelog/index.html">
-  RSE CVS changelog</a>, and the
-  <a href="http://download.eclipse.org/tm/downloads/drops/N-changelog/core/index.html">
-  TM Core CVS changelog</a>.</li>
-<li>For other questions, please check the
-  <a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a>
-  as well as the
-  <a href="http://wiki.eclipse.org/TM/3.2_Known_Issues_and_Workarounds">
-  TM 3.2 Known Issues and Workarounds</a>.</li>
-</ul>
-</td></tr></tbody></table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Getting Started</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-<p>The RSE User Documentation has a
-<a href="http://help.eclipse.org/helios/topic/org.eclipse.rse.doc.user/gettingstarted/g_start.html">
-Tutorial</a> that guides you through installation, first steps,
-connection setup and important tasks.</p>
-<p>
-If you want to know more about future directions of the Target Management
-Project, developer documents, architecture or how to get involved,
-the online
-<a href="http://www.eclipse.org/tm/tutorial/index.php">Getting Started page</a>
-as well as the
-<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a>
-are the best places for you to get started.
-</p>
-</td></tr></tbody></table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">API Status</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-<p>No API changes are allowed in the TM 3.2.x maintenance stream.
-Therefore, <b>TM 3.2.x is fully upward and backward compatible with TM 3.2</b>,
-and can be fully exchanged for TM 3.2 in any product based on it.
-Take care of API specification updates though, where the TM 3.2.x API Docs
-have been updated to add clarifications or missing information compared
-to 3.2.</p>
-
-<p>For the upcoming TM 3.3 release, only backward compatible API changes
-are planned, especially in order to support improved componentization
-and UI/Non-UI splitting.
-In the interest of improving the code base, though, please 
-take care of API marked as <b>@deprecated</b> in the Javadoc.
-Such API is prime candidate to be removed in the future.
-Also, observe the API Tooling tags such as <b>@noextend</b> and 
-<b>@noimplement</b>.
-</p>
-</td></tr></tbody></table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">API Specification Updates since TM 3.1</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-The following lists amendments to API specifications that are worth noticing,
-and may require changes in client code even though they are binary compatible.
-More information can be found in the associated bugzilla items.
-
-<ul>
-<li>TM @buildId@ API Specification Updates
-<ul>
-  <li>None.</li>
-</ul></li>
-</ul>
-</li>
-</ul>
-
-Use 
-  <!-- 
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi&product=Target+Management&component=Core&component=RSE&component=Terminal&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WORKSFORME&chfieldfrom=2009-06-20&chfieldto=2009-09-25&chfield=resolution&cmdtype=doit">
-   -->
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi&product=Target+Management&component=Core&component=RSE&component=Terminal&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WORKSFORME&target_milestone=3.2.1&target_milestone=3.2.2&cmdtype=doit">
-  this query</a> to show the full list of API related updates since TM 3.2
-  <!--
-  , and
-  <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=%5Bapi%5D&product=Target+Management&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&cmdtype=doit">
-  this query</a> to show the list of additional API changes proposed for TM 3.3
-  -->
-  .
-</td></tr></tbody></table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Known Problems and Workarounds</font></b></td>
-	</tr>
-</table>
-<table><tbody><tr><td>
-The following critical or major bugs are currently known.
-We'll strive to fix these as soon as possible.
-<ul>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=279837">bug 279837</a> - maj - [shells] RemoteCommandShellOperation can miss output</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=271015">bug 271015</a> - maj - [ftp] "My Home" with "Empty list" doesn't refresh</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=268463">bug 268463</a> - maj - [ssh] [sftp] SftpFileService.getFile(...) fails with cryptic jsch exception (4)</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=248913">bug 248913</a> - maj - [ssh] SSH subsystem loses connection</li> 
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=238156">bug 238156</a> - maj - Export/Import Connection doesn't create default filters for the specified connection</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=226564">bug 226564</a> - maj - [efs] Deadlock while starting dirty workspace
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=222380">bug 222380</a> - maj - [persistence][migration][team] Subsystem association is lost when creating connection with an installation that does not have subsystem impl</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=218387">bug 218387</a> - maj - [efs] Eclipse hangs on startup of a Workspace with a large efs-shared file system on a slow connection</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=208185">bug 208185</a> - maj - [terminal][serial] terminal can hang the UI when text is entered while the backend side is not reading characters</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=198395">bug 198395</a> - maj - [dstore] Can connect to DStore with expired password</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=175300">bug 175300</a> - maj - [performance] processes.shell.linux subsystem is slow over ssh</li>
-</ul>
-<!--
-<p>No major or critical bugs are known at the time of release.
--->
-Use 
-<a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=blocker&bug_severity=critical&bug_severity=major&cmdtype=doit">this query</a>
-for an up-to-date list of major or critical bugs.</p>
-
-<p>The 
-<a href="http://wiki.eclipse.org/TM/3.2_Known_Issues_and_Workarounds">
-TM 3.2 Known Issues and Workarounds</a> Wiki page gives an up-to-date list
-of the most frequent and obvious problems, and describes workarounds for them.<br/>
-If you have other questions regarding TM or RSE, please check the
-<a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a>
-</p>
-
-<p>Click 
-<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_severity&y_axis_field=op_sys&z_axis_field=&query_format=report-table&product=Target+Management&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&format=table&action=wrap">here</a>
-for a complete up-to-date bugzilla status report, or
-<a href="https://bugs.eclipse.org/bugs/report.cgi?x_axis_field=bug_severity&y_axis_field=op_sys&z_axis_field=&query_format=report-table&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&format=table&action=wrap">here</a>
-for a report on bugs fixed so far.
-</p>
-</td></tr></tbody></table>
-
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/template/buildNotesGenerated.html b/releng/org.eclipse.rse.build/template/buildNotesGenerated.html
deleted file mode 100644
index a14db454b..000000000
--- a/releng/org.eclipse.rse.build/template/buildNotesGenerated.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<p>I
-
-<p>Integration Build (December 13, 2006, 9:39 a.m.)</p>
-  <p>Problem reports updated</p>
-  <p>
-  </p>
-
-<p>Integration Build (December 06, 2006, 8:08 p.m.)</p>
-  <p>Problem reports updated</p>
-  <p>
-  </p>
-
-<p>Integration Build (November 29, 2006, 11:12 a.m.)</p>
-  <p>Problem reports updated</p>
-  <p>
-  </p>ntegration Build (November 28, 2006, 2:03 p.m.)</p>
-<p>Problem reports updated</p>
-<p>
-</p>
diff --git a/releng/org.eclipse.rse.build/template/egg.gif b/releng/org.eclipse.rse.build/template/egg.gif
deleted file mode 100644
index 62e22f0ad..000000000
--- a/releng/org.eclipse.rse.build/template/egg.gif
+++ /dev/null
diff --git a/releng/org.eclipse.rse.build/template/epl-v10.html b/releng/org.eclipse.rse.build/template/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/releng/org.eclipse.rse.build/template/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php
deleted file mode 100755
index f2dfb700f..000000000
--- a/releng/org.eclipse.rse.build/template/index.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://www.eclipse.org/default_style.css" type="text/css">
-<title>TM @buildTypeLong@ Build: @buildId@</title>
-</head>
-
-<body>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" width="80%">
-		<p><b><font class=indextop>TM @buildTypeLong@ Build: @buildId@</font></b><br>
-		@dateLong@ </p>
-		<p>These downloads are provided under the
-		<a href="http://www.eclipse.org/legal/epl/notice.php">Eclipse.org Software 
-		User Agreement</a>.</p>
-		
-		<p><font size="+1"><strong>
-<!-- -->
-		  <a href="buildNotes.php">New and Noteworthy / Build Notes</a>
-<!-- -->
-<!--
-		  <p><a href="http://www.eclipse.org/tm/development/relnotes/3.2/tm-news-3.2.html">New and Noteworthy</a></p>
-		  <p><a href="http://www.eclipse.org/tm/development/relnotes/3.2/readme_tm_3.2.html">TM 3.2 Readme / Release Notes</a></p>
-		  <p><a href="buildNotes.php">Build Notes</a></p>
--->
-		</strong></font></p>
-		
-		To view the map file entries for this build, click
-		<a href="directory.txt">here</a>.<br/>
-		To view the compile logs for this build, click 
-		<a href="compilelog.txt">here</a>.<br/>
-		For getting started, consider the <a href="http://www.eclipse.org/tm/tutorial/index.php">TM Tutorials</a>
-		and the <a href="http://wiki.eclipse.org/TM_and_RSE_FAQ">TM and RSE FAQ</a>.
-		</p>
-<!--
-		<p>To view the build notes for this build click <a
- href="buildNotes.php">here</a>.<br>
-		To view the test results for this build, click 
-		<a href="testResults.php">here</a>.<br>
--->
-		</td>
-<!--
-		<td width="28%"><img src="http://www.eclipse.org/images/Idea.jpg" height=86 width=120></td>
--->
-	</tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Requirements</font></b></td>
-	</tr>
-</table>
-<table>
-  <tbody>
-    <tr><td><b>TM @buildId@ requires 
-    	<a href="http://download.eclipse.org/eclipse/downloads/">
-         Eclipse 3.4</a> or later</b>.
-         <b>RSE Import/Export as well as FTP and Telnet</b> require <b>Java 1.5</b>
-         or higher, the rest of RSE works with Java 1.4.
-    </b></td></tr>
-    <tr><td>
-      For core RSE and TM-Terminal, the Eclipse <b>Platform Runtime Binary</b> is sufficient.
-      Of course you can also use the popular <b>SDK</b> or any one of the downloadable <b>Packages</b>, all of which include the Eclipse Platform. 
-    </td></tr> 
-  </tbody>
-</table>
-</table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0">
-		<font face="Arial,Helvetica" color="#FFFFFF"><b>All-in-one</b> (includes runtime and documentation for <b>dstore, ftp, local, ssh, and telnet</b>)</font></td>
-	</tr>
-	<tr><td align="LEFT">
-	For tool writers, <b>the RSE SDK</b> also includes the runtime as listed, plus programmer documentation and source.
-	</td></tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-		<div align="left">
-			<b>Status</b></div>
-		</td>
-		<td width="30%"><b>Platform</b></td>
-		<td width="63%"><b>Download</b></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=/tm/downloads/drops/@dropDir@/RSE-runtime-@buildId@.zip">RSE-runtime-@buildId@.zip</a>
-           <i>(Recommended for most users)</i></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=/tm/downloads/drops/@dropDir@/RSE-SDK-@buildId@.zip">RSE-SDK-@buildId@.zip</a></td>
-	</tr>
-</table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Stand-alone Offerings, Integrations and Add-ons</font></b>
-		</td>
-	</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-		   <div align="left"><b>Status</b></div>
-		</td>
-		<td width="7%"><b>Platform</b></td>
-		<td width="23%"><b>Download</b></td>
-		<td width="63%"><b>Notes</b></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=/tm/downloads/drops/@dropDir@/TM-terminal-@buildId@.zip">TM-terminal-@buildId@.zip</a></td>
-        <td>
-			A stand-alone ANSI / vt102 terminal emulator widget and view (with minor 
-			  <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/README.txt?revision=1.4&root=Tools_Project&view=markup">
-			limitations</a>). Includes pluggable connectors 
-			for serial line (through RXTX, see the 
-			  <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial/README.txt?revision=1.5&root=Tools_Project&view=markup">
-			installation notes</a>), ssh and telnet. 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=/tm/downloads/drops/@dropDir@/RSE-useractions-@buildId@.zip">RSE-useractions-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-        	Additional Framework for user-defined actions and compile commands.
-        	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=/tm/downloads/drops/@dropDir@/RSE-examples-@buildId@.zip">RSE-examples-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-        	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=/tm/downloads/drops/@dropDir@/TM-discovery-@buildId@.zip">TM-discovery-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-	    	An API and DNS-SD / Zeroconf based 
-			implementation for remote network service discovery. 
-			Runs stand-alone or integrated with RSE.
-			Requires EMF 2.2.0 or later. Includes Source.<br/>
-			<i>Note: This component is no longer actively developed and may be discontinued.</i>
-        </td>
-    </tr>
-</table>
-<b>Note:</b> As of TM 3.1 (Eclipse Galileo / June 2009), the <b>RSE-remotecdt</b> integration for remote launch and debug through gdbserver has moved into CDT 6.0.
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Add-ons in Incubation</font></b>
-		</td>
-	</tr>
-	<tr>
-	    <td>Add-ons in 
-	    <a href="http://www.eclipse.org/projects/what-is-incubation.php">
-	    Incubation</a> state provide new features, but have 
-	    not yet hardened their APIs through public review such that there could be 
-	    a promise to keep them stable over releases. These add-ons have a 0.x version
-	    number, and are provided for early adopters. Note that these features may 
-	    already be very mature in terms of features provided, but not yet in terms
-	    of the APIs provided.</td>
-	</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-		   <div align="left"><b>Status</b></div>
-		</td>
-		<td width="7%"><b>Platform</b></td>
-		<td width="23%"><b>Download</b></td>
-		<td width="63%"><b>Notes</b></td>
-	</tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All <img src="egg.gif" width=20 height=20></td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/tm/downloads/drops/@dropDir@/TM-terminal-local-incubation-@buildId@.zip">TM-terminal-local-incubation-@buildId@.zip</a></td>
-        <td>
-			A local terminal (console) integrated into Eclipse. Works on Linux, Solaris and Mac OS X, but currently <i>not on Windows</i>. Requires CDT 7.0 (Eclipse Helios / June 2010) or higher. Includes Source.
-        </td>
-    </tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>All <img src="egg.gif" width=20 height=20></td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/tm/downloads/drops/@dropDir@/RSE-wince-incubation-@buildId@.zip">RSE-wince-incubation-@buildId@.zip</a></td>
-        <td><small>&nbsp;</small><br/>
-			RSE Services for accessing Windows CE devices via Microsoft RAPI2.
-			Provides a File subsystem for transparent remote file access.
-			Requires Microsoft RAPI libraries installed.
-			Includes Source.
-        </td>
-    </tr>
-</table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">DStore Server Runtime</font></b></td>
-	</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-			<div align="left"><b>Status</b></div></td>
-		<td width="30%"><b>Platform</b></td>
-		<td width="63%"><b>Download</b></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>Windows</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/tm/downloads/drops/@dropDir@/rseserver-@buildId@-windows.zip">rseserver-@buildId@-windows.zip</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>Linux</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/tm/downloads/drops/@dropDir@/rseserver-@buildId@-linux.tar">rseserver-@buildId@-linux.tar</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>Other Unix</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/tm/downloads/drops/@dropDir@/rseserver-@buildId@-unix.tar">rseserver-@buildId@-unix.tar</a></td></tr>
-	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
-        <td>Mac OS X (<i>Experimental</i>)</td>
-        <td><a href="http://www.eclipse.org/downloads/download.php?file=/tm/downloads/drops/@dropDir@/rseserver-@buildId@-macosx.tar">rseserver-@buildId@-macosx.tar</a></td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">JUnit Plugin Tests</font></b></td>
-	</tr>
-	<tr>
-	    <td>The RSE test suite requires the JUnit plug-in, which is included in the 
-        <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/index.php#EclipseSDK">
-        Eclipse SDK</a> or available as<br/>
-        <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/index.php#JUnitPlugin">
-        eclipse-test-framework download</a> for users of the Eclipse Platform Runtime Binary. 
-	    </td>
-	</tr>
-</table>
-
-
-
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-		<div align="left">
-			<b>Status</b></div>
-		</td>
-		<td width="30%"><b>Platform</b></td>
-		<td width="63%"><b>Download</b></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=/tm/downloads/drops/@dropDir@/RSE-tests-@buildId@.zip">RSE-tests-@buildId@.zip</a></td>
-	</tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr><td colspan="2">&nbsp;</td></tr>
-</table>
-
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/template/notice.html b/releng/org.eclipse.rse.build/template/notice.html
deleted file mode 100644
index c184ca36a..000000000
--- a/releng/org.eclipse.rse.build/template/notice.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count
deleted file mode 100755
index b1bd38b62..000000000
--- a/releng/org.eclipse.rse.build/template/package.count
+++ /dev/null
@@ -1 +0,0 @@
-13
diff --git a/releng/org.eclipse.rse.releng.infocenter/.project b/releng/org.eclipse.rse.releng.infocenter/.project
deleted file mode 100644
index 3e151d5c4..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.releng.infocenter</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.rse.releng.infocenter/about.html b/releng/org.eclipse.rse.releng.infocenter/about.html
deleted file mode 100644
index d4cc693f9..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.releng.infocenter/doit_nightly.sh b/releng/org.eclipse.rse.releng.infocenter/doit_nightly.sh
deleted file mode 100755
index ab7d18a58..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/doit_nightly.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-
-#Find out the IHOME - it's the parent of my own directory ($IHOME/bin)
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-cd ..
-IHOME=`pwd`
-export IHOME
-
-#Update scripts - prerequisite: IHOME is infocenter home
-umask 022
-cd "$IHOME/bin"
-cvs -q update -d
-chmod a+x *.sh
-
-#Update the infocenter
-./update.sh
diff --git a/releng/org.eclipse.rse.releng.infocenter/infocenter.sh b/releng/org.eclipse.rse.releng.infocenter/infocenter.sh
deleted file mode 100755
index ddf77475c..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/infocenter.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-umask 022
-
-#PATH=/opt/j2sdk1.4.2_12/bin:$PATH
-PATH=/opt/JDKs/amd64/jdk1.6.0_11/bin:$PATH
-export PATH
-
-if [ "$IHOME" = "" ]; then
-  IHOME=/home/infocenter/latest
-fi
-EHOME=${IHOME}/eclipse/eclipse
-curdir=`pwd`
-
-if [ "$1" = "" -o "$1" = "help" ]; then
-  echo "Usage: infocenter.sh [start|shutdown|addSite -from dir|apply]"
-  exit 1
-fi
-
-HELP_PLUGIN=`ls $EHOME/plugins/org.eclipse.help.base_3.*.jar | sort | tail -1`
-
-java \
-  -classpath $HELP_PLUGIN \
-  org.eclipse.help.standalone.Infocenter \
-  -command $* \
-  -eclipsehome $EHOME \
-  -data $IHOME/workspace \
-  -port 27127 \
-  -nl en -locales en
diff --git a/releng/org.eclipse.rse.releng.infocenter/readme.txt b/releng/org.eclipse.rse.releng.infocenter/readme.txt
deleted file mode 100644
index 306c92290..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/readme.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-DSDP Project Infocenter
------------------------
-
-This project contains scripts needed to run the Eclipse headless infocenter
-application, serving latest online help from dsdp.eclipse.org.
-
-The scripts are written to run by cron job, as user "infocenter", on dsdp.eclipse.org.
-
-This project can be checked out with
-  cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools \
-    co -d bin org.eclipse.tm.rse/releng/org.eclipse.tm.rse.releng.infocenter
-
-Apache Installation:
-* vi /etc/httpd/conf/httpd.conf
-  ADD
-  AddDefaultCharset Off
-  ProxyPass /help/latest http://localhost:27127/help
-  ProxyPassReverse /help/latest http://localhost:27127/help
-
-Installation:
-* Infocenter home (IHOME) at /home/infocenter/latest
-  - Scripts checked out at $IHOME/bin
-  - Deployable doc plugins at $IHOME/deploy
-* cd $IHOME/bin
-  ./setup.sh
-  ./update.sh
-* Cronjob created to execute doit_nightly.sh
-    ssh dsdp.eclipse.org -l infocenter
-    crontab -e
-    #Run the doc update at 2:00 every weekday
-    0 2 * * 1-5     /home/infocenter/latest/bin/doit_nightly.sh
-
-Other infocenter administration commands:
-  infocenter.sh shutdown
-  infocenter.sh start &
-
-For more documentation on infocenter, see
-http://help.eclipse.org/ganymede/index.jsp?topic=/org.eclipse.platform.doc.isv/guide/ua_help_setup_infocenter.htm
-http://help.eclipse.org/stable/topic/org.eclipse.platform.doc.isv/guide/ua_help_setup_infocenter.htm
-
--- Martin Oberhuber, 20-Jul-2006
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.releng.infocenter/setup.sh b/releng/org.eclipse.rse.releng.infocenter/setup.sh
deleted file mode 100755
index 00c108852..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/setup.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2008, 2009 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-umask 022
-
-curdir=`pwd`
-#PATH=/opt/j2sdk1.4.2_12/bin:$PATH
-PATH=/opt/JDKs/amd64/jdk1.6.0_11/bin:$PATH
-export PATH
-
-if [ "$IHOME" = "" ]; then
-  IHOME=/home/infocenter/latest
-fi
-# prepare the base Eclipse installation in folder "eclipse"
-ECL_DIR=$IHOME/eclipse
-ep_rel=S
-ep_ver=3.5M4
-ep_date=200812111908
-
-uname_s=`uname -s`
-uname_m=`uname -m`
-case ${uname_s}${uname_m} in
-  Linuxppc*) ep_arch=linux-gtk-ppc
-             cdt_arch=linux.ppc
-             ;;
-  Linuxx86_64*) ep_arch=linux-gtk-x86_64 
-                cdt_arch=linux.x86_64
-                ;;
-  Linuxx86*|Linuxi686*) ep_arch=linux-gtk
-             cdt_arch=linux.x86
-             ;;
-esac
-
-P2_no_dropins=false
-if [ ! -f ${ECL_DIR}/eclipse/plugins/org.eclipse.swt_3.5.0.v3525.jar ]; then
-  if [ ! -d ${ECL_DIR} ]; then
-    mkdir -p ${ECL_DIR}
-  else
-    rm -rf ${ECL_DIR}/*
-  fi
-  cd "${ECL_DIR}"
-  echo "Getting Eclipse Platform SDK..."
-  wget "http://download.eclipse.org/eclipse/downloads/drops/${ep_rel}-${ep_ver}-${ep_date}/eclipse-platform-SDK-${ep_ver}-${ep_arch}.tar.gz"
-  tar xfvz eclipse-platform-SDK-${ep_ver}-${ep_arch}.tar.gz
-  rm eclipse-platform-SDK-${ep_ver}-${ep_arch}.tar.gz
-  cd "${curdir}"
-fi
-if [ ! -f "${ECL_DIR}/eclipse/startup.jar" ]; then
-  cd "${ECL_DIR}/eclipse/plugins"
-  if [ -h ../startup.jar ]; then
-    rm ../startup.jar
-  fi
-  LAUNCHER=`ls org.eclipse.equinox.launcher_*.jar | sort | tail -1`
-  if [ "${LAUNCHER}" != "" ]; then
-    echo "eclipse LAUNCHER=${LAUNCHER}" 
-    ln -s plugins/${LAUNCHER} ../startup.jar
-  else
-    echo "Eclipse: NO startup.jar LAUNCHER FOUND!"
-  fi
-  cd "${curdir}"
-fi
-if [ ! -d "${ECL_DIR}/eclipse/plugins.disabled" ]; then
-  mkdir -p "${ECL_DIR}/eclipse/plugins.disabled"
-  cd "${ECL_DIR}/eclipse/plugins"
-  mv org.eclipse.platform.doc.user_*.jar ../plugins.disabled
-  cd "${curdir}"
-fi 
diff --git a/releng/org.eclipse.rse.releng.infocenter/update.sh b/releng/org.eclipse.rse.releng.infocenter/update.sh
deleted file mode 100755
index bff772ea8..000000000
--- a/releng/org.eclipse.rse.releng.infocenter/update.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-umask 022
-echo "Infocenter Update: running as"
-id
-if [ "$IHOME" = "" ]; then
-  IHOME=/home/infocenter/latest
-fi
-ECL_DIR=$IHOME/eclipse
-curdir=`pwd`
-
-#update RSE into deployment directory
-if [ ! -d $IHOME/deploy/rse ]; then
-  mkdir -p $IHOME/deploy/rse
-fi
-cd $IHOME/deploy/rse
-rm *.zip
-echo "Downloading RSE-SDK-latest.zip..."
-#wget -q "http://build.eclipse.org/tm/downloads/drops/N.latest/RSE-SDK-latest.zip"
-wget -q "http://download.eclipse.org/tm/downloads/drops/N.latest/RSE-SDK-latest.zip"
-if [ -e RSE-SDK-latest.zip ]; then
-  echo "Unzipping..."
-  unzip -q RSE-SDK-latest.zip
-  if [ -e plugins.tmp ]; then
-    rm -rf plugins.tmp
-  fi
-  mkdir plugins.tmp
-  mv eclipse/plugins/*doc* plugins.tmp
-  rm -rf eclipse
-  NUM=`ls plugins.tmp/*.jar | wc -l`
-  echo "RSE plugins.tmp: NUM=$NUM"
-  if [ "$NUM" = "3" ]; then
-    echo "Doc plugins got successfully, installing from plugins.tmp into plugins..."
-    if [ -e plugins ]; then 
-      rm -rf plugins
-    fi
-    mv plugins.tmp plugins
-  fi
-else
-  echo "Error downloading RSE-SDK-latest.zip"
-fi
-
-#update MTJ into deployment directory
-if [ ! -d $IHOME/deploy/mtj ]; then
-  mkdir -p $IHOME/deploy/mtj
-fi
-cd $IHOME/deploy/mtj
-rm *.zip
-echo "Downloading dsdp-mtj-SDK-incubation-latest.zip..."
-#wget -q "http://build.eclipse.org/dsdp/mtj/downloads/drops/N.latest/dsdp-mtj-SDK-incubation-latest.zip"
-wget -q "http://download.eclipse.org/dsdp/mtj/downloads/drops/N.latest/dsdp-mtj-SDK-incubation-latest.zip"
-if [ -e dsdp-mtj-SDK-incubation-latest.zip ]; then
-  echo "Unzipping..."
-  unzip -q dsdp-mtj-SDK-incubation-latest.zip
-  if [ -e plugins.tmp ]; then
-    rm -rf plugins.tmp
-  fi
-  mkdir plugins.tmp
-  mv eclipse/plugins/*doc* plugins.tmp
-  rm -rf eclipse
-  NUM=`ls plugins.tmp/*.jar | wc -l`
-  echo "MTJ plugins.tmp: NUM=$NUM"
-  if [ "$NUM" = "2" -o "$NUM" = "1" ]; then
-    echo "Doc plugins got successfully, installing from plugins.tmp into plugins..."
-    if [ -e plugins ]; then 
-      rm -rf plugins
-    fi
-    mv plugins.tmp plugins
-  fi
-else
-  echo "Error downloading dsdp-mtj-SDK-incubation-latest.zip"
-fi
-
-######################### Deploy all #############################
-echo "Deploying new plug-ins..."
-NEED_RESTART=0
-for COMP in rse dd.dsf nab ercp mtj ; do
-  if [ -d "${IHOME}/deploy/${COMP}/plugins" ]; then
-    if [ -d "$ECL_DIR/eclipse/dropins/${COMP}/eclipse/plugins" ]; then
-      diff -r "${IHOME}/deploy/${COMP}/plugins" "$ECL_DIR/eclipse/dropins/${COMP}/eclipse/plugins" >/dev/null
-      result=$?
-      if [ "${result}" != "0" ]; then
-        echo "${COMP} diffs as ${result} --> deploying"
-        NEED_RESTART=1
-      else
-        echo "${COMP} is unchanged"
-      fi
-    else
-      echo "${COMP} is NEW"
-      NEED_RESTART=1
-    fi
-  fi
-done 
-
-######################### Restart Infocenter #############################
-#update Infocenter with latest deployable plug-ins
-if [ "$NEED_RESTART" != "0" ]; then
-  echo "Shutting down infocenter..."
-  $IHOME/bin/infocenter.sh shutdown
-
-  for COMP in rse dd.dsf nab ercp mtj ; do
-    if [ -d "${IHOME}/deploy/${COMP}/plugins" ]; then
-      if [ -d "$ECL_DIR/eclipse/dropins/${COMP}/eclipse/plugins" ]; then
-        rm -rf "$ECL_DIR/eclipse/dropins/${COMP}"
-      fi
-      mkdir -p "$ECL_DIR/eclipse/dropins/${COMP}/eclipse"
-      cp -Rp $IHOME/deploy/${COMP}/plugins "$ECL_DIR/eclipse/dropins/${COMP}/eclipse/"
-    fi 
-  done 
-  
-  #TODO: not sure if we need to delete the old index to force re-indexing
-  echo "Deleting old index..."
-  rm -rf $IHOME/config/org.eclipse.help.base
-
-  cd $IHOME
-  echo "Restarting infocenter..."
-  nohup $IHOME/bin/infocenter.sh start &
-  echo "Waiting for Infocenter / Apache to come up [60 seconds]"
-  sleep 60
-  echo "Doing fake search to force rebuilding index"
-  wget -q "http://localhost/help/latest/advanced/searchView.jsp?searchWord=SystemBasePlugin&maxHits=2" -O search.out.jsp -t 3 --waitretry=30
-  echo "Done, index should be up again!"
-else
-  echo "Nothing new deployed, no restart necessary."
-fi
-
-cd "$curdir"
diff --git a/releng/org.eclipse.rse.updatesite/.cvsignore b/releng/org.eclipse.rse.updatesite/.cvsignore
deleted file mode 100644
index 51689449b..000000000
--- a/releng/org.eclipse.rse.updatesite/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-features
-plugins
-interim
-milestones
-digest.zip
-site-europa.xml
diff --git a/releng/org.eclipse.rse.updatesite/.project b/releng/org.eclipse.rse.updatesite/.project
deleted file mode 100644
index fc8928ebd..000000000
--- a/releng/org.eclipse.rse.updatesite/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.updatesite</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.rse.updatesite/bin/.cvsignore b/releng/org.eclipse.rse.updatesite/bin/.cvsignore
deleted file mode 100644
index 3f0ee91c7..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-pack200.stamp
diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
deleted file mode 100755
index 854ccd8da..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ /dev/null
@@ -1,547 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2006, 2010 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-# Convert normal "site.xml" to "test32Updates"
-#
-# Prerequisites: 
-# - Eclipse 3.6Mx installed in $HOME/ws_32x/eclipse
-# - Java5 in the PATH or in /shared/tools/tm/jdk-1.5
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-umask 022
-
-#Use Java5 on build.eclipse.org - need JRE for pack200
-export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
-basebuilder=${HOME}/ws_32x/org.eclipse.releng.basebuilder
-tgtlauncher=`ls ${HOME}/ws_32x/eclipse/plugins/org.eclipse.equinox.launcher_* | sort | tail -1`
-
-# patch site.xml
-cd ..
-SITE=`pwd`
-if [ -f index.html.new ]; then
-  rm -f index.html.new
-fi
-if [ -f site.xml.new ]; then
-  rm -f site.xml.new
-fi
-if [ -f web/site.xsl.new ]; then
-  rm -f web/site.xsl.new
-fi
-
-# get newest plugins and features: to be done manually on real update site
-TPVERSION="Target Management"
-VERSION=3.2.x
-DO_STATS=0
-DO_CATEGORIES=0
-TYPE=none
-SITEDIR=`basename ${SITE}`
-SITEPARENT=`dirname ${SITE}`
-SITEPARENT=`basename ${SITEPARENT}`
-case ${SITEDIR} in
-  test*Updates)   TYPE=test ;;
-  signed*Updates) TYPE=testSigned ;;
-  *milestones)    TYPE=milestone ;;
-  *interim)       TYPE=interim ;;
-  *)              TYPE=unknown ;;
-esac
-case ${SITEDIR} in
-  3.2*)  VERSION=3.2 ; DO_CATEGORIES=1 ;;
-esac
-case ${SITEDIR} in
-  3.2) DO_STATS=1 ;;
-esac
-case ${SITEPARENT} in
-  staging) SITEDIR=staging/${SITEDIR} ;;
-esac
-if [ ${TYPE} = test ]; then
-    TPTYPE="${VERSION} Test"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    echo "Working on ${TPVERSION} update site"
-    REL=`ls $HOME/ws_32x/working/package | sort | tail -1`
-    if [ "$REL" != "" ]; then
-      echo "Checking new Updates from $REL"
-      DIR="$HOME/ws_32x/working/package/$REL/updates"
-      if [ -d "$DIR/features" ]; then
-        echo "Copying new plugins and features from $DIR"
-        rm -rf features
-        rm -rf plugins
-        cp -R $DIR/features .
-        cp -R $DIR/plugins .
-      fi
-    fi
-    # CHECK VERSION CORRECTNESS for MICRO UPDATES only
-    # Minor/major version updates are not allowed.
-    # Update of "qualifier" requires also updating "micro"
-    echo "VERIFYING VERSION CORRECTNESS: Features against ../updates/staging/3.2"
-    ls features/*.jar | sed -e 's,^.*features/,,' | sort > f1.$$.txt
-    ls ../updates/staging/3.2/features/*.jar | sed -e 's,^.*features/,,' | sort > f2.$$.txt
-    diff f2.$$.txt f1.$$.txt | grep '^[>]' \
-       | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > f_new.txt
-    for f in `cat f_new.txt`; do
-      fold=`grep "${f}\." f2.$$.txt`
-      if [ "${fold}" != "" ]; then
-        echo "PROBLEM: QUALIFIER update without MICRO: ${f}"
-      fi
-      fbase=`echo $f | sed -e 's,\(.*_[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,'`
-      fold=`grep "${fbase}\." f2.$$.txt`
-      if [ "${fold}" = "" ]; then
-        echo "PROBLEM: MAJOR or MINOR update : ${f}"
-      fi
-      #fbase=`echo $f | sed -e 's,\(.*_[0-9][0-9]*\)\.[0-9][0-9]*\..*,\1,'`
-      #fold=`grep ${fbase} f2.$$.txt`
-      #if [ "${fold}" = "" ]; then
-      #  echo "PROBLEM: MAJOR update or NEW : ${f}"
-      #fi
-    done
-    echo "VERIFYING VERSION CORRECTNESS: Plugins against ../updates/staging/3.2"
-    ls plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p1.$$.txt
-    ls ../updates/staging/3.2/plugins/*.jar | sed -e 's,^.*plugins/,,' | sort > p2.$$.txt
-    diff p2.$$.txt p1.$$.txt | grep '^[>]' \
-       | sed -e 's,[>] \(.*_[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,' > p_new.txt
-    for p in `cat p_new.txt`; do
-      pold=`grep "${p}\." p2.$$.txt`
-      if [ "${pold}" != "" ]; then
-        echo "PROBLEM: QUALIFIER update without MICRO: ${p}"
-      fi
-      pbase=`echo $p | sed -e 's,\(.*_[0-9][0-9]*\.[0-9][0-9]*\)\..*,\1,'`
-      pold=`grep "${pbase}\." p2.$$.txt`
-      if [ "${pold}" = "" ]; then
-        echo "PROBLEM: MAJOR or MINOR update : ${p}"
-      fi
-      #pbase=`echo $p | sed -e 's,\(.*_[0-9][0-9]*\)\.[0-9][0-9]*\..*,\1,'`
-      #pold=`grep ${pbase} p2.$$.txt`
-      #if [ "${pold}" = "" ]; then
-      #  echo "PROBLEM: MAJOR update or NEW : ${p}"
-      #fi
-    done
-    #rm f_new.txt p_new.txt
-    mv -f f1.$$.txt fversions.txt
-    mv -f p1.$$.txt pversions.txt
-    mv -f f2.$$.txt f30versions.txt
-    mv -f p2.$$.txt p30versions.txt
-    ## rm f1.$$.txt f2.$$.txt p1.$$.txt p2.$$.txt    
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/tm/updates/2.0,/tm/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    sed -e "s,/tm/updates/2.0,/tm/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_2_2 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-    echo "Conditioning the site... $SITE"
-    #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-    #java -jar $HOME/ws_32x/eclipse/startup.jar \
-    #java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-    java -jar ${tgtlauncher} \
-        -application org.eclipse.update.core.siteOptimizer \
-        -jarProcessor -outputDir $SITE \
-        -processAll -repack $SITE
-    #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-    #	$HOME/ws_32x/jarprocessor/jarprocessor.jar \
-	#	-outputDir $SITE -processAll -repack $SITE
-elif [ ${TYPE} = testSigned ]; then
-    TPTYPE="${VERSION} Signed Test"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    echo "Working on ${TPVERSION} update site"
-    echo "Signing jars from ${SITE}/../test32Updates (expecting conditioned jars)..."
-    STAGING=/home/data/httpd/download-staging.priv/tools/tm
-    stamp=`date +'%Y%m%d-%H%M'`
-    if [ -d ${STAGING} -a -d ${SITE}/../test32Updates ]; then
-      #get jars from test32Updates, sign them and put them here
-      mkdir ${SITE}/features.${stamp}
-      mkdir -p ${STAGING}/updates.${stamp}/features
-      chmod -R g+w ${STAGING}/updates.${stamp}
-      cp -R ${SITE}/../test32Updates/features/*.jar ${STAGING}/updates.${stamp}/features
-      cd ${STAGING}/updates.${stamp}/features
-      for x in `ls *.jar`; do
-        result=`jarsigner -verify ${x} | head -1`
-        if [ "$result" != "jar verified." ]; then
-          # do not sign Orbit bundles again since they are signed already 
-          echo "signing feature: ${x}"
-          sign ${x} nomail >/dev/null
-        fi
-      done
-      TRIES=10
-      while [ $TRIES -gt 0 ]; do
-        sleep 30
-        echo "TRIES to go: ${TRIES}"
-        for x in `ls *.jar | grep -v '^temp[_.]'`; do
-          result=`jarsigner -verify ${x} | head -1`
-          if [ "$result" = "jar verified." ]; then
-            echo "${result}: ${x}"
-            cp ${x} ${SITE}/features.${stamp}
-            rm ${x}
-          else
-            echo "-pending- ${x} : ${result}" | head -1
-            sleep 30
-          fi
-        done
-        FILES=`ls 2>/dev/null`
-        if [ "$FILES" = "" ]; then
-          TRIES=0
-          ok=1
-        else
-          echo "--> FILES is $FILES"
-          TRIES=`expr $TRIES - 1`
-          ok=0
-        fi
-      done
-      if [ "$ok" = "1" ]; then
-        rmdir ${STAGING}/updates.${stamp}/features
-        mkdir ${SITE}/plugins.${stamp}
-        mkdir -p ${STAGING}/updates.${stamp}/plugins
-        chmod -R g+w ${STAGING}/updates.${stamp}
-        cp ${SITE}/../test32Updates/plugins/*.jar ${STAGING}/updates.${stamp}/plugins
-        cd ${STAGING}/updates.${stamp}/plugins
-        for x in `ls *.jar`; do
-          result=`jarsigner -verify ${x} | head -1`
-          if [ "$result" != "jar verified." ]; then
-            # do not sign Orbit bundles again since they are signed already 
-            echo "signing plugin: ${x}"
-            sign ${x} nomail >/dev/null
-          fi
-        done
-        TRIES=10
-        while [ $TRIES -gt 0 ]; do
-          sleep 30
-          echo "TRIES to go: ${TRIES}"
-          for x in `ls *.jar | grep -v '^temp[_.]'`; do
-            result=`jarsigner -verify ${x} | head -1`
-            if [ "$result" = "jar verified." ]; then
-              echo "${result}: ${x}"
-              cp ${x} ${SITE}/plugins.${stamp}
-              rm ${x}
-            else
-              echo "-pending- ${x} : ${result}" | head -1
-              sleep 30
-            fi
-          done
-          FILES=`ls 2>/dev/null`
-          if [ "$FILES" = "" ]; then
-            TRIES=0
-            ok=1
-          else
-            echo "--> FILES is $FILES"
-            TRIES=`expr $TRIES - 1`
-            ok=0
-          fi
-        done
-      fi
-      if [ "$ok" = "1" ]; then
-        cd ${SITE}
-        rmdir ${STAGING}/updates.${stamp}/plugins
-        rmdir ${STAGING}/updates.${stamp}
-        #mv features features.old.${stamp}
-        #mv plugins plugins.old.${stamp}
-        rm fversions.txt pversions.txt f30versions.txt p30versions.txt f_new.txt p_new.txt 2>/dev/null
-        rm -rf features plugins
-        mv features.${stamp} features
-        mv plugins.${stamp} plugins
-      else
-        echo "Something went wrong during staging and signing."
-        echo "Keeping existing update site intact."
-        exit 1
-      fi
-    else
-      echo "staging or test32Updates not found:"
-      echo "please fix your pathes"
-      exit 1
-    fi
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/tm/updates/2.0,/tm/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    sed -e "s,/tm/updates/2.0,/tm/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_2_2 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ ${TYPE} = milestone ]; then
-    TPTYPE="${VERSION} Milestone"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    echo "Working on ${TPVERSION} update site"
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '\,</h1>,a\
-This site contains Target Management Milestones (I-, S- and M- builds) which are \
-being contributed to the Galileo coordinated release train (Eclipse 3.5.x).' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    ## keep 3.0.x features in site.xml
-    ##	-e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_4 -->/d' \
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_2_2 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ ${TYPE} = interim ]; then
-    TPTYPE="${VERSION} Interim"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    echo "Working on ${TPVERSION} update site"
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '\,</h1>,a\
-This site contains Target Management Interim Maintenance builds (I-, S-, and M-builds) in order \
-to test them before going live.' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    ## keep 2.0.x features in site.xml
-    ##	-e '/<!-- BEGIN_2_0_1 -->/,/<!-- END_2_0_4 -->/d' \
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_2_2 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ `basename $SITE` = 3.0 ]; then
-    TPTYPE="3.0"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    TYPE=official
-    echo "Working on ${TPVERSION} update site"
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '\,</h1>,a\
-This site contains Target Management 3.0 Releases and Updates (R- builds) which are \
-being contributed to the Ganymede coordinated release train (Eclipse 3.4).' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    ## dont keep 2.0.x features in site.xml
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_0_4 -->/,/<!-- END_3_0_4 -->/d' \
-    	-e '/<!-- BEGIN_3_2 -->/,/<!-- END_3_2_2 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ `basename $SITE` = 3.1 ]; then
-    TPTYPE="3.1"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    TYPE=official
-    echo "Working on ${TPVERSION} update site"
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '\,</h1>,a\
-This site contains Target Management 3.1 Releases and Updates (R- builds) which are \
-being contributed to the Galileo coordinated release train (Eclipse 3.5).' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    ## dont keep 2.0.x features in site.xml
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_4 -->/d' \
-        -e '/<!-- BEGIN_3_0 -->/,/<!-- END_3_0_3 -->/d' \
-        -e '/<!-- BEGIN_3_2 -->/,/<!-- END_3_2_2 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-elif [ `basename $SITE` = 3.2 ]; then
-    TPTYPE="3.2"
-    TPVERSION="${TPVERSION} ${TPTYPE}"
-    TYPE=official
-    echo "Working on ${TPVERSION} update site"
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-    	-e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '\,</h1>,a\
-This site contains Target Management 3.2 Releases and Updates (R- builds) which are \
-being contributed to the Helios coordinated release train (Eclipse 3.6).' \
-    	index.html > index.html.new
-    mv -f index.html.new index.html
-    ## dont keep 2.0.x features in site.xml
-    sed -e "s,/tm/updates/2.0,/tm/updates/${SITEDIR},g" \
-        -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	-e '/<!-- BEGIN_2_0 -->/,/<!-- BEGIN_3_2 -->/d' \
-    	-e '/<!-- BEGIN_3_2_3 -->/,/<!-- END_3_2_3 -->/d' \
-        site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-    sed -e "s,Project 2.0 Update,Project ${TPTYPE} Update,g" \
-    	web/site.xsl > web/site.xsl.new
-    mv -f web/site.xsl.new web/site.xsl
-else
-    echo "Working on official update site"
-    TYPE=official
-    echo "Expect that you copied your features and plugins yourself"
-    stamp=`date +'%Y%m%d-%H%M'`
-    rm index.html site.xml web/site.xsl
-    cvs -q update -dPR
-    sed -e '/<!-- BEGIN_2_0_5 -->/,/<!-- END_2_0_5 -->/d' \
-        site.xml > site.xml.new1
-    sed -e '/<!-- BEGIN_3_0_3 -->/,/<!-- END_3_0_3 -->/d' \
-        site.xml.new1 > site.xml.new2
-    sed -e '/<!-- BEGIN_3_1 -->/,/<!-- END_3_2_2 -->/d' \
-        site.xml.new2 > site.xml.new
-    mv -f site.xml.new site.xml
-    rm site.xml.new1 site.xml.new2
-fi
-FEATURES=`grep 'features/[^ ]*\.qualifier\.jar' site.xml | sed -e 's,^[^"]*"features/\([^0-9]*[0-9][0-9.]*\).*$,\1,g'`
-for feature in $FEATURES ; do
-  #list newest ones first
-  TAG=`ls -t features/${feature}*.jar | head -1 | sed -e 's,[^0-9]*[0-9][0-9]*\.[0-9]*\.[0-9]*\.\([^.]*\).jar,\1,'`
-  if [ "$TAG" != "" ]; then
-    echo "$feature : $TAG"
-    sed -e "/$feature/s/qualifier/$TAG/g" site.xml > site.xml.new
-    mv -f site.xml.new site.xml
-  fi
-done
-#Create Europa version of site.xml
-if [ -f site-europa.xml ]; then
-  rm -rf site-europa.xml
-fi
-sed -e '/!EUROPA_ONLY!/d' site.xml > site-europa.xml
-
-#Get rid of Europa comments completely in order to avoid SAX exception 
-#in comment when the feature qualifier extends to --
-awk 'BEGIN {doit=1}
-  /-- !EUROPA_ONLY!/ {doit=0}
-  { if(doit==1) print; }
-  /!EUROPA_ONLY! --/ {doit=1}' site.xml > site.xml.tmp
-mv -f site.xml.tmp site.xml
-
-# optimize the site
-# see http://wiki.eclipse.org/Platform-releng-faq
-case ${TYPE} in test*)
-  echo "Packing the site... $SITE"
-  # Workaround for downgrading effort of pack200 to avoid VM bug
-  # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069
-  #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-  #java -jar $HOME/ws_32x/eclipse/startup.jar \
-  #java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-  java -jar ${tgtlauncher} \
-    -application org.eclipse.update.core.siteOptimizer \
-    -jarProcessor -outputDir $SITE \
-    -processAll -pack $SITE
-  #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
-  #    $HOME/ws_32x/jarprocessor/jarprocessor.jar \
-  #    -outputDir $SITE -processAll -pack $SITE
-  ;;
-esac
-
-#Create the digest
-echo "Creating digest..."
-#java -jar $HOME/ws_32x/eclipse/startup.jar \
-#java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-java -jar ${tgtlauncher} \
-    -application org.eclipse.update.core.siteOptimizer \
-    -digestBuilder -digestOutputDir=$SITE \
-    -siteXML=$SITE/site-europa.xml
-
-##if false ; then
-#Create P2 metadata
-echo "Creating P2 metadata..."
-#Always create from scratch
-cd ${SITE}
-for x in content.xml content.jar content.jar.pack.gz artifacts.xml artifacts.jar artifacts.jar.pack.gz ; do
-  if [ -f $x ]; then rm -f $x; fi
-done
-
-if [ x${DO_STATS} = x1 ]; then
-  echo "Creating P2 metadata with download stats..."
-  # Sonatype / Tycho app for generating p2 download stats
-  # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=310132
-  #  -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \
-  #CMD="java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-  #  -p2.statsTrackedBundles org.eclipse.rse.sdk,org.eclipse.dstore.core,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples.tutorial,org.eclipse.rse.tests,org.eclipse.tm.rapi,org.eclipse.tm.discovery,org.eclipse.tm.terminal,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \
-  CMD="java -jar ${tgtlauncher} \
-    -application org.sonatype.tycho.p2.updatesite.UpdateSitePublisherWithJRE \
-    -source ${SITE} \
-    -metadataRepository file:${SITE} \
-    -artifactRepository file:${SITE} \
-    -compress \
-    -p2.statsURI http://download.eclipse.org/stats/dsdp/tm \
-    -p2.statsTrackedFeatures org.eclipse.rse.sdk,org.eclipse.rse.dstore,org.eclipse.rse.core,org.eclipse.rse.useractions,org.eclipse.rse.examples,org.eclipse.rse.tests,org.eclipse.rse.wince,org.eclipse.tm.discovery,org.eclipse.tm.terminal.view,org.eclipse.tm.terminal.local \
-    -p2.statsTrackedBundles org.eclipse.rse.services,org.eclipse.rse.services.source,org.eclipse.tm.terminal \
-    -p2.statsSuffix _tm322
-    -vmargs -Xmx256M"
-  echo $CMD
-  $CMD
-  result=$?
-  echo "result: ${result}"
-fi
-
-if [ x${DO_CATEGORIES} = x1 ]; then
-  echo "Adding Categories..."
-  CMD="java -jar ${tgtlauncher} \
-    -application org.eclipse.equinox.p2.publisher.CategoryPublisher \
-    -metadataRepository file:${SITE}/ \
-    -categoryDefinition file:${SITE}/category.xml \
-    -compress"
-  echo $CMD
-  $CMD
-  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
-
-cd $SITE
-chgrp -R tools.tm .
-chmod -R g+w .
-chmod -R a+r .
-cd $curdir
diff --git a/releng/org.eclipse.rse.updatesite/bin/pack200 b/releng/org.eclipse.rse.updatesite/bin/pack200
deleted file mode 100755
index 1bdf59749..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/pack200
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# Workaround for downgrading effort of pack200 to avoid VM bug
-# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069
-#
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-cd "$curdir"
-
-rm "$mydir/pack200.stamp"
-touch "$mydir/pack200.stamp"
-date >> "$mydir/pack200.stamp"
-echo "pack200 -E4 $*" >> "$mydir/pack200.stamp"
-pack200 -E4 $*
diff --git a/releng/org.eclipse.rse.updatesite/bin/sign.sh b/releng/org.eclipse.rse.updatesite/bin/sign.sh
deleted file mode 100755
index c847039ec..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/sign.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-#*******************************************************************************
-# Copyright (c) 2007, 2010 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-#*******************************************************************************
-# Sign a list of files on build.eclipse.org
-#
-# Usage:
-# sign.sh a.jar featurs/b.jar `ls plugins/*.jar`
-#
-# Prerequisites: 
-# - Eclipse 3.3Mx installed in $HOME/ws_32x/eclipse
-# - Java5 in the PATH or in /shared/tools/tm/jdk-1.5
-
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-umask 022
-
-#Use Java5 on build.eclipse.org - need JRE for pack200
-export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
-basebuilder=${HOME}/ws_32x/org.eclipse.releng.basebuilder
-
-FILES=$*
-
-# Work on update site
-cd ..
-SITE=`pwd`
-
-STAGING=/home/data/httpd/download-staging.priv/tools/tm
-stamp=`date +'%Y%m%d-%H%M'`
-WORKDIR=${STAGING}/${stamp}
-mkdir -p ${WORKDIR}
-REALFILES=""
-NAMES=""
-echo "Bock ma's"
-for file in ${FILES}; do
-  echo "file: ${file}"
-  cd ${SITE}
-  if [ -f ${file} ]; then
-    name=`basename ${file}`
-    echo "signing: ${name}"
-    NAMES="${NAMES} ${name}"
-    REALFILES="${REALFILES} ${file}"
-    cp ${file} ${WORKDIR}
-    cd ${WORKDIR}
-    sign ${name} nomail >/dev/null
-  fi
-done
-mkdir ${WORKDIR}/done
-cd ${WORKDIR}
-TRIES=10
-while [ $TRIES -gt 0 ]; do
-  sleep 30
-  anyleft=0
-  echo "TRIES to go: ${TRIES}"
-  for x in ${NAMES} ; do
-    if [ -f ${x} ]; then
-      anyleft=1
-      result=`jarsigner -verify ${x}`
-      if [ "$result" = "jar verified." ]; then
-        echo "${result}: ${x}"
-        mv ${x} ${WORKDIR}/done/${x}
-      else
-        echo "-pending- ${x} : ${result}" | head -1
-        sleep 30
-      fi
-    fi
-  done
-  if [ "${anyleft}" = "0" ]; then
-     TRIES=0
-     ok=1
-  else
-     echo "--> left:"
-     ls
-     TRIES=`expr $TRIES - 1`
-     ok=0
-  fi
-done
-if [ "$ok" = "1" ]; then
-  cd ${SITE}
-  echo "Signed, ok, packing: ${REALFILES}"
-  for x in ${REALFILES} ; do
-    name=`basename ${x}`
-    #cp -f ${WORKDIR}/done/${name} ${x}
-    echo "signed, packing: ${x}"
-    java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-      -application org.eclipse.update.core.siteOptimizer \
-      -jarProcessor -outputDir `dirname ${x}` \
-      -pack ${WORKDIR}/done/${name}
-  done
-  rm -rf ${WORKDIR}
-else
-  echo "Something went wrong during staging and signing."
-  echo "Keeping existing update site intact."
-  rm -rf ${WORKDIR}
-  exit 1
-fi
-
-#Create the digest
-echo "Creating digest..."
-#java -jar $HOME/ws_32x/eclipse/startup.jar \
-java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-    -application org.eclipse.update.core.siteOptimizer \
-    -digestBuilder -digestOutputDir=$SITE \
-    -siteXML=$SITE/site.xml
-
-cd $SITE
-chgrp -R tools.tm .
-chmod -R g+w .
-chmod -R a+r .
-cd $curdir
diff --git a/releng/org.eclipse.rse.updatesite/bin/stageMilestones.sh b/releng/org.eclipse.rse.updatesite/bin/stageMilestones.sh
deleted file mode 100755
index 072c038db..000000000
--- a/releng/org.eclipse.rse.updatesite/bin/stageMilestones.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2007, 2010 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber (Wind River) - initial API and implementation
-#*******************************************************************************
-#!/bin/sh
-curdir=`pwd`
-cd `dirname $0`
-mydir=`pwd`
-
-umask 022
-
-#Use Java5 on build.eclipse.org - need JRE for pack200
-export PATH=/shared/tools/tm/jdk-1.5/jre/bin:/shared/tools/tm/jdk-1.5/bin:$PATH
-basebuilder=${HOME}/ws_32x/org.eclipse.releng.basebuilder
-
-# patch site.xml
-cd ..
-SITE=`pwd`
-
-# get newest plugins and features: to be done manually on real update site
-if [ `basename $SITE` != milestones ]; then
-    echo "Must run on milestones update site"
-    cd "$curdir"
-    exit 1
-fi
-
-# store away previous version
-echo "Storing away old versions"
-if [ -d features.sav ]; then
-    rm -rf features.sav
-fi
-if [ -d plugins.sav ]; then
-    rm -rf plugins.sav
-fi
-mkdir features.sav
-mkdir plugins.sav
-mv features/*_2.0.1.v* features.sav
-mv features/*_1.0.1.v* features.sav
-mv plugins/*_2.0.1.v* plugins.sav
-mv plugins/*_1.0.1.v* plugins.sav
-
-# copy new version
-echo "Copying new versions"
-cp ../../signed32Updates/features/*_2.0.1.v* features
-cp ../../signed32Updates/features/*_1.0.1.v* features
-cp ../../signed32Updates/plugins/*_2.0.1.v* plugins
-cp ../../signed32Updates/plugins/*_1.0.1.v* plugins
-
-# diff, to be safe
-ls features.sav | sort > f1.$$.txt
-ls plugins.sav | sort > p1.$$.txt
-ls features | grep '_[12]\.0\.1\.v' | sort > f2.$$.txt
-ls plugins | grep  '_[12]\.0\.1\.v' | sort > p2.$$.txt
-echo "Plugins diff:"
-diff p1.$$.txt p2.$$.txt
-echo "Features diff:"
-diff f1.$$.txt f2.$$.txt
-rm f1.$$.txt f2.$$.txt p1.$$.txt p2.$$.txt
-
-cd "$curdir"
-exit 0
-\ No newline at end of file
diff --git a/releng/org.eclipse.rse.updatesite/category.xml b/releng/org.eclipse.rse.updatesite/category.xml
deleted file mode 100644
index 1705d1e82..000000000
--- a/releng/org.eclipse.rse.updatesite/category.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.eclipse.rse.sdk_3.2.2.qualifier.jar" id="org.eclipse.rse.sdk" version="3.2.2.qualifier">
-      <category name="TM and RSE Main Features"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.2.2.qualifier.jar" id="org.eclipse.rse" version="3.2.2.qualifier">
-      <category name="TM and RSE Main Features"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.200.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.200.qualifier">
-      <category name="TM and RSE Main Features"/>
-   </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="TM and RSE Optional Add-Ons"/>
-   </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="TM and RSE Optional Add-Ons"/>
-   </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="TM and RSE Optional Add-Ons"/>
-   </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="TM and RSE Optional Add-Ons"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.1.2.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.2.qualifier">
-      <category name="TM and RSE Main Features"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.1.2.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.1.2.qualifier">
-      <category name="TM and RSE Optional Add-Ons"/>
-   </feature>
-   <category-def name="TM and RSE 3.2.2 Main Features" label="TM and RSE 3.2.2 Main Features">
-      <description>
-         Remote System Explorer (RSE)
-      </description>
-   </category-def>
-   <category-def name="TM and RSE 3.2.2 Optional Add-Ons" label="TM and RSE 3.2.2 Optional Add-Ons">
-      <description>
-         Examples, Tests and Incubation Plug-ins.
-      </description>
-   </category-def>
-</site>
diff --git a/releng/org.eclipse.rse.updatesite/index.html b/releng/org.eclipse.rse.updatesite/index.html
deleted file mode 100644
index 5b8756145..000000000
--- a/releng/org.eclipse.rse.updatesite/index.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<html>
-<head>
-<title>Target Management Project 2.0 Updates</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<style>@import url("web/site.css");</style>
-<script type="text/javascript">
-	var returnval = 0;
-	var stylesheet, xmlFile, cache, doc;
-	function init(){
-		// NSCP 7.1+ / Mozilla 1.4.1+ / Safari
-		// Use the standard DOM Level 2 technique, if it is supported
-		if (document.implementation && document.implementation.createDocument) {
-			xmlFile = document.implementation.createDocument("", "", null);
-			stylesheet = document.implementation.createDocument("", "", null);
-			if (xmlFile.load){
-				xmlFile.load("site.xml");
-				stylesheet.load("web/site.xsl");
-			} else {
-				alert("Document could not be loaded by browser.");
-			}
-			xmlFile.addEventListener("load", transform, false);
-			stylesheet.addEventListener("load", transform, false);
-		}
-		//IE 6.0+ solution
-		else if (window.ActiveXObject) {
-			xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
-			xmlFile.async = false;
-			xmlFile.load("site.xml");
-			stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
-			stylesheet.async = false;
-			stylesheet.load("web/site.xsl");
-			cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
-			cache.stylesheet = stylesheet;
-			transformData();
-		}
-	}
-	// separate transformation function for IE 6.0+
-	function transformData(){
-		var processor = cache.createProcessor();
-		processor.input = xmlFile;
-		processor.transform();
-		data.innerHTML = processor.output;
-	}
-	// separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+ 
-	function transform(){
-		returnval+=1;
-		if (returnval==2){
-			var processor = new XSLTProcessor();
-			processor.importStylesheet(stylesheet); 
-			doc = processor.transformToDocument(xmlFile);
-			document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
-		}
-	}
-</script>
-</head>
-<body onload="init();">
-	<div align="right" width="230">
-	  <a href="http://www.eclipse.org/tm/images/RSESample.gif">
-        <img src="http://www.eclipse.org/tm/images/RSESample_4x.gif" alt="[RSE Sample Screenshot]" border="0" width="230" height="165" title="RSE Sample Screenshot" />
-      </a>
-    </div>
-
-	<h1 class="title">Target Management Project 2.0 Updates</h1>
-	<h2>Just getting started?</h2>
-      <p><b>See <a href="http://www.eclipse.org/tm/tutorial/">http://www.eclipse.org/tm/tutorial/</a></b></p>
-    <hr/>
-    <p>For getting the software on this site, you need to use the Eclipse
-    <a href="http://help.eclipse.org/help33/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">
-    Update Manager</a> (choose <i>Help &gt; Software Updates &gt; Find and Install</i>
-    in Eclipse 3.3 or later).<br/>
-    Define a new remote update site named "Target Management Updates",
-    and specify</p>
-    <p><code>&nbsp;&nbsp;&nbsp;http://download.eclipse.org/tm/updates/2.0/</code></p>
-    <p>as the URL to use.
-    See <a href="http://help.eclipse.org/help33/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-34.htm">
-      Eclipse Help</a> for general information about using Update Manager.</p>
-    <p>If you do not have Eclipse installed yet, better use the 
-    <a href="http://download.eclipse.org/tm/downloads/">downloads from this site</a>.</p>
-<!--[insert static HTML here]-->
-<div id="data"><!-- this is where the transformed data goes --></div>
-</body>
-</html>
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
deleted file mode 100644
index b4e68a935..000000000
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ /dev/null
@@ -1,865 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-   
-    Contributors:
-    Martin Oberhuber (Wind River) - initial API and implementation
- -->
-
-<site pack200="true" 
-	mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/tm/updates/2.0/site.xml&amp;format=xml&amp;protocol=http"
-	digestURL="http://download.eclipse.org/tm/updates/2.0/">
-<!-- was disabled due to bug 163406 digestURL="http://download.eclipse.org/tm/updates/2.0/" -->
-   <description url="http://download.eclipse.org/tm/updates/2.0/">
-      This is the Target Management Project 2.0 Update Site.
-   </description>
-<!-- BEGIN_2_0 -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq.jar" id="org.eclipse.rse.sdk" version="2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB.jar" id="org.eclipse.rse" version="2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB">
-      <category name="TM and RSE 2.0"/>
-   </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"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.0.0.v20070609-4--8s733G3E3G.jar" id="org.eclipse.rse.remotecdt" version="2.0.0.v20070609-4--8s733G3E3G">
-      <category name="TM and RSE 2.0"/>
-   </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"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.0.v20070609-7P--EB7sQRxRjbc.jar" id="org.eclipse.rse.core" version="2.0.0.v20070609-7P--EB7sQRxRjbc">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_2.0.0.v20070609-7F--DUUEF6Ez0L1.jar" id="org.eclipse.rse.dstore" version="2.0.0.v20070609-7F--DUUEF6Ez0L1">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.0.v20070609-77378_kE77Y7U9K5G7A.jar" id="org.eclipse.rse.ftp" version="2.0.0.v20070609-77378_kE77Y7U9K5G7A">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.0.0.v20070609-7_--AgI99h9c9c.jar" id="org.eclipse.rse.local" version="2.0.0.v20070609-7_--AgI99h9c9c">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.0.v20070609-78--_kE77Y7U7U.jar" id="org.eclipse.rse.ssh" version="2.0.0.v20070609-78--_kE77Y7U7U">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.0.0.v20070609-6378AgI99h9cEU5G7A.jar" id="org.eclipse.rse.telnet" version="2.0.0.v20070609-6378AgI99h9cEU5G7A">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_2.0.0.v20070609-6--9oA55P5M7J.jar" id="org.eclipse.rse.tests" version="2.0.0.v20070609-6--9oA55P5M7J">
-      <category name="TM and RSE 2.0"/>
-   </feature>
-   <category-def name="TM and RSE 2.0" label="TM and RSE 2.0">
-      <description>
-         Features and add-ons of the 2.0 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0 -->
-<!-- BEGIN_2_0_patches -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.0.v20070706-7J--E7ZoHIP4TfeXykCt2OjqBvjq.jar" id="org.eclipse.rse.sdk" version="2.0.0.v20070706-7J--E7ZoHIP4TfeXykCt2OjqBvjq">
-      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.0.v20070706-7D--8mJIOQ6RwTkIMvp9OQKB.jar" id="org.eclipse.rse" version="2.0.0.v20070706-7D--8mJIOQ6RwTkIMvp9OQKB">
-      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.0.v20070706-7P--EB7sQRxRkbd.jar" id="org.eclipse.rse.core" version="2.0.0.v20070706-7P--EB7sQRxRkbd">
-      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.0.v20070706-77378_kE77Y7V9K5G7A.jar" id="org.eclipse.rse.ftp" version="2.0.0.v20070706-77378_kE77Y7V9K5G7A">
-      <category name="TM and RSE 2.0 patches (aka 2.0.0.1)"/>
-   </feature>
-   <category-def name="TM and RSE 2.0 patches (aka 2.0.0.1)" label="TM and RSE 2.0 patches (aka 2.0.0.1)">
-      <description>
-         Patches for features and add-ons of the 2.0 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_patches -->
-<!-- BEGIN_2_0_1 -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.1.v20070926-7J-77E7ZoHOP4inkX-oUe-z-wI6x.jar" id="org.eclipse.rse.sdk" version="2.0.1.v20070926-7J-77E7ZoHOP4inkX-oUe-z-wI6x">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.1.v20070926-7D-58mJIkP9WAviqV7HBvSLC.jar" id="org.eclipse.rse" version="2.0.1.v20070926-7D-58mJIkP9WAviqV7HBvSLC">
-      <category name="TM and RSE 2.0.1"/>
-   </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.1"/>
-   </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.1"/>
-   </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.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.1.v20070926-7_-77AvNHwNY0SWJ6NvlhNDDmDtI.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.1.v20070926-7_-77AvNHwNY0SWJ6NvlhNDDmDtI">
-      <category name="TM and RSE 2.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.1.v20070926-7P-7BEB7sQRxSFkT.jar" id="org.eclipse.rse.core" version="2.0.1.v20070926-7P-7BEB7sQRxSFkT">
-      <category name="TM and RSE 2.0.1"/>
-   </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.1"/>
-   </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.1"/>
-   </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.1"/>
-   </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.1"/>
-   </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.1"/>
-   </feature>
-   <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.1"/>
-   </feature>
-   <category-def name="TM and RSE 2.0.1" label="TM and RSE 2.0.1">
-      <description>
-         Features and add-ons of the 2.0.1 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_1 -->
-<!-- BEGIN_2_0_2 -->
-   <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.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.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.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.2"/>
-   </feature>
-   <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.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.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.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.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.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.2"/>
-   </feature>
-   <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>
-         Features and add-ons of the 2.0.2 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_2 -->
-<!-- BEGIN_2_0_3 -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.3.v20080225-7J-7EE7ZoHQURqoFwQQpz0MuGUHD.jar" id="org.eclipse.rse.sdk" version="2.0.3.v20080225-7J-7EE7ZoHQURqoFwQQpz0MuGUHD">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.3.v20080225-7D-7A8mJIoa9WAvksISSE8yz-C.jar" id="org.eclipse.rse" version="2.0.3.v20080225-7D-7A8mJIoa9WAvksISSE8yz-C">
-      <category name="TM and RSE 2.0.3"/>
-   </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.3"/>
-   </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.3"/>
-   </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.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.3.v20080225-7P-7IEB7sQRz0SoiTb.jar" id="org.eclipse.rse.core" version="2.0.3.v20080225-7P-7IEB7sQRz0SoiTb">
-      <category name="TM and RSE 2.0.3"/>
-   </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.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.3.v20080225-7737D_kE77a7PDI4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.3.v20080225-7737D_kE77a7PDI4I7B">
-      <category name="TM and RSE 2.0.3"/>
-   </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.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.3.v20080225-78-6_kE77a7OAU.jar" id="org.eclipse.rse.ssh" version="2.0.3.v20080225-78-6_kE77a7OAU">
-      <category name="TM and RSE 2.0.3"/>
-   </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.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.3"/>
-   </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.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.ssh_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.ssh" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.telnet_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.telnet" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.view_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.view" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.3"/>
-   </feature>
-   <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.3"/>
-   </feature>
-   <category-def name="TM and RSE 2.0.3" label="TM and RSE 2.0.3">
-      <description>
-         Features and add-ons of the 2.0.3 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_3 -->
-<!-- BEGIN_2_0_4 -->
-   <feature url="features/org.eclipse.rse.sdk_2.0.4.v20080418-7J-7GE7ZoHQVRsnIwSQpz0OuGULB.jar" id="org.eclipse.rse.sdk" version="2.0.4.v20080418-7J-7GE7ZoHQVRsnIwSQpz0OuGULB">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_2.0.4.v20080418-7D-7B8mJIoc9WAvksIWQK8yz-C.jar" id="org.eclipse.rse" version="2.0.4.v20080418-7D-7B8mJIoc9WAvksIWQK8yz-C">
-      <category name="TM and RSE 2.0.4"/>
-   </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.4"/>
-   </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.4"/>
-   </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.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.3.v20080225-7_-7QAvNRwRYVZHJaTqlhNDDqELO">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.core_2.0.3.v20080225-7P-7IEB7sQRz0SoiTb.jar" id="org.eclipse.rse.core" version="2.0.3.v20080225-7P-7IEB7sQRz0SoiTb">
-      <category name="TM and RSE 2.0.4"/>
-   </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.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.4.v20080418-7737F_kE77a7TBO4I7B.jar" id="org.eclipse.rse.ftp" version="2.0.4.v20080418-7737F_kE77a7TBO4I7B">
-      <category name="TM and RSE 2.0.4"/>
-   </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.4"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.3.v20080225-78-6_kE77a7OAU.jar" id="org.eclipse.rse.ssh" version="2.0.3.v20080225-78-6_kE77a7OAU">
-      <category name="TM and RSE 2.0.4"/>
-   </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.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.4"/>
-   </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.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.ssh_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.ssh" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.telnet_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.telnet" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.view_1.0.3.v20080225-1-27w31191336.jar" id="org.eclipse.tm.terminal.view" version="1.0.3.v20080225-1-27w31191336">
-      <category name="TM and RSE 2.0.4"/>
-   </feature>
-   <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.4"/>
-   </feature>
-   <category-def name="TM and RSE 2.0.4" label="TM and RSE 2.0.4">
-      <description>
-         Features and add-ons of the 2.0.4 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_2_0_4 -->
-<!-- BEGIN_3_0 -->
-   <feature url="features/org.eclipse.rse.core_3.0.0.v20080609-7Z3-EB7sQS9RiVd.jar" id="org.eclipse.rse.core" version="3.0.0.v20080609-7Z3-EB7sQS9RiVd">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.0.0.v20080609-7J3-DUUEFDEyF.jar" id="org.eclipse.rse.dstore" version="3.0.0.v20080609-7J3-DUUEFDEyF">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.0.v20080609-78478_kE77c7O7W5I55.jar" id="org.eclipse.rse.ftp" version="3.0.0.v20080609-78478_kE77c7O7W5I55">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.0.v20080604-7_4-AgI99m9c9S.jar" id="org.eclipse.rse.local" version="2.1.0.v20080604-7_4-AgI99m9c9S">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.0.0.v20080609-7H3-8qfbaJJZCz-G-QT8RWUC6.jar" id="org.eclipse.rse" version="3.0.0.v20080609-7H3-8qfbaJJZCz-G-QT8RWUC6">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.0.0.v20080609-7Q3-E8VwNKi_uz0rSEApXAaTcHQS.jar" id="org.eclipse.rse.sdk" version="3.0.0.v20080609-7Q3-E8VwNKi_uz0rSEApXAaTcHQS">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.1.0.v20080604-783-_kE77c7U7M.jar" id="org.eclipse.rse.ssh" version="2.1.0.v20080604-783-_kE77c7U7M">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.1.0.v20080604-6678AgI99m9W9W5I55.jar" id="org.eclipse.rse.telnet" version="2.1.0.v20080604-6678AgI99m9W9W5I55">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.1.0.v20080604-41-8s733I3E39.jar" id="org.eclipse.rse.remotecdt" version="2.1.0.v20080604-41-8s733I3E39">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_0.1.0.v20080610-22-9sB6EO_O8X2842.jar" id="org.eclipse.rse.terminals" version="0.1.0.v20080610-22-9sB6EO_O8X2842">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.0.v20080604-21-8s733I3E3A.jar" id="org.eclipse.rse.useractions" version="1.1.0.v20080604-21-8s733I3E3A">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.1.0.v20080604-02-9oA55S5M5I.jar" id="org.eclipse.rse.wince" version="0.1.0.v20080604-02-9oA55S5M5I" os="win32" arch="x86">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_2.0.0.v20080609-7J--B-NDwSXnUKIyQYlhNDDrDeLT.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.0.v20080609-7J--B-NDwSXnUKIyQYlhNDDrDeLT">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.0.0.v20080605-7D3_79oA55S5M5J.jar" id="org.eclipse.rse.tests" version="3.0.0.v20080605-7D3_79oA55S5M5J">
-      <category name="TM and RSE 3.0"/>
-   </feature>
-   <category-def name="TM and RSE 3.0" label="TM and RSE 3.0">
-      <description>
-         Features and add-ons of the 3.0 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_0 -->
-<!-- BEGIN_3_0_1 -->
-   <feature url="features/org.eclipse.rse.core_3.0.1.v200809171600-7Z379EB7sQS9S4YPJaHC.jar" id="org.eclipse.rse.core" version="3.0.1.v200809171600-7Z379EB7sQS9S4YPJaHC">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.0.1.v200809181500-7J32DUUEFDF8Hu9FH7.jar" id="org.eclipse.rse.dstore" version="3.0.1.v200809181500-7J32DUUEFDF8Hu9FH7">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.1.v200809171630-78479_kE77c7Q8b8T_F.jar" id="org.eclipse.rse.ftp" version="3.0.1.v200809171630-78479_kE77c7Q8b8T_F">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.1.v20080710-7_40AgI99m9d_O.jar" id="org.eclipse.rse.local" version="2.1.1.v20080710-7_40AgI99m9d_O">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.0.1.v200809181500-7H368qfenEMeUOENNFdiKV_gK8.jar" id="org.eclipse.rse" version="3.0.1.v200809181500-7H368qfenEMeUOENNFdiKV_gK8">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.0.1.v200809181500-7Q379E8VwNRiAF6ydJFuZH7RGg1d.jar" id="org.eclipse.rse.sdk" version="3.0.1.v200809181500-7Q379E8VwNRiAF6ydJFuZH7RGg1d">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.1.1.v20080714-7830_kE77c7V8M.jar" id="org.eclipse.rse.ssh" version="2.1.1.v20080714-7830_kE77c7V8M">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.1.1.v200809181500-6678AgI99m9W9X5J79.jar" id="org.eclipse.rse.telnet" version="2.1.1.v200809181500-6678AgI99m9W9X5J79">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.1.1.v200809041200-4118s733I3J4F5C48.jar" id="org.eclipse.rse.remotecdt" version="2.1.1.v200809041200-4118s733I3J4F5C48">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_0.1.1.v200809041200-2229sB7EO_T_T5C6B3457.jar" id="org.eclipse.rse.terminals" version="0.1.1.v200809041200-2229sB7EO_T_T5C6B3457">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.1.v200809041200-2118s733I3K484673.jar" id="org.eclipse.rse.useractions" version="1.1.1.v200809041200-2118s733I3K484673">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.1.1.v20080626-0219oA55S5M9M.jar" id="org.eclipse.rse.wince" version="0.1.1.v20080626-0219oA55S5M9M" os="win32" arch="x86">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_2.0.1.v200807281235-7J-79B-NIwSXwVTN4Y0c5RRRNHYG.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.1.v200807281235-7J-79B-NIwSXwVTN4Y0c5RRRNHYG">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.0.1.v200809041200-7D3_99oA55S5R7H2311.jar" id="org.eclipse.rse.tests" version="3.0.1.v200809041200-7D3_99oA55S5R7H2311">
-      <category name="TM and RSE 3.0.1"/>
-   </feature>
-   <category-def name="TM and RSE 3.0.1" label="TM and RSE 3.0.1">
-      <description>
-         Features and add-ons of the 3.0.1 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_0_1 -->
-<!-- BEGIN_3_0_2 -->
-   <feature url="features/org.eclipse.rse.core_3.0.2.v200812041720-7Z37BEB7sQS9UkXMIjJI.jar" id="org.eclipse.rse.core" version="3.0.2.v200812041720-7Z37BEB7sQS9UkXMIjJI">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.0.2.v200812041720-7J35DUUEFDHoHxAT97.jar" id="org.eclipse.rse.dstore" version="3.0.2.v200812041720-7J35DUUEFDHoHxAT97">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.1.v200809171630-78479_kE77c7Q8b8T_F.jar" id="org.eclipse.rse.ftp" version="3.0.1.v200809171630-78479_kE77c7Q8b8T_F">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.1.v20080710-7_40AgI99m9d_O.jar" id="org.eclipse.rse.local" version="2.1.1.v20080710-7_40AgI99m9d_O">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.0.2.v200812041720-7H3788qfeqHMeUOEQ2IKjVLIiQ8.jar" id="org.eclipse.rse" version="3.0.2.v200812041720-7H3788qfeqHMeUOEQ2IKjVLIiQ8">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.0.2.v200812041720-7Q37BE8VwNShWC5jCH32fQz0U6Ng.jar" id="org.eclipse.rse.sdk" version="3.0.2.v200812041720-7Q37BE8VwNShWC5jCH32fQz0U6Ng">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.1.1.v20080714-7830_kE77c7V8M.jar" id="org.eclipse.rse.ssh" version="2.1.1.v20080714-7830_kE77c7V8M">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.1.1.v200809181500-6678AgI99m9W9X5J79.jar" id="org.eclipse.rse.telnet" version="2.1.1.v200809181500-6678AgI99m9W9X5J79">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.1.1.v200809041200-4118s733I3J4F5C48.jar" id="org.eclipse.rse.remotecdt" version="2.1.1.v200809041200-4118s733I3J4F5C48">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_0.1.1.v200809041200-2229sB7EO_T_T5C6B3457.jar" id="org.eclipse.rse.terminals" version="0.1.1.v200809041200-2229sB7EO_T_T5C6B3457">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.2.v200812041720-2138s733I573A5G73.jar" id="org.eclipse.rse.useractions" version="1.1.2.v200812041720-2138s733I573A5G73">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.1.1.v20080626-0219oA55S5M9M.jar" id="org.eclipse.rse.wince" version="0.1.1.v20080626-0219oA55S5M9M" os="win32" arch="x86">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_2.0.2.v200811110900-7J-7AB-NJwSYqUMN5TqbBONRNHYG.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.2.v200811110900-7J-7AB-NJwSYqUMN5TqbBONRNHYG">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.0.1.v200809041200-7D3_99oA55S5R7H2311.jar" id="org.eclipse.rse.tests" version="3.0.1.v200809041200-7D3_99oA55S5R7H2311">
-      <category name="TM and RSE 3.0.2"/>
-   </feature>
-   <category-def name="TM and RSE 3.0.2" label="TM and RSE 3.0.2">
-      <description>
-         Features and add-ons of the 3.0.2 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_0_2 -->
-<!-- BEGIN_3_0_3 -->
-   <feature url="features/org.eclipse.rse.core_3.0.3.v200902042310-7Z37HEB7sQSCRiULOVOE.jar" id="org.eclipse.rse.core" version="3.0.3.v200902042310-7Z37HEB7sQSCRiULOVOE">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.0.3.v200902042310-7J378DUUEFGEpIz-AW8E.jar" id="org.eclipse.rse.dstore" version="3.0.3.v200902042310-7J378DUUEFGEpIz-AW8E">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.1.v200809171630-78479_kE77c7Q8b8T_F.jar" id="org.eclipse.rse.ftp" version="3.0.1.v200809171630-78479_kE77c7Q8b8T_F">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.1.v20080710-7_40AgI99m9d_O.jar" id="org.eclipse.rse.local" version="2.1.1.v20080710-7_40AgI99m9d_O">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.0.3.v200902042310-7H37E8qfisI6diJKMbrhR-TV-a3.jar" id="org.eclipse.rse" version="3.0.3.v200902042310-7H37E8qfisI6diJKMbrhR-TV-a3">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.0.3.v200902042310-7Q37JE8VwNSsU34mKIp3tM4Uhwlm.jar" id="org.eclipse.rse.sdk" version="3.0.3.v200902042310-7Q37JE8VwNSsU34mKIp3tM4Uhwlm">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.1.1.v20080714-7830_kE77c7V8M.jar" id="org.eclipse.rse.ssh" version="2.1.1.v20080714-7830_kE77c7V8M">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.1.1.v200809181500-6678AgI99m9W9X5J79.jar" id="org.eclipse.rse.telnet" version="2.1.1.v200809181500-6678AgI99m9W9X5J79">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.0.0.v20080604-780-9oA55S5M5G.jar" id="org.eclipse.rse.examples" version="3.0.0.v20080604-780-9oA55S5M5G">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.remotecdt_2.1.1.v200809041200-4118s733I3J4F5C48.jar" id="org.eclipse.rse.remotecdt" version="2.1.1.v200809041200-4118s733I3J4F5C48">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_0.1.3.v200902181600-2269sB9EP_M_W5B5B3822.jar" id="org.eclipse.rse.terminals" version="0.1.3.v200902181600-2269sB9EP_M_W5B5B3822">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.2.v200812041720-2138s733I573A5G73.jar" id="org.eclipse.rse.useractions" version="1.1.2.v200812041720-2138s733I573A5G73">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.1.1.v20080626-0219oA55S5M9M.jar" id="org.eclipse.rse.wince" version="0.1.1.v20080626-0219oA55S5M9M" os="win32" arch="x86">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.0.v20080530-7N-E8ME8McIJXIwdh.jar" id="org.eclipse.tm.discovery" version="3.0.0.v20080530-7N-E8ME8McIJXIwdh">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_2.0.3.v200902181600-7J-7EB-NLwTYlTNN4PlbFLKRNHYG.jar" id="org.eclipse.tm.terminal.sdk" version="2.0.3.v200902181600-7J-7EB-NLwTYlTNN4PlbFLKRNHYG">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.0.1.v200809041200-7D3_99oA55S5R7H2311.jar" id="org.eclipse.rse.tests" version="3.0.1.v200809041200-7D3_99oA55S5R7H2311">
-      <category name="TM and RSE 3.0.3"/>
-   </feature>
-   <category-def name="TM and RSE 3.0.3" label="TM and RSE 3.0.3">
-      <description>
-         Features and add-ons of the 3.0.3 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_0_3 -->
-<!-- BEGIN_3_1 -->
-   <feature url="features/org.eclipse.rse.core_3.1.0.v200905272300-7a7CEoFC7sRTNS_oZt3fk.jar" id="org.eclipse.rse.core" version="3.1.0.v200905272300-7a7CEoFC7sRTNS_oZt3fk">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.1.0.v200905272300-7L6EoEVVFGMFvQtVaPU.jar" id="org.eclipse.rse.dstore" version="3.1.0.v200905272300-7L6EoEVVFGMFvQtVaPU">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.100.v200905272300-780A79oB55W5KBQBD9D.jar" id="org.eclipse.rse.ftp" version="3.0.100.v200905272300-780A79oB55W5KBQBD9D">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.100.v200905272300-7B4EoBgJ99r9YJhJO99.jar" id="org.eclipse.rse.local" version="2.1.100.v200905272300-7B4EoBgJ99r9YJhJO99">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.1.0.v200905272300-7L5A78wqaCHMdrOqK3DvjpYKCnp3.jar" id="org.eclipse.rse" version="3.1.0.v200905272300-7L5A78wqaCHMdrOqK3DvjpYKCnp3">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.1.0.v200905272300-7U78A7F8Wz-QWqV1Uz0r3gyz0Pcu.jar" id="org.eclipse.rse.sdk" version="3.1.0.v200905272300-7U78A7F8Wz-QWqV1Uz0r3gyz0Pcu">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_3.0.0.v200905272300-7A2BgAkF77g7RFZFJ77.jar" id="org.eclipse.rse.ssh" version="3.0.0.v200905272300-7A2BgAkF77g7RFZFJ77">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.2.0.v200905272300-773-AkF77g7RFZFIBF.jar" id="org.eclipse.rse.telnet" version="2.2.0.v200905272300-773-AkF77g7RFZFIBF">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.1.0.v200905272300-7B5-AkF77g7RFZFJ77.jar" id="org.eclipse.rse.examples" version="3.1.0.v200905272300-7B5-AkF77g7RFZFJ77">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.0.v200905272300-77--9uC6FSANEbEMAF4522.jar" id="org.eclipse.rse.terminals" version="1.0.0.v200905272300-77--9uC6FSANEbEMAF4522">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.1.0.v200905272300-7H5F8NAkF77g7RFZFJ77.jar" id="org.eclipse.rse.tests" version="3.1.0.v200905272300-7H5F8NAkF77g7RFZFJ77">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.100.v200905272300-31A78s733L3D7H7933.jar" id="org.eclipse.rse.useractions" version="1.1.100.v200905272300-31A78s733L3D7H7933">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.2.0.v200905272300-15A7AkF77g7RFZFJ77.jar" id="org.eclipse.rse.wince" version="0.2.0.v200905272300-15A7AkF77g7RFZFJ77" os="win32" arch="x86">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.100.v200905272300-7d-FhJFEx2XZtYr4N3JXX.jar" id="org.eclipse.tm.discovery" version="3.0.100.v200905272300-7d-FhJFEx2XZtYr4N3JXX">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.0.0.v200905272300-7N-FBVC5OpbOz0uZ45hjchPQEB.jar" id="org.eclipse.tm.terminal.sdk" version="3.0.0.v200905272300-7N-FBVC5OpbOz0uZ45hjchPQEB">
-      <category name="TM and RSE 3.1"/>
-   </feature>
-   <category-def name="TM and RSE 3.1" label="TM and RSE 3.1">
-      <description>
-         Features and add-ons of the 3.1 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_1 -->
-<!-- BEGIN_3_1_1 -->
-   <feature url="features/org.eclipse.rse.core_3.1.1.v200907301400-7a7CEwFC7sRTNSwodfv_u.jar" id="org.eclipse.rse.core" version="3.1.1.v200907301400-7a7CEwFC7sRTNSwodfv_u">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.1.1.v200907301400-7L6EsEVVFGMG4TyOVFU.jar" id="org.eclipse.rse.dstore" version="3.1.1.v200907301400-7L6EsEVVFGMG4TyOVFU">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.101.v200909160005-780A89oB55W5OAP9A9I.jar" id="org.eclipse.rse.ftp" version="3.0.101.v200909160005-780A89oB55W5OAP9A9I">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.101.v200907301400-7B4EqBgJ99r9dJ_GM9E.jar" id="org.eclipse.rse.local" version="2.1.101.v200907301400-7B4EqBgJ99r9dJ_GM9E">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.1.1.v200907301400-7L5AE8wqaHPUdsOqKFUpxnbxGiz-.jar" id="org.eclipse.rse" version="3.1.1.v200907301400-7L5AE8wqaHPUdsOqKFUpxnbxGiz-">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.1.1.v200907301400-7U78AFF8Wz-QWxVKUVnCs7-PcuWk.jar" id="org.eclipse.rse.sdk" version="3.1.1.v200907301400-7U78AFF8Wz-QWxVKUVnCs7-PcuWk">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_3.0.1.v200909160005-7A2BhAkF77g7VEYDG7C.jar" id="org.eclipse.rse.ssh" version="3.0.1.v200909160005-7A2BhAkF77g7VEYDG7C">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.2.1.v200908051630-7730AkF77g7UDXELEF.jar" id="org.eclipse.rse.telnet" version="2.2.1.v200908051630-7730AkF77g7UDXELEF">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.1.0.v200905272300-7B5-AkF77g7RFZFJ77.jar" id="org.eclipse.rse.examples" version="3.1.0.v200905272300-7B5-AkF77g7RFZFJ77">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.1.v200907301400-77-39uC7FSAW8XBVLD3622.jar" id="org.eclipse.rse.terminals" version="1.0.1.v200907301400-77-39uC7FSAW8XBVLD3622">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.1.1.v200909160005-7H5F8PAkF77g7ZDXBD7H.jar" id="org.eclipse.rse.tests" version="3.1.1.v200909160005-7H5F8PAkF77g7ZDXBD7H">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.100.v200905272300-31A78s733L3D7H7933.jar" id="org.eclipse.rse.useractions" version="1.1.100.v200905272300-31A78s733L3D7H7933">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.2.0.v200905272300-15A7AkF77g7RFZFJ77.jar" id="org.eclipse.rse.wince" version="0.2.0.v200905272300-15A7AkF77g7RFZFJ77" os="win32" arch="x86">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.100.v200905272300-7d-FhJFEx2XZtYr4N3JXX.jar" id="org.eclipse.tm.discovery" version="3.0.100.v200905272300-7d-FhJFEx2XZtYr4N3JXX">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.0.1.v200907301400-7N-FBaC5OqdP-0Zr1iqaZNOEG.jar" id="org.eclipse.tm.terminal.sdk" version="3.0.1.v200907301400-7N-FBaC5OqdP-0Zr1iqaZNOEG">
-      <category name="TM and RSE 3.1.1"/>
-   </feature>
-   <category-def name="TM and RSE 3.1.1" label="TM and RSE 3.1.1">
-      <description>
-         Features and add-ons of the 3.1.1 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_1_1 -->
-<!-- BEGIN_3_2 -->
-   <feature url="features/org.eclipse.rse.core_3.2.0.v201005221100-7a7FFMRFC7sRd_SMeDdXwc.jar" id="org.eclipse.rse.core" version="3.2.0.v201005221100-7a7FFMRFC7sRd_SMeDdXwc">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.2.0.v201005221100-7L77FD4EVVFKfFtSeLjMK.jar" id="org.eclipse.rse.dstore" version="3.2.0.v201005221100-7L77FD4EVVFKfFtSeLjMK">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.200.v201005221100-780Bg9oB56N5J9QBADD.jar" id="org.eclipse.rse.ftp" version="3.0.200.v201005221100-780Bg9oB56N5J9QBADD">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.200.v201005221100-7B4F8OBgJ9Ai9_K_HT99.jar" id="org.eclipse.rse.local" version="2.1.200.v201005221100-7B4F8OBgJ9Ai9_K_HT99">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.2.0.v201005221100-7L78F9w8wqbPbMa4q_8Q9aKRhAED.jar" id="org.eclipse.rse" version="3.2.0.v201005221100-7L78F9w8wqbPbMa4q_8Q9aKRhAED">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.2.0.v201005221100-7U7EF9wF8Wz-Sc_Vz0mhJFsz-Vat.jar" id="org.eclipse.rse.sdk" version="3.2.0.v201005221100-7U7EF9wF8Wz-Sc_Vz0mhJFsz-Vat">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C.jar" id="org.eclipse.rse.ssh" version="3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.2.100.v201005221100-7730AkF77g7UDXELEF.jar" id="org.eclipse.rse.telnet" version="2.2.100.v201005221100-7730AkF77g7UDXELEF">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.1.100.v201005032000-7B5-AkF77g7RFZFJ77.jar" id="org.eclipse.rse.examples" version="3.1.100.v201005032000-7B5-AkF77g7RFZFJ77">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.100.v201005221100-77-DG9uCFhO1U8MBKRC63562.jar" id="org.eclipse.rse.terminals" version="1.0.100.v201005221100-77-DG9uCFhO1U8MBKRC63562">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.2.0.v201005221100-7H78F8NAkF79P7TBVBRFH.jar" id="org.eclipse.rse.tests" version="3.2.0.v201005221100-7H78F8NAkF79P7TBVBRFH">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.200.v201005221100-31A78s733L3D7H7933.jar" id="org.eclipse.rse.useractions" version="1.1.200.v201005221100-31A78s733L3D7H7933">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.2.100.v201005221100-15A7AkF77g7RFZFJ77.jar" id="org.eclipse.rse.wince" version="0.2.100.v201005221100-15A7AkF77g7RFZFJ77" os="win32" arch="x86">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.200.v201005032000-7d-FhJFEx2XZtYr4N3JXX.jar" id="org.eclipse.tm.discovery" version="3.0.200.v201005032000-7d-FhJFEx2XZtYr4N3JXX">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.1.0.v201006030830-7N1FJKC5PrDz-z0z0UrkbxbcKOLG.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.0.v201006030830-7N1FJKC5PrDz-z0z0UrkbxbcKOLG">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.local_0.1.0.v201006041240-10-7w312117152433.jar" id="org.eclipse.tm.terminal.local" version="0.1.0.v201006041240-10-7w312117152433" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.1.0.v201006030730-62A7898Dw37ICFBPIKEEHE2.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.1.0.v201006030730-62A7898Dw37ICFBPIKEEHE2" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.2"/>
-   </feature>
-   <category-def name="TM and RSE Uncategorized 3.2" label="TM and RSE Uncategorized 3.2">
-      <description>
-         Features and add-ons of the 3.2 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_2 -->
-<!-- BEGIN_3_2_1 -->
-   <feature url="features/org.eclipse.rse.core_3.2.1.v201008191400-7a7FFMWFC7sRd_Sga_dQoV.jar" id="org.eclipse.rse.core" version="3.2.1.v201008191400-7a7FFMWFC7sRd_Sga_dQoV">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.2.1.v201008191400-7L77FD8EVVFLXG4Oz0NjKF.jar" id="org.eclipse.rse.dstore" version="3.2.1.v201008191400-7L77FD8EVVFLXG4Oz0NjKF">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.200.v201005221100-780Bg9oB56N5J9QBADD.jar" id="org.eclipse.rse.ftp" version="3.0.200.v201005221100-780Bg9oB56N5J9QBADD">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.201.v201009071110-7B4F8PBgJ9Ai9dIaHNA9.jar" id="org.eclipse.rse.local" version="2.1.201.v201009071110-7B4F8PBgJ9Ai9dIaHNA9">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ.jar" id="org.eclipse.rse" version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.2.1.v201008191400-7U7EFA0F8Wz-Sc_WGi5JOtz0WjtQ.jar" id="org.eclipse.rse.sdk" version="3.2.1.v201008191400-7U7EFA0F8Wz-Sc_WGi5JOtz0WjtQ">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C.jar" id="org.eclipse.rse.ssh" version="3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.2.100.v201005221100-7730AkF77g7UDXELEF.jar" id="org.eclipse.rse.telnet" version="2.2.100.v201005221100-7730AkF77g7UDXELEF">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.1.100.v201005032000-7B5-AkF77g7RFZFJ77.jar" id="org.eclipse.rse.examples" version="3.1.100.v201005032000-7B5-AkF77g7RFZFJ77">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.101.v201008191400-77-DH9uCFiO1U8MBKTDB3622.jar" id="org.eclipse.rse.terminals" version="1.0.101.v201008191400-77-DH9uCFiO1U8MBKTDB3622">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.2.0.v201005221100-7H78F8NAkF79P7TBVBRFH.jar" id="org.eclipse.rse.tests" version="3.2.0.v201005221100-7H78F8NAkF79P7TBVBRFH">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.200.v201005221100-31A78s733L3D7H7933.jar" id="org.eclipse.rse.useractions" version="1.1.200.v201005221100-31A78s733L3D7H7933">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.2.100.v201005221100-15A7AkF77g7RFZFJ77.jar" id="org.eclipse.rse.wince" version="0.2.100.v201005221100-15A7AkF77g7RFZFJ77" os="win32" arch="x86">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.200.v201005032000-7d-FhJFEx2XZtYr4N3JXX.jar" id="org.eclipse.tm.discovery" version="3.0.200.v201005032000-7d-FhJFEx2XZtYr4N3JXX">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.1.1.v201008191400-7N1FJMC5PrEz0-0VwkcvchKPHG.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.1.v201008191400-7N1FJMC5PrEz0-0VwkcvchKPHG">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.local_0.1.0.v201006041240-10-7w312117152433.jar" id="org.eclipse.tm.terminal.local" version="0.1.0.v201006041240-10-7w312117152433" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.1.1.v201009071110-62A8898Dx37ICFBPKLJEIA2.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.1.1.v201009071110-62A8898Dx37ICFBPKLJEIA2" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.2.1"/>
-   </feature>
-   <category-def name="TM and RSE Uncategorized 3.2.1" label="TM and RSE Uncategorized 3.2.1">
-      <description>
-         Features and add-ons of the 3.2 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_2_1 -->
-<!-- BEGIN_3_2_2 -->
-   <feature url="features/org.eclipse.rse.core_3.2.2.R32x_v201102011435-7a7FFMcF9hxfDPvGY6d8rTEETOY.jar" id="org.eclipse.rse.core" version="3.2.2.R32x_v201102011435-7a7FFMcF9hxfDPvGY6d8rTEETOY">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.2.2.R32x_v201102011435-7L77FDBD2YO5DwmNgNdOG98LBL.jar" id="org.eclipse.rse.dstore" version="3.2.2.R32x_v201102011435-7L77FDBD2YO5DwmNgNdOG98LBL">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.200.v201005221100-780Bg9oB56N5J9QBADD.jar" id="org.eclipse.rse.ftp" version="3.0.200.v201005221100-780Bg9oB56N5J9QBADD">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.202.R32x_v201102011435-7B4F8QBCKC5H2XIVHMB922546.jar" id="org.eclipse.rse.local" version="2.1.202.R32x_v201102011435-7B4F8QBCKC5H2XIVHMB922546">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.2.2.R32x_v201102130925-7L78FA58SreKCHr_JG7UA8bra19p.jar" id="org.eclipse.rse" version="3.2.2.R32x_v201102130925-7L78FA58SreKCHr_JG7UA8bra19p">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.2.2.R32x_v201102130925-7U7EFA9Dc3j6z-rvb-L1tXd_cz-N.jar" id="org.eclipse.rse.sdk" version="3.2.2.R32x_v201102130925-7U7EFA9Dc3j6z-rvb-L1tXd_cz-N">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C.jar" id="org.eclipse.rse.ssh" version="3.0.100.v201005221100-7A2BhAkF77g7VEYDG7C">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.2.100.v201005221100-7730AkF77g7UDXELEF.jar" id="org.eclipse.rse.telnet" version="2.2.100.v201005221100-7730AkF77g7UDXELEF">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.examples_3.1.100.v201005032000-7B5-AkF77g7RFZFJ77.jar" id="org.eclipse.rse.examples" version="3.1.100.v201005032000-7B5-AkF77g7RFZFJ77">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.102.R32x_v201102011435-77-DI9uCFjNZVBGlDNC332423365.jar" id="org.eclipse.rse.terminals" version="1.0.102.R32x_v201102011435-77-DI9uCFjNZVBGlDNC332423365">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.tests_3.2.0.v201005221100-7H78F8NAkF79P7TBVBRFH.jar" id="org.eclipse.rse.tests" version="3.2.0.v201005221100-7H78F8NAkF79P7TBVBRFH">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.200.v201005221100-31A78s733L3D7H7933.jar" id="org.eclipse.rse.useractions" version="1.1.200.v201005221100-31A78s733L3D7H7933">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.2.100.v201005221100-15A7AkF77g7RFZFJ77.jar" id="org.eclipse.rse.wince" version="0.2.100.v201005221100-15A7AkF77g7RFZFJ77" os="win32" arch="x86">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.discovery_3.0.200.v201005032000-7d-FhJFEx2XZtYr4N3JXX.jar" id="org.eclipse.tm.discovery" version="3.0.200.v201005032000-7d-FhJFEx2XZtYr4N3JXX">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.1.2.R32x_v201102011435-7N1FJSB7Rz-4dJwSFCMpZfOVTY7A.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.2.R32x_v201102011435-7N1FJSB7Rz-4dJwSFCMpZfOVTY7A">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.local_0.1.0.v201006041240-10-7w312117152433.jar" id="org.eclipse.tm.terminal.local" version="0.1.0.v201006041240-10-7w312117152433" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.1.2.R32x_v201102011435-62AB898Fx_fM9jeEEHBCCC67ACD7.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.1.2.R32x_v201102011435-62AB898Fx_fM9jeEEHBCCC67ACD7" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.2.2"/>
-   </feature>
-   <category-def name="TM and RSE Uncategorized 3.2.2" label="TM and RSE Uncategorized 3.2.2">
-      <description>
-         Features and add-ons of the 3.2.2 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_2_2 -->
-<!-- BEGIN_3_2_3 -->
-   <feature url="features/org.eclipse.rse.core_3.2.3.qualifier.jar" id="org.eclipse.rse.core" version="3.2.3.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.dstore_3.2.3.qualifier.jar" id="org.eclipse.rse.dstore" version="3.2.3.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ftp_3.0.200.qualifier.jar" id="org.eclipse.rse.ftp" version="3.0.200.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.local_2.1.203.qualifier.jar" id="org.eclipse.rse.local" version="2.1.203.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse_3.2.3.qualifier.jar" id="org.eclipse.rse" version="3.2.3.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.2.3.qualifier.jar" id="org.eclipse.rse.sdk" version="3.2.3.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.ssh_3.0.100.qualifier.jar" id="org.eclipse.rse.ssh" version="3.0.100.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.telnet_2.2.100.qualifier.jar" id="org.eclipse.rse.telnet" version="2.2.100.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </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="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.terminals_1.0.103.qualifier.jar" id="org.eclipse.rse.terminals" version="1.0.103.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </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="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.200.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.200.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.rse.wince_0.2.100.qualifier.jar" id="org.eclipse.rse.wince" version="0.2.100.qualifier" os="win32" arch="x86">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </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="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.1.3.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.3.qualifier">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.local_0.1.0.qualifier.jar" id="org.eclipse.tm.terminal.local" version="0.1.0.qualifier" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.1.3.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.1.3.qualifier" os="linux,macosx,solaris">
-      <category name="TM and RSE Uncategorized 3.2.2+"/>
-   </feature>
-   <category-def name="TM and RSE Uncategorized 3.2.2+" label="TM and RSE Uncategorized 3.2.2+">
-      <description>
-         Patches and Updates provided after the 3.2.2 release of Target Management / RSE.
-      </description>
-   </category-def>
-<!-- END_3_2_3 -->
-
-</site>
diff --git a/releng/org.eclipse.rse.updatesite/web/site.css b/releng/org.eclipse.rse.updatesite/web/site.css
deleted file mode 100644
index 62c6f9ffa..000000000
--- a/releng/org.eclipse.rse.updatesite/web/site.css
+++ /dev/null
@@ -1,12 +0,0 @@
-<STYLE type="text/css">
-td.spacer {padding-bottom: 10px; padding-top: 10px;}
-.title { font-family: sans-serif; color: #99AACC;}
-.bodyText { font-family: sans-serif; font-size: 9pt; color:#000000;  }
-.sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;}
-.log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;}
-.big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;}
-.light-row {background:#FFFFFF}
-.dark-row {background:#EEEEFF}
-.header {background:#99AADD}
-#indent {word-wrap : break-word;width :300px;text-indent:10px;}
-</STYLE>
diff --git a/releng/org.eclipse.rse.updatesite/web/site.xsl b/releng/org.eclipse.rse.updatesite/web/site.xsl
deleted file mode 100644
index 070c3540e..000000000
--- a/releng/org.eclipse.rse.updatesite/web/site.xsl
+++ /dev/null
@@ -1,214 +0,0 @@
-<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-<xsl:output method="html" encoding="UTF-8"/>
-<xsl:key name="cat" match="category" use="@name"/>
-<xsl:template match="/">
-<xsl:for-each select="site">
-	<html>
-	<head>
-	<title>Target Management Project 2.0 Updates</title>
-	<style>@import url("web/site.css");</style>
-	</head>
-	<body>
-
-	<p class="bodyText"><xsl:value-of select="description"/></p>
-	<table width="100%" border="0" cellspacing="1" cellpadding="2">
-	<xsl:for-each select="category-def">
-		<xsl:sort select="@label" order="ascending" case-order="upper-first"/>
-		<xsl:sort select="@name" order="ascending" case-order="upper-first"/>
-	<xsl:if test="count(key('cat',@name)) != 0">
-			<tr class="header">
-				<td class="sub-header" width="30%">
-					<xsl:value-of select="@name"/>
-				</td>
-				<td class="sub-header" width="70%">
-					<xsl:value-of select="@label"/>
-				</td>
-			</tr>
-			<xsl:for-each select="key('cat',@name)">
-			<xsl:sort select="ancestor::feature//@version" order="ascending"/>
-			<xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/>
-			<tr>
-				<xsl:choose>
-				<xsl:when test="(position() mod 2 = 1)">
-					<xsl:attribute name="class">dark-row</xsl:attribute>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:attribute name="class">light-row</xsl:attribute>
-				</xsl:otherwise>
-				</xsl:choose>
-				<td class="log-text" id="indent">
-						<xsl:choose>
-						<xsl:when test="ancestor::feature//@label">
-							<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a>
-							<br/>
-							<div id="indent">
-							(<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>)
-							</div>
-						</xsl:when>
-						<xsl:otherwise>
-						<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a>
-						</xsl:otherwise>
-						</xsl:choose>
-						<br />
-				</td>
-				<td>
-					<table>
-						<xsl:if test="ancestor::feature//@os">
-							<tr><td class="log-text" id="indent">Operating Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@ws">
-							<tr><td class="log-text" id="indent">Windows Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@nl">
-							<tr><td class="log-text" id="indent">Languages:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@arch">
-							<tr><td class="log-text" id="indent">Architecture:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td>
-							</tr>
-						</xsl:if>
-					</table>
-				</td>
-			</tr>
-			</xsl:for-each>
-			<tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr>
-		</xsl:if>
-	</xsl:for-each>
-	<xsl:if test="count(feature)  &gt; count(feature/category)">
-	<tr class="header">
-		<td class="sub-header" colspan="2">
-		Uncategorized
-		</td>
-	</tr>
-	</xsl:if>
-	<xsl:choose>
-	<xsl:when test="function-available('msxsl:node-set')">
-	   <xsl:variable name="rtf-nodes">
-		<xsl:for-each select="feature[not(category)]">
-			<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-			<xsl:sort select="@version" order="ascending" />
-			<xsl:value-of select="."/>
-			<xsl:copy-of select="." />
-		</xsl:for-each>
-	   </xsl:variable>
-	   <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/>
-	<xsl:for-each select="$myNodeSet">
-	<tr>
-		<xsl:choose>
-		<xsl:when test="position() mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:when>
-	<xsl:otherwise>
-	<xsl:for-each select="feature[not(category)]">
-	<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-	<xsl:sort select="@version" order="ascending" />
-	<tr>
-		<xsl:choose>
-		<xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:otherwise>
-	</xsl:choose>
-	</table>
-	</body>
-	</html>
-</xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/releng/org.eclipse.tm.releng.master-feature/.project b/releng/org.eclipse.tm.releng.master-feature/.project
deleted file mode 100644
index 2bf620474..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.releng.master-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.tm.releng.master-feature/build.properties b/releng/org.eclipse.tm.releng.master-feature/build.properties
deleted file mode 100644
index 5a96188be..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2010 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-generate.feature@org.eclipse.tm.tcf.source=org.eclipse.tm.tcf.feature
diff --git a/releng/org.eclipse.tm.releng.master-feature/eclipse_update_120.jpg b/releng/org.eclipse.tm.releng.master-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/releng/org.eclipse.tm.releng.master-feature/epl-v10.html b/releng/org.eclipse.tm.releng.master-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng.master-feature/feature.properties b/releng/org.eclipse.tm.releng.master-feature/feature.properties
deleted file mode 100644
index 77e1899ae..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=TM Releng Master Feature
-
-# "description" property - description of the feature
-description=All of Target Management in one Feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-This product includes software developed by the\n\
-Apache Software Foundation http://www.apache.org/
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.tm.releng.master-feature/feature.xml b/releng/org.eclipse.tm.releng.master-feature/feature.xml
deleted file mode 100644
index d7e91d5a0..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/feature.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2008, 2010 Wind River Systems, Inc. and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-<feature
-      id="org.eclipse.tm.releng.master"
-      label="%featureName"
-      version="3.2.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rse.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tm.terminal.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tm.terminal.local.sdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tm.discovery"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.examples"
-         version="0.0.0"/>
-
-<!--
-   <includes
-         id="org.eclipse.rse.tests"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tm.terminal.test"
-         version="0.0.0"/>
--->
-   <includes
-         id="org.eclipse.tm.releng.test"
-         version="0.0.0"/>
-
-<!--
-   <includes
-         id="org.eclipse.rse.wince"
-         version="0.0.0"/>
--->
-   <includes
-         id="org.eclipse.tm.tcf.feature"
-         version="0.0.0"/>
-   <includes
-         id="org.eclipse.tm.tcf.source"
-         version="0.0.0"/>
-   <plugin
-         id="org.apache.commons.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-   <plugin
-         id="org.apache.commons.net.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-<!--
-   <plugin
-         id="org.eclipse.tm.tcf.agent"
-         version="0.3.0"
-         unpack="true"/>
-
-   <plugin
-         id="org.eclipse.tm.tcf.docs"
-         version="0.3.0"
-         unpack="true"/>
--->
-</feature>
diff --git a/releng/org.eclipse.tm.releng.master-feature/license.html b/releng/org.eclipse.tm.releng.master-feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/releng/org.eclipse.tm.releng.master-feature/rootfiles/epl-v10.html b/releng/org.eclipse.tm.releng.master-feature/rootfiles/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng.master-feature/rootfiles/notice.html b/releng/org.eclipse.tm.releng.master-feature/rootfiles/notice.html
deleted file mode 100644
index c184ca36a..000000000
--- a/releng/org.eclipse.tm.releng.master-feature/rootfiles/notice.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/releng/org.eclipse.tm.releng.test-feature/.project b/releng/org.eclipse.tm.releng.test-feature/.project
deleted file mode 100644
index c5528c96a..000000000
--- a/releng/org.eclipse.tm.releng.test-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tm.releng.test-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.tm.releng.test-feature/build.properties b/releng/org.eclipse.tm.releng.test-feature/build.properties
deleted file mode 100644
index 55d81df6f..000000000
--- a/releng/org.eclipse.tm.releng.test-feature/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2010 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/releng/org.eclipse.tm.releng.test-feature/eclipse_update_120.jpg b/releng/org.eclipse.tm.releng.test-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/releng/org.eclipse.tm.releng.test-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/releng/org.eclipse.tm.releng.test-feature/epl-v10.html b/releng/org.eclipse.tm.releng.test-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/releng/org.eclipse.tm.releng.test-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng.test-feature/feature.properties b/releng/org.eclipse.tm.releng.test-feature/feature.properties
deleted file mode 100644
index b6f583281..000000000
--- a/releng/org.eclipse.tm.releng.test-feature/feature.properties
+++ /dev/null
@@ -1,165 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=TM Releng Test Feature
-
-# "description" property - description of the feature
-description=RSE and Terminal Tests in one Feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2010 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.tm.releng.test-feature/feature.xml b/releng/org.eclipse.tm.releng.test-feature/feature.xml
deleted file mode 100644
index 0372f158e..000000000
--- a/releng/org.eclipse.tm.releng.test-feature/feature.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2008, 2010 Wind River Systems, Inc. and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-<feature
-      id="org.eclipse.tm.releng.test"
-      label="%featureName"
-      version="3.2.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rse.tests"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.tm.terminal.test"
-         version="0.0.0"/>
-
-</feature>
diff --git a/releng/org.eclipse.tm.releng.test-feature/license.html b/releng/org.eclipse.tm.releng.test-feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/releng/org.eclipse.tm.releng.test-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/releng/org.eclipse.tm.releng.test-feature/rootfiles/epl-v10.html b/releng/org.eclipse.tm.releng.test-feature/rootfiles/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/releng/org.eclipse.tm.releng.test-feature/rootfiles/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng.test-feature/rootfiles/notice.html b/releng/org.eclipse.tm.releng.test-feature/rootfiles/notice.html
deleted file mode 100644
index c184ca36a..000000000
--- a/releng/org.eclipse.tm.releng.test-feature/rootfiles/notice.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/releng/org.eclipse.tm.releng/.cvsignore b/releng/org.eclipse.tm.releng/.cvsignore
deleted file mode 100644
index 3a4edf690..000000000
--- a/releng/org.eclipse.tm.releng/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
diff --git a/releng/org.eclipse.tm.releng/build.properties b/releng/org.eclipse.tm.releng/build.properties
deleted file mode 100644
index 466504c0c..000000000
--- a/releng/org.eclipse.tm.releng/build.properties
+++ /dev/null
@@ -1,103 +0,0 @@
-###############################################################################
-#  Copyright (c) 2010 Mentor Graphics Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#  Anna Dushistova (Mentor Graphics) - initial API and implementation
-#  Nick Boldt      (RedHat)          - [307014][releng] Improvements to build script for Athena   
-###############################################################################
-
-## BEGIN PROJECT BUILD PROPERTIES ##
-
-# default settings for all this project's builds, for this branch; see also o.e.d.common.releng/build.properties for more overrideable defaults
-
-# To permit automatic downloads of non-EPL compatible code, set this to property to "I accept"
-thirdPartyDownloadLicenseAcceptance="I accept"
-
-# MUST BE SET #
-projectid=tools.tm
-zipPrefix=TM
-incubation=
-version=3.2.0
-buildType=N
-branch=HEAD
-mainFeatureToBuildID=org.eclipse.tm.releng.master
-#testFeatureToBuildID=org.eclipse.tm.releng.test
-testFeatureToBuildID=org.eclipse.rse.tests
-#testFeatureToBuildID=org.eclipse.tm.releng.master
-#testFeatureToBuildID=org.eclipse.tm.terminal.test
-
-JAVA_HOME=${JAVA_HOME}
-JAVA14_HOME=${JAVA_HOME}
-JAVA50_HOME=${JAVA_HOME}
-JAVA60_HOME=${JAVA_HOME}
-JAVADOC_HOME=${JAVA_HOME}/bin
-PACK200_JAVA_HOME=${JAVA_HOME}
-#JAVA_HOME=/opt/public/common/sun-jdk1.6.0_21_x64
-
-#<MOB_20100529>
-#repositoryURLs=\
-#http://download.jboss.org/jbosstools/updates/helios/
-##http://download.eclipse.org/releases/helios/
-#
-#IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group
-#</MOB_20100529>
-
-#IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
-#org.eclipse.emf.feature.group+\
-#org.eclipse.xsd.feature.group
-
-#dependencyURLs= 
-#http://download.eclipse.org/eclipse/downloads/drops/S-3.6M6-201003121448/eclipse-SDK-3.6M6-linux-gtk-ppc.tar.gz,\
-#http://download.eclipse.org/eclipse/downloads/drops/S-3.6RC2-201005201744/eclipse-SDK-3.6RC2-linux-gtk-ppc.tar.gz,\
-
-dependencyURLs=\
-http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/eclipse-SDK-3.6-linux-gtk-x86_64.tar.gz,\
-http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-runtime-2.5.0.zip,\
-http://download.eclipse.org/tools/cdt/builds/7.0.0/I.I201006141710/cdt-master-7.0.0-I201006141710.zip,\
-http://download.eclipse.org/athena/runnables/RXTX-runtime-I20071016-1945.zip
-
-#dependencyURLs=http://download.eclipse.org/athena/runnables/RXTX-runtime-I20071016-1945.zip
-
-build.steps=buildUpdate,buildExtra,buildTests,generateDigests,testLocal,publish,cleanup
-#build.steps=buildZips,buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup,map2psf
-#build.steps=buildZips,buildUpdate,generateDigests,publish,cleanup,map2psf
-
-# Use R36_RC2 basebuilder
-#relengBaseBuilderDir=/opt/public/cbi/build/org.eclipse.releng.basebuilder_R36_M4
-relengBaseBuilderDir=/opt/public/tools/tm/ws_32x/org.eclipse.releng.basebuilder
-
-
-# this is now set in build.xml
-#localSourceCheckoutDir=/home/anna/RSETM-BUILD-workspace/org.eclipse.tm.tree
-
-# don't suppress cleanup if tests fail
-#noclean=true
-noclean=false
-individualSourceBundles=true
-packageFeaturesIncludedBinaries=true
-flattenDependencies=true
-parallelCompilation=true
-generateFeatureVersionSuffix=true
-generateAPIDescription=true
-generateSourceReferences=true
-
-#Compiler options
-#javacFailOnError=false
-## Not needed on Athena since set by default
-#javacDebugInfo=on
-#javacVerbose=true
-
-#This fixes a problem with the IBM 1.5 VM, see bug 158358
-#compilerArg=-inlineJSR -enableJavadoc -warn:+javadoc
-#compilerArg=-inlineJSR -enableJavadoc -warn:+javadoc -encoding UTF-8
-compilerArg=-inlineJSR -enableJavadoc -encoding UTF-8
-#compilerArg=-enableJavadoc -encoding ISO-8859-1
-
-# use this to omit pack200 step (does not yet work on Windows - https://bugs.eclipse.org/bugs/show_bug.cgi?id=268405)
-skipPack=true
-skipSign=true
-## END PROJECT BUILD PROPERTIES ##
diff --git a/releng/org.eclipse.tm.releng/build.xml b/releng/org.eclipse.tm.releng/build.xml
deleted file mode 100644
index c1cf906db..000000000
--- a/releng/org.eclipse.tm.releng/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--
-     Copyright (c) 2009, 2010 Red Hat and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         Anna Dushistova (Mentor Graphics) - cloned from gef.releng
- -->
-
-<!-- A sample build file for use with Hudson. Note that forceContextQualifier 
-	 is being set, which overrides tag/branch values found in *.map files 
--->
-<project default="run">
-	<target name="run">
-		<!-- 0. Set a valid path to JAVA_HOME, if Eclipse's ${java.home}/../bin/javac cannot be found
-		-->
-		<property name="JAVA_HOME" value="${java.home}/.." />
-
-		<tstamp>
-			<format property="buildTimestamp" pattern="yyyyMMddHHmm" />
-		</tstamp>
-		<property name="forceContextQualifier" value="v${buildTimestamp}" />
-
-		<!-- 1. Import these projects using File > Import > Team Project Set > ./psfs/athena.psf.
-			 2. Close the org.eclipse.releng.basebuilder project - it does not need to compile to be of use.
-			 3. You can also define absolute paths for these directories, if relative paths do not work.
-		-->
-		<condition property="relengCommonBuilderDir"
-		           value="${basedir}/../../../org.eclipse.dash.common.releng"
-		           else="${basedir}/../org.eclipse.dash.common.releng"
-		>
-			<available file="${basedir}/../../../org.eclipse.dash.common.releng" type="dir" />
-		</condition>
-		<condition property="relengBaseBuilderDir"
-		           value="${basedir}/../../../org.eclipse.releng.basebuilder"
-		           else="${basedir}/../org.eclipse.releng.basebuilder"
-		>
-			<available file="${basedir}/../../../org.eclipse.releng.basebuilder" type="dir" />
-		</condition>
-
-		<!-- 4. To build from CVS sources using information in the ./maps/*.map files, comment these next two properties
-			 5. Or, to build from sources in the workspace, use these properties. You can also use absolute paths if needed.
-		-->
-		
-		<!--
-		<property name="localSourceCheckoutDir" value="/tmp/build/tm-tree" />
-		<property name="relengBuilderDir" value="${basedir}" />
-		-->
-		
-		<property file="build.properties" />
-		<ant antfile="${relengCommonBuilderDir}/build.xml" />
-	</target>
-</project>
diff --git a/releng/org.eclipse.tm.releng/build.xml.launch b/releng/org.eclipse.tm.releng/build.xml.launch
deleted file mode 100644
index fb1438d88..000000000
--- a/releng/org.eclipse.tm.releng/build.xml.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.tm.releng/build.xml"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="${workspace_loc:/org.eclipse.tm.releng}/buildlog.latest.txt"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.tm.releng"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_HIDE_INTERNAL_TARGETS" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${projects:org.eclipse.dash.common.releng,org.eclipse.tm.releng}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.tm.releng/build.xml}"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
diff --git a/releng/org.eclipse.tm.releng/buildExtra.xml b/releng/org.eclipse.tm.releng/buildExtra.xml
deleted file mode 100644
index 2bb06cc16..000000000
--- a/releng/org.eclipse.tm.releng/buildExtra.xml
+++ /dev/null
@@ -1,313 +0,0 @@
-<!--
-     Copyright (c) 2010 Mentor Graphics Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         Anna Dushistova (Mentor Graphics) - initial API and implementation
- -->
-<project default="run" name="Project's .releng buildExtra.xml">
-
-	<target name="init">
-	</target>
-
-	<target name="run">
-		<!-- TODO: write code that's hooked into o.e.d.commonbuilder.releng's build.xml to do extra configs (eg., for inserting 3rd party libs into plugins) 
-		-->
-	</target>
-
-	<target name="getDependencies">
-		<!-- TODO: if your project requires more dependencies, add them here; if it does not require all of these, remove those not required -->
-		<echo message="Download, then unpack EMF and CDT" />
-		<ant target="getDependency"
-		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
-			<property name="url" value="${modeling.emf.runtime.url}" />
-			<property name="file" value="${modeling.emf.runtime.file}" />
-		</ant>
-		<ant target="getUpdateSiteDependency"
-		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
-			<property name="url" value="${tools.cdt.master.url}" />
-			<property name="file" value="${tools.cdt.master.file}" />
-		</ant>
-	</target>
-
-	<target name="extraPackaging">
-		<!-- USE PDE PACKAGER TO ASSEMBLE THESE ZIPS -->
-
-		<!-- create ALL zip from ${allZip} -->
-		<zip destfile="${buildDirectory}/${buildLabel}/TM-ALL-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" />
-		</zip>
-
-		<!-- build RSE SDK: RSE+Orbit, no examples -->
-		<zip destfile="${buildDirectory}/${buildLabel}/RSE-SDK-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}"
-			            dirmode="775"
-			            filemode="664"
-			            excludes="**/org.eclipse.*.all*, **/org.eclipse.*.all*/**, **/org.eclipse.*.examples*, **/org.eclipse.*.examples*/**, **/org.eclipse.tm*, **/org.eclipse.tm*/**, **/org.eclipse.rse.wince*, **/org.eclipse.rse.wince*/**, **/org.eclipse.rse.useractions*, **/org.eclipse.rse.useractions*/**, **/org.eclipse.rse.tests*, **/org.eclipse.rse.tests*/**, **/org.eclipse.rse.discovery*, **/org.eclipse.rse.discovery*/** "
-			>
-				<include name="**/org.eclipse.rse*" />
-				<include name="**/org.eclipse.rse*/**" />
-				<include name="**/org.eclipse.rse*/**/**" />
-				<include name="**/org.apache.common*" />
-				<include name="**/org.apache.common*/**" />
-				<include name="**/org.apache.common*/**/**" />
-			</zipfileset>
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" id="terminal_required">
-				<include name="**/org.eclipse.tm.terminal_*" />
-				<include name="**/org.eclipse.tm.terminal_*/**" />
-				<include name="**/org.eclipse.tm.terminal_*/**/**" />
-			</zipfileset>
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" id="dstore_required">
-				<include name="**/org.eclipse.dstore*" />
-				<include name="**/org.eclipse.dstore*/**" />
-				<include name="**/org.eclipse.dstore*/**/**" />
-			</zipfileset>
-
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}"
-			            dirmode="775"
-			            filemode="664"
-			            id="rootfiles"
-			            includes="**/eclipse/epl-v10.html, **/eclipse/notice.html"
-			/>
-		</zip>
-
-		<!-- build RSE runtime: RSE+Orbit, no examples -->
-		<zip destfile="${buildDirectory}/${buildLabel}/RSE-runtime-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}"
-			            dirmode="775"
-			            filemode="664"
-			            excludes="**/org.eclipse.*.all*, **/org.eclipse.*.all*/**, **/org.eclipse.*.examples*, **/org.eclipse.*.examples*/**, **/org.eclipse.*.sdk*, **/org.eclipse.*.sdk*/**,**/org.eclipse.*.doc*, **/org.eclipse.*.doc*/*, **/org.eclipse.*.source*, **/org.eclipse.*.source*/**, **/org.apache.*.source*, **/org.apache.*.source*/**, **/*src.zip, **/org.eclipse.tm*, **/org.eclipse.tm*/**, **/org.eclipse.rse.wince*, **/org.eclipse.rse.wince*/**, **/org.eclipse.rse.useractions*, **/org.eclipse.rse.useractions*/**, **/org.eclipse.rse.tests*, **/org.eclipse.rse.tests*/**, **/org.eclipse.rse.discovery*, **/org.eclipse.rse.discovery*/** "
-			>
-				<include name="**/org.eclipse.rse*" />
-				<include name="**/org.eclipse.rse*/**" />
-				<include name="**/org.eclipse.rse*/**/**" />
-				<include name="**/org.apache.common*" />
-				<include name="**/org.apache.common*/**" />
-				<include name="**/org.apache.common*/**/**" />
-				<include name="**/org.eclipse.dstore*" />
-				<include name="**/org.eclipse.dstore*/**" />
-				<include name="**/org.eclipse.dstore*/**/**" />
-			</zipfileset>
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664"
-				excludes="**/org.eclipse.*.source*, **/org.eclipse.*.source*/**">
-				<include name="**/org.eclipse.tm.terminal_*" />
-				<include name="**/org.eclipse.tm.terminal_*/**" />
-				<include name="**/org.eclipse.tm.terminal_*/**/**" />
-			</zipfileset>
-
-			<zipfileset refid="rootfiles" />
-		</zip>
-
-		<!-- build examples -->
-		<zip destfile="${buildDirectory}/${buildLabel}/RSE-examples-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
-				<include name="**/org.eclipse.*.examples*" />
-				<include name="**/org.eclipse.*.examples*/**" />
-				<include name="**/org.eclipse.*.examples*/**/**" />
-			</zipfileset>
-			<zipfileset refid="rootfiles" />
-		</zip>
-
-		<!-- build useractions -->
-		<zip destfile="${buildDirectory}/${buildLabel}/RSE-useractions-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
-				<include name="**/org.eclipse.*.useractions*" />
-				<include name="**/org.eclipse.*.useractions*/**" />
-				<include name="**/org.eclipse.*.useractions*/**/**" />
-				<exclude name="**/org.eclipse.*.useractions.wrapper*" />
-				<exclude name="**/org.eclipse.*.useractions.wrapper*/**" />
-  		        <exclude name="**/org.eclipse.*.useractions.wrapper*/**/**" />
-			</zipfileset>
-			<zipfileset refid="rootfiles" />
-		</zip>
-		
-		<!-- build discovery -->
-		<zip destfile="${buildDirectory}/${buildLabel}/TM-discovery-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664">
-				<include name="**/org.eclipse.*.discovery*" />
-				<include name="**/org.eclipse.*.discovery*/**" />
-				<include name="**/org.eclipse.*.discovery*/**/**" />
-			</zipfileset>
-			<zipfileset refid="rootfiles" />
-		</zip>
-
-		<!-- build terminal -->
-		<zip destfile="${buildDirectory}/${buildLabel}/TM-terminal-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" excludes="**/org.eclipse.*.test*, **/org.eclipse.*.test*/**, **/org.eclipse.tm.terminal.local*, **/org.eclipse.tm.terminal.local*/**">
-				<include name="**/org.eclipse.tm.terminal*" />
-				<include name="**/org.eclipse.tm.terminal*/**" />
-				<include name="**/org.eclipse.tm.terminal*/**/**" />
-			</zipfileset>
-			<zipfileset refid="rootfiles" />
-		</zip>
-
-		<!-- build terminal.local -->
-		<zip destfile="${buildDirectory}/${buildLabel}/TM-terminal-local-incubation-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" excludes="**/org.eclipse.*.test*, **/org.eclipse.*.test*/**">
-				<include name="*.html" />
-				<include name="**/org.eclipse.tm.terminal_*" />
-				<include name="**/org.eclipse.tm.terminal_*/**" />
-				<include name="**/org.eclipse.tm.terminal_*/**/**" />
-				<include name="**/org.eclipse.tm.terminal.local*" />
-				<include name="**/org.eclipse.tm.terminal.local*/**" />
-				<include name="**/org.eclipse.tm.terminal.local*/**/**" />
-				<include name="**/org.eclipse.tm.terminal.view_*" />
-				<include name="**/org.eclipse.tm.terminal.view_*/**" />
-				<include name="**/org.eclipse.tm.terminal.view_*/**/**" />
-			</zipfileset>
-		</zip>
-
-		<!-- build WinCE plugins -->
-		<zip destfile="${buildDirectory}/${buildLabel}/RSE-wince-incubation-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" excludes="**/org.eclipse.*.test*, **/org.eclipse.*.test*/**">
-				<include name="**/org.eclipse.rse.wince*" />
-				<include name="**/org.eclipse.rse.wince*/**" />
-				<include name="**/org.eclipse.rse.wince*/**/**" />
-				<include name="**/org.eclipse.rse.subsystems.wince*" />
-				<include name="**/org.eclipse.rse.subsystems.wince*/**" />
-				<include name="**/org.eclipse.rse.subsystems.wince*/**/**" />
-				<include name="**/org.eclipse.tm.rapi*" />
-				<include name="**/org.eclipse.tm.rapi*/**" />
-				<include name="**/org.eclipse.tm.rapi*/**/**" />
-			</zipfileset>
-			<zipfileset refid="rootfiles" />
-		</zip>
-
-		<!-- build TCF -->
-		<zip destfile="${buildDirectory}/${buildLabel}/TCF-SDK-incubation-${buildAlias}.zip" update="true">
-			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" excludes="**/org.eclipse.*.test*, **/org.eclipse.*.test*/**">
-				<include name="notice.html" />
-				<include name="epl-v10.html" />
-				<include name="**/org.eclipse.tm.tcf*" />
-				<include name="**/org.eclipse.tm.tcf*/**" />
-				<include name="**/org.eclipse.tm.tcf*/**/**" />
-			</zipfileset>
-		</zip>
-		
-	</target>
-
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="preAssemble">
-		<antcall target="serverruntime" />
-		<antcall target="hideServerStuff" />
-<!--
-		<antcall target="allElements">
-			<param name="target" value="gatherSources" />
-		</antcall>
--->		
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after  running assemble. -->
-	<!-- ===================================================================== -->
-	<target name="postAssemble">
-		<antcall target="revealServerStuff" />
-	</target>
-
-	<!-- =====================================================================
-	     Specialized targets hide/reveal the server stuff so it doesn't get packaged
-	     in the client.          
-	     ===================================================================== -->
-
-	<target name="hideServerStuff">
-		<mkdir dir="${buildDirectory}/hidden"/>
-		<move todir="${buildDirectory}/hidden">
-			<fileset dir="${buildDirectory}/plugins">
-				<include name="**/clientserver.jar"/>
-				<include name="**/dstore_core.jar"/>
-				<include name="**/dstore_extra_server.jar"/>
-				<include name="**/dstore_miners.jar"/>
-				<include name="**/clientserversrc.zip"/>
-				<include name="**/dstore_coresrc.zip"/>
-				<include name="**/dstore_extra_serversrc.zip"/>
-				<include name="**/dstore_minerssrc.zip"/>
-			</fileset>
-		</move>
-	</target>
-
-	<target name="revealServerStuff">
-		<move todir="${buildDirectory}/plugins">
-			<fileset dir="${buildDirectory}/hidden" includes="**" />
-		</move>
-		<delete dir="${buildDirectory}/hidden"/>
-	</target>
-
-
-	<!-- =====================================================================
-	     Specialized targets to build the server runtime.           
-	     ===================================================================== -->
-
-	<target name="serverruntime">
-
-		<property name="working" value="${buildDirectory}/${buildLabel}/rseserver"/>
-		<mkdir dir="${working}" />
-		<mkdir dir="${working}/jars" />
-
-		<copy todir="${working}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore/serverruntime" includes="**" />
-		</copy>
-
-		<copy todir="${working}/jars">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.core" includes="dstore_core.jar" />
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.dstore.extra" includes="dstore_extra_server.jar" />
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services" includes="clientserver.jar" />
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.rse.services.dstore" includes="dstore_miners.jar" />
-		</copy>
-
-		<antcall target="rseserver-os-tar">
-			<param name="os" value="unix"/>
-			<param name="eol" value="lf"/>
-		</antcall>
-		<antcall target="rseserver-os-tar">
-			<param name="os" value="macosx"/>
-			<param name="eol" value="lf"/>
-		</antcall>
-		<antcall target="rseserver-os-tar">
-			<param name="os" value="linux"/>
-			<param name="eol" value="lf"/>
-		</antcall>
-		<antcall target="rseserver-os-zip">
-			<param name="os" value="windows"/>
-			<param name="eol" value="crlf"/>
-		</antcall>
-
-		<delete dir="${working}" />
-
-	</target>
-
-	<target name="rseserver-os-tar" depends="rseserver-os-collect">
-		<tar destfile="${buildDirectory}/${buildLabel}/rseserver-${buildId}-${os}.tar">
-			<tarfileset dir="${working}/collector" mode="755" includes="*.pl,*.sh" />
-			<tarfileset dir="${working}/collector" mode="644" excludes="*.pl,*.sh" />
-		</tar>
-		<delete dir="${working}/collector" />
-	</target>
-	<target name="rseserver-os-zip" depends="rseserver-os-collect">
-		<zip destfile="${buildDirectory}/${buildLabel}/rseserver-${buildId}-${os}.zip" basedir="${working}/collector" includes="*"/>
-		<delete dir="${working}/collector" />
-	</target>
-
-	<target name="rseserver-os-collect">
-		<mkdir dir="${working}/collector" />
-		<copy todir="${working}/collector">
-			<fileset dir="${working}/scripts/${os}" includes="*"/>
-			<fileset dir="${working}/data" includes="*"/>
-		</copy>
-		<replace file="${working}/collector/build.dat">
-			<replacefilter token="@build@" value="${buildId}"/>
-			<replacefilter token="@version@" value="${mapVersionTag}"/>
-		</replace>
-		<fixcrlf srcdir="${working}/collector" eol="${eol}" eof="asis" includes="*"/>
-		<copy todir="${working}/collector">
-			<fileset dir="${working}/jars" includes="*"/>
-			<fileset dir="${builder}/template" includes="notice.html,epl-v10.html" />
-		</copy>
-	</target>
-				
-</project>
diff --git a/releng/org.eclipse.tm.releng/hudson/run.sh b/releng/org.eclipse.tm.releng/hudson/run.sh
deleted file mode 100644
index 29ea66ae3..000000000
--- a/releng/org.eclipse.tm.releng/hudson/run.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-###############################################################################
-#  Copyright (c) 2009, 2010 Red Hat and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#  Anna Dushistova (Mentor Graphics) - cloned from gef.releng
-###############################################################################
-
-
-#!/bin/bash
-
-# This script runs as https://build.eclipse.org/hudson/job/cbi-*/configure
-# and is archived in  http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.dash/athena/org.eclipse.dash.commonbuilder/org.eclipse.dash.commonbuilder.releng/hudson/?root=Technology_Project
-# Build runs under ${WORKSPACE} == /opt/users/hudsonbuild/.hudson/jobs/cbi-*/workspace
-
-echo "[`date +%Y/%m/%d\ %H:%M`] Hudson job ${JOBNAME} build #${BUILD_NUMBER} (${BUILD_ID}) started." 
-
-##############################################################################################
-
-# BEGIN CONFIGURATION
-
-buildTimestamp="`date +%Y%m%d%H%M`"
-projectid="tools.tm"
-version="3.2.0"
-
-# leave blank to use assumed values (which may be wrong!)
-projRelengRoot='-projRelengRoot :pserver:anonymous@dev.eclipse.org:/cvsroot/technology'
-projRelengPath='-projRelengPath org.eclipse.dash/athena/org.eclipse.dash.commonbuilder/org.eclipse.gef.releng'
-
-# where should we look for pre-checked out project sources for org.eclipse.dash.common.releng and org.eclipse.releng.basebuilder ?
-cvsProjectBaseDir=/opt/public/cbi/build # build.eclipse.org
-if [[ ! -d $cvsProjectBaseDir ]]; then cvsProjectBaseDir=/home/builduser/workspace; fi # local build? 
-if [[ ! -d $cvsProjectBaseDir ]]; then 
-	echo "ERROR: cannot find where org.eclipse.dash.common.releng and org.eclipse.releng.basebuilder are on disk. Must exit!"
-	exit 1;
-fi 
-
-# need a place to store existing 3rd party jars, eg., ant-contrib.jar (if not in /usr/share/java/)
-thirdPartyJarsDir=/opt/public/cbi/build/3rdPartyJars # build.eclipse.org
-if [[ ! -d $thirdPartyJarsDir ]]; then thirdPartyJarsDir=/tmp/build/3rdPartyJars; fi # local build 
-if [[ ! -d $thirdPartyJarsDir ]]; then mkdir $thirdPartyJarsDir; fi 
-
-# DONE CONFIGURATION
-
-##############################################################################################
-
-# exposed as a Hudson build parameter for convenience
-if [[ $BUILDTYPE ]]; then
-	buildType="$BUILDTYPE"
-else
-	buildType="N"
-fi
-
-# pass in additional flags like -buildAlias=1.0.0RC2 using the $EXTRAFLAGS Hudson parameter
-# buildAlias will rename zips from foo-SDK-N200901011234.zip to foo-SDK-1.0.0RC2.zip
-
-##############################################################################################
-
-# define where to do all the work; start with a fresh folder each time
-writableBuildRoot="${WORKSPACE}/build"
-if [[ -d ${writableBuildRoot} ]]; then rm -fr ${writableBuildRoot}; fi
-
-# define required folders
-downloadsDir="${writableBuildRoot}/downloads"
-signingDir="${writableBuildRoot}/signing"
-
-# long form (default if omitted)
-# buildDir="${writableBuildRoot}/${projectid//.//}/downloads/drops/${version}/${buildType}${buildTimestamp}"
-# short form (non-default)
-buildDir="${writableBuildRoot}/${buildType}${buildTimestamp}"
-
-# create required folders & files (as symlinks is possible)
-mkdir -p ${downloadsDir} ${signingDir} ${buildDir}
-
-# create .cvspass file to shut up unnecessary warnings
-touch ${writableBuildRoot}/.cvspass
-
-#define symlinked required folders
-relengBaseBuilderDir="${writableBuildRoot}/org.eclipse.releng.basebuilder"
-relengCommonBuilderDir="${writableBuildRoot}/org.eclipse.dash.common.releng"
-# symlink basebuilder and common.releng; alternatively, if you omit this, they'll be checked out in start.sh
-ln -s ${cvsProjectBaseDir}/org.eclipse.releng.basebuilder ${writableBuildRoot}/
-ln -s ${cvsProjectBaseDir}/org.eclipse.dash.common.releng ${writableBuildRoot}/
-
-#symlink local copy of org.eclipse.gef.releng instead of fetching from CVS (so tweaks for local Hudson are preserved)
-if [[ -d ${cvsProjectBaseDir}/org.eclipse.gef.releng ]]; then
-	ln -s ${cvsProjectBaseDir}/org.eclipse.gef.releng ${writableBuildRoot}/
-fi
-
-# symlink 3rdPartyJars (reuse existing content on build.eclipse.org for ant-contrib.jar, etc.)
-ln -s ${thirdPartyJarsDir} ${writableBuildRoot}/
-thirdPartyJarsDir="${writableBuildRoot}/3rdPartyJars"
-
-# run a build - may have to pass in "-javaHome /usr/lib/jvm/java" or similar here if default JVM not found
-cd ${writableBuildRoot}/org.eclipse.dash.common.releng/tools/scripts
-./start.sh -projectid ${projectid} -version ${version} -buildType ${buildType} -buildTimestamp ${buildTimestamp} \
-  -writableBuildRoot ${writableBuildRoot} -thirdPartyJarsDir ${thirdPartyJarsDir} -downloadsDir ${downloadsDir} -buildDir ${buildDir} \
-  ${projRelengRoot} ${projRelengPath} ${EXTRAFLAGS} 2>&1
-
-# remove file so workspace navigation is one click simpler
-rm -f ${writableBuildRoot}/.cvspass
-
-echo "[`date +%Y/%m/%d\ %H:%M`] Hudson job ${JOBNAME} build #${BUILD_NUMBER} (${BUILD_ID}) done." 
diff --git a/releng/org.eclipse.tm.releng/maps/discovery.map b/releng/org.eclipse.tm.releng/maps/discovery.map
deleted file mode 100644
index 29156036d..000000000
--- a/releng/org.eclipse.tm.releng/maps/discovery.map
+++ /dev/null
@@ -1,10 +0,0 @@
-feature@org.eclipse.tm.discovery=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery-feature
-plugin@org.eclipse.rse.discovery=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.rse.discovery
-plugin@org.eclipse.tm.discovery.doc.isv=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.doc.isv
-plugin@org.eclipse.tm.discovery.engine=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.engine
-plugin@org.eclipse.tm.discovery.model=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model
-plugin@org.eclipse.tm.discovery.model.edit=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.model.edit
-plugin@org.eclipse.tm.discovery.protocol.dnssd=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.protocol.dnssd
-plugin@org.eclipse.tm.discovery.transport.udp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.transport.udp
-plugin@org.eclipse.tm.discovery.view=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.view
-plugin@org.eclipse.tm.discovery.wizard=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/discovery/org.eclipse.tm.discovery.wizard
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/maps/releng.map b/releng/org.eclipse.tm.releng/maps/releng.map
deleted file mode 100644
index 1811ac236..000000000
--- a/releng/org.eclipse.tm.releng/maps/releng.map
+++ /dev/null
@@ -1,2 +0,0 @@
-feature@org.eclipse.tm.releng.master=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature
-feature@org.eclipse.tm.releng.test=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.test-feature
diff --git a/releng/org.eclipse.tm.releng/maps/rse.map b/releng/org.eclipse.tm.releng/maps/rse.map
deleted file mode 100644
index f36720202..000000000
--- a/releng/org.eclipse.tm.releng/maps/rse.map
+++ /dev/null
@@ -1,64 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-!*** Project's plugins, features and fragments
-feature@org.eclipse.rse=R32x_v201103011712,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
-feature@org.eclipse.rse.core=R32x_v201103011712,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
-feature@org.eclipse.rse.dstore=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
-feature@org.eclipse.rse.examples=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
-feature@org.eclipse.rse.ftp=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
-feature@org.eclipse.rse.local=R32x_v201103011712,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
-feature@org.eclipse.rse.sdk=R32x_v201103011712,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
-feature@org.eclipse.rse.ssh=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
-feature@org.eclipse.rse.telnet=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
-feature@org.eclipse.rse.terminals=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature
-feature@org.eclipse.rse.tests=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature
-feature@org.eclipse.rse.useractions=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions-feature
-!!feature@org.eclipse.rse.useractions.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions.wrapper-feature
-!!feature@org.eclipse.tm.releng.master=v20080609,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature
-plugin@org.eclipse.dstore.core=R32x_v201102121806,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
-plugin@org.eclipse.dstore.doc.isv=v201005221130,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
-plugin@org.eclipse.dstore.extra=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
-plugin@org.eclipse.rse=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse
-plugin@org.eclipse.rse.connectorservice.dstore=v201005281600,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
-plugin@org.eclipse.rse.connectorservice.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
-plugin@org.eclipse.rse.connectorservice.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh
-plugin@org.eclipse.rse.connectorservice.telnet=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet
-plugin@org.eclipse.rse.core=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
-plugin@org.eclipse.rse.doc.isv=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv
-plugin@org.eclipse.rse.doc.user=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user
-plugin@org.eclipse.rse.dstore.security=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
-plugin@org.eclipse.rse.efs=v201005262000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs
-plugin@org.eclipse.rse.efs.ui=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.efs.ui
-plugin@org.eclipse.rse.examples.daytime=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.daytime
-plugin@org.eclipse.rse.examples.tutorial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples.tutorial
-plugin@org.eclipse.rse.files.ui=R32x_v201103011712,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
-plugin@org.eclipse.rse.importexport=v201008191400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.importexport
-plugin@org.eclipse.rse.processes.ui=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
-plugin@org.eclipse.rse.sdk=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
-plugin@org.eclipse.rse.services.dstore=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
-plugin@org.eclipse.rse.services.files.ftp=v201004072040,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
-plugin@org.eclipse.rse.services.local=R32x_v201103011712,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
-plugin@org.eclipse.rse.services.ssh=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
-plugin@org.eclipse.rse.services.telnet=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet
-plugin@org.eclipse.rse.services=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
-plugin@org.eclipse.rse.shells.ui=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
-plugin@org.eclipse.rse.subsystems.files.core=v201008191400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
-plugin@org.eclipse.rse.subsystems.files.dstore=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
-plugin@org.eclipse.rse.subsystems.files.ftp=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
-plugin@org.eclipse.rse.subsystems.files.local=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
-plugin@org.eclipse.rse.subsystems.files.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ssh
-plugin@org.eclipse.rse.subsystems.processes.core=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core
-plugin@org.eclipse.rse.subsystems.processes.dstore=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore
-plugin@org.eclipse.rse.subsystems.processes.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
-plugin@org.eclipse.rse.subsystems.processes.shell.linux=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux
-plugin@org.eclipse.rse.subsystems.shells.core=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
-plugin@org.eclipse.rse.subsystems.shells.dstore=v201008191400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
-plugin@org.eclipse.rse.subsystems.shells.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
-plugin@org.eclipse.rse.subsystems.shells.ssh=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
-plugin@org.eclipse.rse.subsystems.shells.telnet=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet
-plugin@org.eclipse.rse.subsystems.terminals.core=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core
-plugin@org.eclipse.rse.subsystems.terminals.ssh=v200908051630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh
-plugin@org.eclipse.rse.terminals.ui=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui
-plugin@org.eclipse.rse.tests=v201006050745,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
-plugin@org.eclipse.rse.tests.framework=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
-plugin@org.eclipse.rse.ui=R32x_v201103011712,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
-plugin@org.eclipse.rse.useractions=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/maps/tcf.map b/releng/org.eclipse.tm.releng/maps/tcf.map
deleted file mode 100644
index 33758720f..000000000
--- a/releng/org.eclipse.tm.releng/maps/tcf.map
+++ /dev/null
@@ -1,12 +0,0 @@
-!*** tcf - commented out for now.
-plugin@org.eclipse.tm.tcf=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,plugins/org.eclipse.tm.tcf
-!plugin@org.eclipse.tm.tcf.agent=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,agent
-plugin@org.eclipse.tm.tcf.core=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,plugins/org.eclipse.tm.tcf.core
-plugin@org.eclipse.tm.tcf.cdt.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,plugins/org.eclipse.tm.tcf.cdt.ui
-plugin@org.eclipse.tm.tcf.debug=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,plugins/org.eclipse.tm.tcf.debug
-plugin@org.eclipse.tm.tcf.debug.ui=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,plugins/org.eclipse.tm.tcf.debug.ui
-!plugin@org.eclipse.tm.tcf.docs=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,docs
-!plugin@org.eclipse.tm.tcf.examples.daytime=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,examples/org.eclipse.tm.tcf.examples.daytime
-!plugin@org.eclipse.tm.tcf.examples.daytime.agent=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,examples/org.eclipse.tm.tcf.examples.daytime.agent
-plugin@org.eclipse.tm.tcf.rse=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,plugins/org.eclipse.tm.tcf.rse
-feature@org.eclipse.tm.tcf.feature=SVN,trunk,svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,,features/org.eclipse.tm.tcf.feature
diff --git a/releng/org.eclipse.tm.releng/maps/terminal.map b/releng/org.eclipse.tm.releng/maps/terminal.map
deleted file mode 100644
index 4250e5e17..000000000
--- a/releng/org.eclipse.tm.releng/maps/terminal.map
+++ /dev/null
@@ -1,16 +0,0 @@
-feature@org.eclipse.tm.terminal=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
-feature@org.eclipse.tm.terminal.local=v201006041240,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature
-feature@org.eclipse.tm.terminal.local.sdk=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local.sdk-feature
-feature@org.eclipse.tm.terminal.sdk=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
-feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
-feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature
-feature@org.eclipse.tm.terminal.telnet=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet-feature
-feature@org.eclipse.tm.terminal.test=v201006042100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test-feature
-feature@org.eclipse.tm.terminal.view=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature
-plugin@org.eclipse.tm.terminal=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal
-plugin@org.eclipse.tm.terminal.local=v201006041322,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local
-plugin@org.eclipse.tm.terminal.serial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial
-plugin@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh
-plugin@org.eclipse.tm.terminal.telnet=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet
-plugin@org.eclipse.tm.terminal.test=v201006050745,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test
-plugin@org.eclipse.tm.terminal.view=R32x_v201102011435,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/maps/testdrivers.map b/releng/org.eclipse.tm.releng/maps/testdrivers.map
deleted file mode 100644
index abc0ee77a..000000000
--- a/releng/org.eclipse.tm.releng/maps/testdrivers.map
+++ /dev/null
@@ -1,6 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-
-!*** Special entries from eclipse
-
-plugin@org.eclipse.test=v20100118,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-fragment@org.eclipse.ant.optional.junit=v20080717,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
diff --git a/releng/org.eclipse.tm.releng/maps/tmcore.map b/releng/org.eclipse.tm.releng/maps/tmcore.map
deleted file mode 100644
index 3bed665a1..000000000
--- a/releng/org.eclipse.tm.releng/maps/tmcore.map
+++ /dev/null
@@ -1,2 +0,0 @@
-plugin@org.apache.commons.net,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.commons.net_2.0.0.v200905272248.jar
-plugin@org.apache.commons.net.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/org.apache.commons.net.source_2.0.0.v200905272248.jar
diff --git a/releng/org.eclipse.tm.releng/maps/wince.map b/releng/org.eclipse.tm.releng/maps/wince.map
deleted file mode 100644
index a457e988e..000000000
--- a/releng/org.eclipse.tm.releng/maps/wince.map
+++ /dev/null
@@ -1,6 +0,0 @@
-feature@org.eclipse.rse.wince=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.rse.wince-feature
-!! feature@org.eclipse.rse.wince.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.wince.wrapper-feature
-plugin@org.eclipse.rse.subsystems.wince=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.rse.subsystems.wince
-plugin@org.eclipse.tm.rapi=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi
-plugin@org.eclipse.tm.rapi.examples=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.examples
-plugin@org.eclipse.tm.rapi.tests=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi.tests
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/promote-I.properties b/releng/org.eclipse.tm.releng/promote-I.properties
deleted file mode 100644
index 8ca2683af..000000000
--- a/releng/org.eclipse.tm.releng/promote-I.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-#  Copyright (c) 2010 Mentor Graphics Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#  Anna Dushistova (Mentor Graphics) - initial API and implementation
-###############################################################################
-
-# source dir
-sourceZipsDir=/opt/users/hudsonbuild/.hudson/jobs/cbi-tm-3.2-nightly/
-
-# target dir
-targetZipsDir=/home/data/httpd/download.eclipse.org/tm/downloads/drops/3.2.0
-
-# group owner of new files
-targetGroup=tools.tm
-
-# type(s) to copy (N, I, M, S, R; default to all)
-buildTypes=N,I,M,S,R
-
-# synch method method (add or replace; add = keep adding new builds; replace = keep 1 build per branch)
-#synchMethod=add
-synchMethod=replace
-
-# if set, update zip will be unpacked into destination dir and use synchMethod above to add or replace contents 
-#targetUpdateDir=/home/data/httpd/download.eclipse.org/tm/updates/3.2interim/
diff --git a/releng/org.eclipse.tm.releng/promote-N.properties b/releng/org.eclipse.tm.releng/promote-N.properties
deleted file mode 100644
index 7311c6a58..000000000
--- a/releng/org.eclipse.tm.releng/promote-N.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-#  Copyright (c) 2010 Mentor Graphics Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#  Anna Dushistova (Mentor Graphics) - initial API and implementation
-###############################################################################
-# source dir
-sourceZipsDir=/opt/users/hudsonbuild/.hudson/jobs/cbi-tm-3.2-nightly/
-
-# target dir
-targetZipsDir=/home/data/httpd/download.eclipse.org/tm/downloads/drops/3.2.0
-
-# group owner of new files
-targetGroup=tools.tm
-
-# type(s) to copy (N, I, M, S, R; default to all)
-buildTypes=N
-
-# synch method method (add or replace; add = keep adding new builds; replace = keep 1 build per branch)
-synchMethod=add
-#synchMethod=replace
-
-# if set, update zip will be unpacked into destination dir and use synchMethod above to add or replace contents 
-#targetUpdateDir=/home/data/httpd/download.eclipse.org/tm/updates/3.2interim/
diff --git a/releng/org.eclipse.tm.releng/promote.xml b/releng/org.eclipse.tm.releng/promote.xml
deleted file mode 100644
index 3092d8093..000000000
--- a/releng/org.eclipse.tm.releng/promote.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-     Copyright (c) 2009, 2010 Red Hat and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         Anna Dushistova (Mentor Graphics) - cloned from ve.releng
- -->
-
-<project default="run" name="promote.xml - Promote a build from build server to production server">
-	<target name="run">
-		<!--
-			To use this script, you must have configured a promote.properties file.
-			
-			Then, run commandline:
-			
-			ant -f promote.xml
-			
-			If you need to reuse this script with multiple properties files (eg., from 
-			multiple Hudson builds across multiple branches), use the commandline
-			flag -Dpromote.properties:
-			
-			ant -f promote.xml -Dpromote.properties=promote.properties.R2_0_branch
-		-->
-		<property name="promote.properties" value="promote.properties" />
-		<property file="${promote.properties}"/>
-
-		<!-- load build properties -->
-		<property file="build.properties" />
-
-		<property name="relengBuilderDir" value="${basedir}" />
-
-		<!-- invoke common promotion script -->
-		<property name="relengCommonBuilderDir" value="/opt/public/cbi/build/org.eclipse.dash.common.releng" />
-		<ant antfile="${relengCommonBuilderDir}/promote.xml" dir="${relengCommonBuilderDir}" />
-	</target>
-</project>
-\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/templateFiles/rse.map.template b/releng/org.eclipse.tm.releng/templateFiles/rse.map.template
deleted file mode 100644
index 00a57167a..000000000
--- a/releng/org.eclipse.tm.releng/templateFiles/rse.map.template
+++ /dev/null
@@ -1,10 +0,0 @@
-!***************  PROJECT CONTRIBUTION  ******************************************************** 
-
-!*** Special entries from eclipse
-
-plugin@org.eclipse.test=v20070226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-fragment@org.eclipse.ant.optional.junit=v20050226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-
-!*** Project's plugins, features and fragments
-
-@entries@
diff --git a/releng/org.eclipse.tm.releng/templateFiles/testManifest.xml.template b/releng/org.eclipse.tm.releng/templateFiles/testManifest.xml.template
deleted file mode 100644
index bc431c548..000000000
--- a/releng/org.eclipse.tm.releng/templateFiles/testManifest.xml.template
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<topLevel>
-	<zipTypes>
-		<zipType name="projruntime">
-			<platform 
-				id="projRUN" 
-				name="All" 
-				fileName='&lt;a href="RSE-runtime-@build@.zip"&gt;RSE-runtime-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-runtime-@build@.zip.size@ - checksum:&lt;a href="RSE-runtime-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-		<zipType name="projsdk">
-			<platform 
-				id="projSRC" 
-				name="All" 
-				fileName='&lt;a href="RSE-SDK-@build@.zip"&gt;RSE-SDK-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-SDK-@build@.zip.size@ - checksum:&lt;a href="RSE-SDK-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-		<zipType name="projtests">
-			<platform 
-				id="T" 
-				name="All" 
-				fileName='&lt;a href="RSE-automated-tests-@build@.zip"&gt;RSE-automated-tests-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-automated-tests-@build@.zip.size@ - checksum:&lt;a href="RSE-automated-tests-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-		<zipType name="projexamples">
-			<platform 
-				id="EX" 
-				name="All" 
-				fileName='&lt;a href="RSE-examples-@build@.zip"&gt;RSE-examples-@build@.zip&lt;/a&gt; &lt;font size="2"&gt;(size:@RSE-examples-@build@.zip.size@ - checksum:&lt;a href="RSE-examples-@build@.zip.md5"&gt;md5&lt;/a&gt;)&lt;/font&gt;'>
-			</platform>
-		</zipType>
-	</zipTypes>
-
-	<logFiles>
-		<logFile name="org.eclipse.rse.tests_linux.gtk.xml">
-			<effectedFile id="SDK"></effectedFile>
-			<effectedFile id="projRUN"></effectedFile>
-		</logFile>
-	
-	<!-- Comment out for now until we get tests on various platforms.
-		<logFile name="org.eclipse.rse.tests_win32.xml">
-			<effectedFile id="SDK"></effectedFile>
-			<effectedFile id="projRUN"></effectedFile>
-		</logFile>
-	-->	
-	
-@entries@
-
-	</logFiles>
-</topLevel>
diff --git a/releng/org.eclipse.tm.releng/testExtra.xml b/releng/org.eclipse.tm.releng/testExtra.xml
deleted file mode 100644
index 419f3a350..000000000
--- a/releng/org.eclipse.tm.releng/testExtra.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-     Copyright (c) 2010 Eclipse contributors and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         Martin Oberhuber (Wind River) - copy from org.eclipse.linuxtools.releng
- -->
-<project default="run">
-
-	<target name="init">
-	</target>
-
-	<target name="run">
-		<!-- TODO: write code that's hooked into o.e.d.commonbuilder.releng's build.xml to do extra configs (eg., for inserting 3rd party libs into plugins)
-		-->
-	</target>
-
-	<target name="getTestDependencies">
-		<!-- Eclipse will be unpacked by default; any other runtime test requirements need to be handled here -->
-		<ant target="getUpdateSiteTestDependency"
-		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
-			<property name="url" value="${tools.cdt.master.url}" />
-			<property name="file" value="${tools.cdt.master.file}" />
-			<property name="unpackDest" value="${dropins-home}/cdt/eclipse" />
-		</ant>
-		<delete dir="${dropins-home}/cdt/eclipse/plugins/org.eclipse.test_3.2.0"/>
-		<delete file="${dropins-home}/cdt/eclipse/site.xml"/>
-		<ant target="getTestDependency"
-		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
-			<property name="url" value="${modeling.emf.runtime.url}" />
-			<property name="file" value="${modeling.emf.runtime.file}" />
-			<property name="unpackDest" value="${dropins-home}/emf" />
-		</ant>
-	</target>
-</project>
diff --git a/releng/org.eclipse.tm.releng/testing.properties b/releng/org.eclipse.tm.releng/testing.properties
deleted file mode 100644
index dd3fcf959..000000000
--- a/releng/org.eclipse.tm.releng/testing.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-###############################################################################
-#  Copyright (c) 2010 Mentor Graphics Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#  Anna Dushistova (Mentor Graphics) - initial API and implementation
-###############################################################################
-
-JAVA_HOME=${JAVA_HOME}
-JAVA14_HOME=${JAVA_HOME}
-JAVA50_HOME=${JAVA_HOME}
-JAVA60_HOME=${JAVA_HOME}
-JAVADOC_HOME=${JAVA_HOME}/bin
-
-#extraVMargs=-ea -Dorg.eclipse.swt.browser.XULRunnerPath=/shared/common/mozilla-xulrunner181-1.8.1.4-30.ppc
-#extraVMargs=-Dorg.eclipse.swt.browser.XULRunnerPath=/dev/null
-#name of runtime to install and test
-#runtime=${zipPrefix}-ALL${incubation}-${buildAlias}.zip
-
-#csv list of test plugins to run
-testPluginsToRun=org.eclipse.rse.tests
-#MOB - cant get the tm.terminal.test to run...
-#testPluginsToRun=org.eclipse.rse.tests,org.eclipse.tm.terminal.test
-
-#map name of test plugin to testsuite class to run
-org.eclipse.rse.tests.suite=org.eclipse.rse.tests.RSECombinedTestSuite
-org.eclipse.tm.terminal.test.suite=org.eclipse.tm.terminal.test.AutomatedPluginTests
diff --git a/releng/readme.txt b/releng/readme.txt
deleted file mode 100644
index 78336b3a8..000000000
--- a/releng/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Use the "releng" folder for projects containing instructions and scripts for 
-building RSE and the DSDP-TM Core components.
-All projects should be named "org.eclipse.rse.releng<.*>".
diff --git a/rse/doc/org.eclipse.rse.doc.isv/.classpath b/rse/doc/org.eclipse.rse.doc.isv/.classpath
deleted file mode 100755
index ce675f95b..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.rse.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/.cvsignore b/rse/doc/org.eclipse.rse.doc.isv/.cvsignore
deleted file mode 100755
index 0700bef2a..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-index
-build.xml
-javadoc.link.location
-temp.bin.log
-temp.convert.txt
-temp.options.txt
diff --git a/rse/doc/org.eclipse.rse.doc.isv/.project b/rse/doc/org.eclipse.rse.doc.isv/.project
deleted file mode 100755
index dcc4d40c8..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.doc.isv</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF b/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF
deleted file mode 100755
index 302ee812e..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.doc.isv; singleton:=true
-Bundle-Version: 3.2.2.qualifier
-Bundle-Localization: plugin
-Eclipse-LazyStart: false
-Bundle-Vendor: %providerName
diff --git a/rse/doc/org.eclipse.rse.doc.isv/aaa-how-to-add-things.txt b/rse/doc/org.eclipse.rse.doc.isv/aaa-how-to-add-things.txt
deleted file mode 100755
index 9659475c1..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/aaa-how-to-add-things.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Last revised July 27, 2006
-(This file is for information only; it is not included in the release.)
-
-See also
-  http://wiki.eclipse.org/How_to_add_things_to_the_Eclipse_doc
-with the following exceptions:
-- platformOptions.txt    -> options.txt
-- overview-platform.html -> /reference/misc/overview-rse.html
-
-To add new plug-ins you need to make changes in several places in
-this doc plug-in:
-
-1) options.txt
-- the plug-in's source folder(s) must be included on the -sourcepath
-- code of required plug-ins must be added on the -classpath (the JAR(s)for non-JARed plug-ins and <plugin>/@dot for JARed plug-ins
-- the API package names must be included in the (alphabetical) package list at the end of the file
-- note that the @sep@ token is replaced during build by the appropriate separator character for the build platform.
-
-2) buildDoc.xml
-- add a line in convertSchemaToHtml target to handle a new plug-ins extension point schemas
-
-Adding new extension points:
-
-1) reference/extension-points/index.html
-- add a line for each extension point
-
-2) topics_Reference.xml
-- add a line for each extension point
-- add a line for each API package
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/about.html b/rse/doc/org.eclipse.rse.doc.isv/about.html
deleted file mode 100755
index d4cc693f9..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/book.css b/rse/doc/org.eclipse.rse.doc.isv/book.css
deleted file mode 100755
index bd2fe14b0..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/book.css
+++ /dev/null
@@ -1,112 +0,0 @@
-P.Code {
-	display: block;
-	text-align: left;
-	text-indent: 0.00pt;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 15pt;
-	font-size: 10.000000pt;
-	font-weight: normal;
-	font-style: normal;
-	color: #4444CC;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New", Courier, monospace;
-}
-H6.CaptionFigColumn {
-	display: block;
-	text-align: left;
-	text-indent: 0.000000pt;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-	font-size: 9.000000pt;
-	font-weight: bold;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-P.Note {
-	display: block;
-	text-align: left;
-	text-indent: 0pt;
-	margin-top: 19.500000pt;
-	margin-bottom: 19.500000pt;
-	margin-right: 0.000000pt;
-	margin-left: 30pt;
-	font-size: 11.000000pt;
-	font-weight: normal;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-EM.UILabel {
-	font-weight: Bold;
-	font-style: normal;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-EM.CodeName {
-	font-weight: Bold;
-	font-style: normal;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New", Courier, monospace;
-}
-
-body, html { border: 0px }
-
-
-/* following font face declarations need to be removed for DBCS */
-
-body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, Helvetica, sans-serif; color: #000000}
-pre				{ font-family: "Courier New", Courier, monospace;}
-
-/* end font face declarations */
-
-/* following font size declarations should be OK for DBCS */
-body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }
-pre				{ font-size: 10pt}
-
-/* end font size declarations */
-
-body	     { background: #FFFFFF; margin-bottom: 1em }
-h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
-h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
-h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
-h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
-p            { margin-top: 10px; margin-bottom: 10px }
-pre          { margin-left: 6; font-size: 9pt; color: #4444CC } 
-a:link	     { color: #0000FF }
-a:hover	     { color: #000080 }
-a:visited    { text-decoration: underline }
-ul	     { margin-top: 10px; margin-bottom: 10px; }
-li	     { margin-top: 5px; margin-bottom: 5px; } 
-li p	     { margin-top: 5px; margin-bottom: 5px; }
-ol	     { margin-top: 10px; margin-bottom: 10px; }
-dl	     { margin-top: 10px; margin-bottom: 10px; }
-dt	     { margin-top: 5px; margin-bottom: 5px; font-weight: bold; }
-dd	     { margin-top: 5px; margin-bottom: 5px; }
-strong	     { font-weight: bold}
-em	     { font-style: italic}
-var	     { font-style: italic}
-div.revision { border-left-style: solid; border-left-width: thin; 
-				   border-left-color: #7B68EE; padding-left:5 }
-th	     { font-weight: bold }
-
-a.command-link {
-}
-a.command-link img {
-	border-width: 0px;
-	border-style: none;
-	vertical-align: middle;
-}
diff --git a/rse/doc/org.eclipse.rse.doc.isv/build.properties b/rse/doc/org.eclipse.rse.doc.isv/build.properties
deleted file mode 100755
index 927d25899..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/build.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - Declare API provisional
-# Martin Oberhuber (Wind River) - [314012] Remove provisional API declaration
-###############################################################################
-bin.includes = META-INF/,\
-               about.html,\
-               book.css,\
-               notices.html,\
-               plugin.properties,\
-               plugin.xml,\
-               schema.css,\
-               toc.xml,\
-               topics_Guide.xml,\
-               topics_Questions.xml,\
-               topics_Reference.xml,\
-               topics_Samples.xml,\
-               guide/,\
-               icons/,\
-               index/,\
-               questions/,\
-               reference/,\
-               samples/
-customBuildCallbacks = customBuildCallbacks.xml
diff --git a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
deleted file mode 100755
index d36e1484f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/buildDoc.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2007 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<project name="RSE ISV Doc Build" default="all" basedir=".">
-
-	<property name="javadoc.link.location" value="${basedir}/javadoc.link.location"/>
-
-	<target name="init">
-		<available file="${basedir}/index" property="index.present" />
-		<path id="path_bootclasspath">
-			<fileset dir="${java.home}/lib">
-				<include name="*.jar"/>
-			</fileset>
-		</path>
-		<property name="bootclasspath" refid="path_bootclasspath"/>
-		<condition property="safeBaseLocation"
-			value="${baseLocation}"
-			else="${eclipse.home}">
-			<isset property="baseLocation"/>
-		</condition>
-		<delete dir="${javadoc.link.location}" />
-	</target>
-
-	<target name="computeClasspath" unless="javadoc.classpath">
-		<!-- Construct the javadoc classpath and store it in a property. -->
-		<echo level="info" message="Computing classpath ..."/>
-		
-		<!-- Add platform dependencies required by your plug-in here.
-			 Note that this pattern expects Eclipse to have 
-			 been installed into the platform directory structure, as is
-			 the case during the build. -->
-		<patternset id="platform.classpath.pattern">
-			<include name="**/org.eclipse.core*.jar"/>
-			<include name="**/org.eclipse.core*/**/*.jar"/>
-			<include name="**/org.eclipse.compare*.jar"/>
-			<include name="**/org.eclipse.debug.core*.jar"/>
-			<include name="**/org.eclipse.debug.ui*.jar"/>
-			<include name="**/org.eclipse.help*.jar"/>
-			<include name="**/org.eclipse.search*.jar"/>
-        	<include name="**/org.eclipse.swt*.jar"/>
-        	<include name="**/org.eclipse.swt*/**/*.jar"/>
-        	<include name="**/org.eclipse.ui*.jar"/>
-        	<include name="**/org.eclipse.ui*/**/*.jar"/>
-        	<include name="**/org.eclipse.update*.jar"/>
-        	<include name="**/org.eclipse.update*/**/*.jar"/>
-        	<include name="**/org.eclipse.osgi*.jar"/>
-        	<include name="**/org.eclipse.osgi*/**/*.jar"/>
-        	<include name="**/org.eclipse.equinox*.jar"/>
-        	<include name="**/org.eclipse.equinox*/**/*.jar"/>
-        	<include name="**/org.eclipse.jface*.jar"/>
-        	<include name="**/org.eclipse.jface*/**/*.jar"/>
-          	<include name="**/org.eclipse.jsch*.jar"/>
-        	<include name="**/org.eclipse.text*.jar"/>
-        	<include name="**/org.eclipse.text*/**/*.jar"/>
-        	<include name="**/org.eclipse.team*.jar"/>
-        	<include name="**/org.eclipse.team*/**/*.jar"/>
-        	<include name="**/org.junit*.jar"/>
-        	<include name="**/org.junit*/**/*.jar"/>
-			<include name="**/com.ibm.icu*.jar"/>
-			<include name="**/com.jcraft.jsch*.jar"/>
-		</patternset>
-			
-		<pathconvert property="javadoc.classpath">
-			<path>				
-				<fileset dir="${safeBaseLocation}">
-					<patternset refid="platform.classpath.pattern"/>
-		    	</fileset>
-			</path>
-		</pathconvert>
-		<echo level="info" message="Done computing classpath."/>
-		<echo level="info" message="Bootclasspath is: ${bootclasspath}"/>
-		<echo level="debug" message="Classpath is: ${javadoc.classpath}"/>
-	</target>
-
-	<target name="extractLinks">
-		<mkdir dir="${javadoc.link.location}"/>
-		
-		<patternset id="package.list">
-			<include name="**/package-list"/>
-		</patternset>
-		
-		<!-- We only need the package-list files out of these -->
-		<unzip dest="${javadoc.link.location}/platform/">
-			<patternset refid="package.list"/>
-			<fileset dir="${safeBaseLocation}/plugins">
-				<include name="org.eclipse.platform.doc.isv*.jar"/>
-			</fileset>
-		</unzip>
-	</target>
-
-	<target name="all" depends="init" unless="index.present">
-		<antcall target="convertSchemaToHtml" />
-		<antcall target="generateJavadoc" />
-		<antcall target="build.index" />
-	</target>
-
-	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.rse.doc.isv" if="eclipse.running">
-		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-	</target>
-
-	<target name="convertSchemaToHtml" if="eclipse.running">
-		<property name="dest" value="reference/extension-points" />
-		<record name="${basedir}/temp.convert.txt" action="start" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.rse.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.rse.services/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.rse.subsystems.files.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.rse.subsystems.files.ftp/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.rse.ui/plugin.xml" destination="${dest}" />
-		<record name="${basedir}/temp.convert.txt" action="stop" />
-	</target>
-
-	<target name="getJavadocPath">
-		<available file="${java.home}/../bin/javadoc.exe" property="javadoc" value="${java.home}/../bin/javadoc.exe" />
-		<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
-		<available file="/usr/bin/javadoc" property="javadoc" value="/usr/bin/javadoc" />
-		<available file="/shared/tools/tm/jdk-1.5/bin/javadoc" property="javadoc" value="/shared/tools/tm/jdk-1.5/bin/javadoc" />
-	</target>
-
-	<target name="generateJavadoc" depends="getJavadocPath,extractLinks,computeClasspath" if="javadoc">
-		<property name="optionsFile" value="temp.options.txt" />
-		<copy file="options.txt" tofile="${optionsFile}" overwrite="true" />
-		
-		<condition property="argsListDelimiter" value=":">
-			<os family="unix" />
-		</condition>
-		<condition property="argsListDelimiter" value=";">
-			<os family="windows" />
-		</condition>
-
-		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
-		<replace file="${basedir}/${optionsFile}" token="@cp@" value="${javadoc.classpath}" />
-		<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${safeBaseLocation}" />
-		<replace file="${basedir}/${optionsFile}" token="@javadoc.link.location@" value="${javadoc.link.location}" />
-
-		<!--scrub isv plugin directories of any preexisting api doc content-->
-		<delete dir="reference/api" />
-		<mkdir dir="reference/api" />
-
-		<echo message="sep = ${argsListDelimiter}"/>
-		<echo message="javadoc = ${javadoc}"/>
-		<exec dir="." executable="${javadoc}" output="temp.bin.log" resultproperty="javadocResult">
-			<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
-		</exec>
-		<echo message="javadoc result = ${javadocResult}"/>
-	</target>
-
-</project>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/rse/doc/org.eclipse.rse.doc.isv/customBuildCallbacks.xml b/rse/doc/org.eclipse.rse.doc.isv/customBuildCallbacks.xml
deleted file mode 100644
index 0679e29fc..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/customBuildCallbacks.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2007 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-		<ant antfile="buildDoc.xml" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<!--
-	<target name="pre.compileTarget.jar">
-	</target>
-	-->
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after compilation but before jaring					   -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<!--
-	<target name="post.compile.compileTarget.jar">
-	</target>
-	-->
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<!--
-	<target name="post.compileTarget.jar">
-	</target>
-	-->
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   base.dir - root of the project                                      -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   base.dir - root of the project                                      -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">        
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">       
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">              
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">             
-	</target>
-</project>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html b/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html
deleted file mode 100755
index 9e692f537..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/Artifacts.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-<title>RSE Artifacts</title>
-</head>
-
-<body>
-<h1>Remote System Explorer Artifacts</h1>
-<p>With the RSE, you can create and manipulate the following artifacts, which we introduce here:</p>
-<ul>
-<li><A href="#Hosts">Hosts</A></li>
-<li><A href="#profiles">Profiles</A></li>
-<li><A href="#subsystems">Subsystems, created from subsystem configurations</A></li>
-<li><A href="#connectorservices">Connector Services, managed by connector service managers</A></li>
-<li><A href="#filters">Filters and filter strings</A></li>
-<li><A href="#filterpools">Filter pools</A></li>
-<li><A href="#Preferences">Preferences</A></li>
-<li><A href="#Registry">System Registry</A></li>
-</ul>
-<p>All the classes and interfaces mentioned here are defined in the <samp>org.eclipse.rse.core</samp> plugin.
-
-<h2><A name="Hosts">Hosts</A></h2>
-<p>
-The RSE's <A href="view_RS.gif">Remote Systems view</A> shows all existing <b>Hosts</b> to remote systems.
-Hosts are objects that are persisted, containing the information needed to access a particular remote host.
-The view contains a prompt to create new Hosts, and pop-up menu actions to rename, copy, delete, and reorder existing Hosts.
-</p>
-<p>
-Hosts contain attributes, or data, that is saved between sessions of the workbench. These attributes are
-the host name, the remote system's host name and system type, an optional description, and a user Id that is
-used by default by each subordinate subsystem, at host time.
-Underneath, all Hosts are stored in profiles by an registered persistence provider.
-</p>
-
-<h2><A name="profiles">Profiles</A></h2>
-<p>
-To facilitate sharing Hosts are owned by <b>Profiles</b>. 
-In 1.0 these were simply folders in the RemoteSystemsConnections
-project. With the introduction of persistence providers in 2.0, profiles 
-can now be persisted in multiple forms - including the 1.0 scheme.
-It is our intention to have RSE allow for the sharing of profiles by exporting to and importing from
-the file system or from projects in a future release.
-</p>
-<p> 
-Internally profiles are realized as
-SystemProfile objects, managed by the SystemProfileManager.
-For each profile there is also a SystemHostPool object
-created to manage the Hosts within that profile. There are menu actions for the
-user to create and manage profiles. The collective of all Hosts of all <b><I>active</I> profiles</b> are shown in the 
-Remote Systems view,
-and the user can easily decide which profiles are active using the <A href="preference_activeProfiles.gif">local pulldown menu</A> of the Remote Systems view.
-The list of profiles currently active is stored locally on each user's workstation, and not shared by teams.
-By default, there exists a profile named <code>Team</code>, and a profile with a name unique to this user. When the first
-host is created the user is asked to supply this unique name, which defaults to the hostname of their
-workstation. Whenever a new host is created, the user is prompted for an active profile to contain the new
-host. Both default profiles are active initially, so all Hosts from each are shown. There is a preferences
-setting to show the host names qualified by their profile name.
-</p>
-<!-- TODO
-<p>
-After synchronizing the RemoteSystemsConnections
-project with a team repository, using the RSE <A href="plugin/view_Team.gif">team view</A>, all profiles of all members of
-the team will exist in the user's workspace, and hence
-all the Hosts created by all the team members. However, only the two default profiles are active, so the Hosts
-in the other profiles are not seen unless the user explicitly makes another profile active. This design allows
-for:
-</p>
-<ol>
-<li>Team-shared Hosts (created in the Team profile or any profile all team members make active)
-<li>User-private Hosts (created in their own profile or any profile not active by default)
-<li>User-roaming, whereby a user uses a different workstation than usual, 
-and then synchronizes with the team repository and sets their profile to be active.
-</ol>
--->
-<!-- TODO rework
-As an aside, user IDs and passwords are not shared with the team repository, but rather stored only locally per
-workstation.
--->
-
-<h2><A name="subsystems">Subsystems and subsystem configurations</A></h2>
-<p>
-When you expand a host, any tools registered with the Remote System Explorer are shown under the host.
-These tools are referred to as <b>subsystems</b>. The tool provider registers a <b>subsystem configuration</b>
-class via an RSE <A href="plugin/subsystem.html">extension point</A>, and whenever a new host is created, the configuration
-is asked to create a new subsystem object for that host. This subsystem is responsible for communicating with the remote host, and
-exposing artifacts and actions for working with remote resources. The subsystem configuration can elect not to
-supply a subsystem for a given host if it does not support the system type of that host
-</p>
-<p>
-RSE supplies two subsystem configurations that supply common subsystems for all Hosts:
-<ol>
-<li>Files. The subsystems created by this factory access the folders and files of the remote system,
-and allow users to explore and manipulate those folders and files. Editing support for remote source files is also included. For programmers, the subsystems also supply common APIs and user interface actions, wizards,
-dialogs, and widgets for easy access to the remote file system for a given host. These APIs are
-typically used when coding actions that appear in the pop-up menu for selected remote objects, but might
-also be of value when writing any view, editor, or action that needs access to a remote file system.
-<li>Commands. The subsystems created by this factory access the command shell of the remote system and
-allow users to predefine commands, and subsequently run them remotely. The commands subsystems are hidden
-subsystems, not shown when you expand the host. However, they are used by any code needing to run
-remote commands. There is also a Remote Shell view supplied that logs all commands and allows users to
-enter a command to be run remotely. The commands all execute within the same shell, and users
-can launch additional shells for the same host.
-</ol>
-<p>
-Each subsystem can have a unique user ID, which if not set is inherited from its host, 
-which in turn if not set is inherited from the
-user ID preferences setting for the appropriate system type.
-</p>
-<h2><A name="systems">Connector services and their managers</A></h2>
-<p>While not seen by the user, subsystem objects are required to return a <b>connectorservice</b> object via the
-<A href="../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html#getConnectorService()">getConnectorService()</A> method.
-A connectorService object is an object implementing the <A href="../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html">IConnectorService</A> interface.
-A connectorService object manages the live host to the remote system, and supports
-lifecycle methods for that host such as
-<A href="../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html#connect(org.eclipse.core.runtime.IProgressMonitor)">connect</A>,
-<A href="../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html#disconnect()">disconnect</A>, and
-<A href="../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html#isConnected()">isConnected</A>.
-The communication layer for that host is entirely the programmer's responsibility, and might use sockets, JDBC, HTTP or
-SOAP. It is up the provider of the subsystem factory to author their own communication layer; the framework
-only dictates the handful of methods in IConnectorService, that the RSE UI depends upon. The framework supplies a base
-system class that is easily extended.
-</p>
-<p>It may be the case that multiple subsystems, each from a different subsystem configuration, share the same live
-host for a given host object. To enable this, the framework supplies a base
-<b>connector service manager</b> <A href="../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">class</A>
-that can be used to manage a single shared connector service object across multiple subsystems. It uses a hashtable to store and
-return the connector service objects, keyed by a subsystem interface that all subsystems sharing the same connector service object
-are to implement. The subclass of the base connector service manager class supplies that interface. Further, the subclass
-must also implement the method for instantiating new instances of the connector service class, when no instance is found
-in the hashtable.
-</p>
-<p>
-It is possible to author a subsystem configuration whose subsystems simply use the same connector service object as that used by
-the RSE-supplied subsystems. You might do this if the subsystem configuration uses only the RSE-supplied APIs for
-accessing remote objects, in which case there is no need for a unique communication layer. By sharing the
-same connector service object, it prevents the user from being prompted to signon multiple times. To do this, simply access
-any RSE-supplied subsystem for a given host, and ask for its
-<A href="../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html#getConnectorServiceManager()">connector service manager</A>
-in your own subsystem's <A href="../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html#getConnectorServiceManager()">getConnectorServiceManager</A> method.
-</p>
-
-<h2><A name="filters">Filters</A></h2>
-<p>
-When a subsystem is expanded, users usually see <b>filters</b>. Since subsystems typically list remote artifacts,
-it is typical that a mechanism is needed to allow users to define which artifacts they wish to see, with some
-form of filtering criteria. Filters are this mechanism. The filter support is fully supplied by the RSE framework.
-A filter is simply a <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilter.html">ISystemFilter</A>
-object containing a name and a collection of <b>filter strings</b>. Filter strings are just strings, which
-the subsystem is required to interpret. When a user expands a filter, the owning subsystem is asked to resolve
-the filter strings within the filter. The subsystem typically interprets each filter string as some form of
-filtering pattern, and returns a list of remote artifacts matching one or more of the filter string patterns in
-the filter. For example, file subsystems expect each filter string to represent a folder, and a file name pattern. Then, all files in the folder, matching the name pattern, are returned. The subsystem supplies the user interface the
-you use to create and change filter strings, so it is responsible for defining what the filter strings
-look like and for subsequently resolving those filter strings on a filter expansion. A default user interface for
-the filter string prompt is supplied, but it is a simple entry field.
-</p>
-<p>
-It is possible to author a subsystem that does not support filters, if this is desired.
-</p>
-
-<h2><A name="filterpools">Filter Pools</A></h2>
-<p>
-Subsystems do not actually "own" filters. Since each host has unique subsystems, if each subsystem owned its
-own filters then filters could not be shared across Hosts, which is sometimes desirable. Instead, filters are
-actually contained within <b>filter pools</b>. Filter pools are simply
-<A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPool.html">ISystemFilterPool</A>
-objects which have a name and a collection of filters.
-Filter pools are owned by subsystem configurations, per profile. That is, each subsystem configuration will contain filter pools
-scoped by profile. Each such configuration plus profile grouping is known internally as a
-<A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolManager.html">filter pool manager</A>.
-Subsystems contain <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">references</A>
-to filter pools. By default, each subsystem configuration automatically creates one filter pool
-for each profile, named the "xxx Filter Pool", where "xxx" is the name of the profile. Subsystems contain references to
-filter pools, so that as the filters in the pool are created, changed, deleted or re-ordered, those changes are automatically
-reflected in every subsystem (and hence host) that references that filter pool. By default, subsystems are given a
-reference to the default filter pool in their host's profile (for their parent subsystem configuration, so file filters
-are not used in command subsystems, for example).
-</p>
-<p>
-By default, users do not see filter pools. Instead, filters are created in the default filter pool referenced by this subsystem.
-As a result, users will see the same list of filters for every host. However, users can use a preference setting to see
-filter pools. In this case, when a subsystem is expanded, the users see the filter pools referenced by this subsystem.
-Only then when a filter pool is expanded will the user see the filters within that filter pool. In this mode, users also
-see new actions to create filter pools and to add and remove references to filter pools within a subsystem. Whenever filters
-are changed by the user, this change is reflected in all subsystems that reference the parent filter pool. This design
-of filter pools owned by profiles, and subsystems that reference filter pools, facilitates filter sharing:
-<ol>
-<li>Users can share filters across Hosts, by adding references to their parent filter pool in various subsystems.<li>Users can have filters unique to a host, by placing them in a filter pool not referenced by other subsystems.
-<li>Users can have both shared and host-unique filters in a single host, by having both shared and private references
-to filter pools.<li>Teams can share filters by asking each user to add a reference to the same filter pool in their Hosts. For example,
-this is the default case for the default filter pool.
-<li>Users can create filters that are not shared by the team, by creating their own filter pools and not asking others to
-reference it.
-</ol>
-</p>
-<h2><A name="preferences">Preferences</A></h2>
-<p>
-Many of the default characteristics of the Remote System Explorer view and perspective are configurable by each user
-by way of the <A href="preferences.gif">Remote Systems node</A> of the <b>Preferences</b> window, accessible from the Window pull-down of the main menu.
-Furthermore, many of these preferences are directly accessible from the <A
-	href="view_pulldown.gif">pull-down menu of the title bar for the Remote
-Systems view</A>. These preferences, like all preferences, are unique to each user and not shared by the team, although they can
-be exported and imported.
-</p>
-
-<h2><A name="Registry">System Registry</A></h2>
-<p>The programmatic front door to all the artifacts in the RSE is the
-<b>System Registry</b>, which is an object implementing
-<A href="../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html">ISystemRegistry</A>.
-This is a singleton object that you
-can access by calling the static method
-<A href="../reference/api/org/eclipse/rse/core/model/SystemStartHere.html#getSystemRegistry()">getSystemRegistry()</A> in the
-<A href="../reference/api/org/eclipse/rse/core/model/SystemStartHere.html">SystemStartHere</A>
-class in the <samp>org.eclipse.rse.core</samp> plugin.
-</p>
-
-<p>A UI-enabled extension of the system registry is available through the
-<A href="../reference/api/org/eclipse/rse/ui/model/ISystemRegistryUI.html">ISystemRegistryUI</A> interface.
-This interface is available by calling the static method
-<A href="../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html#getTheSystemRegistryUI()">getTheSystemRegistryUI()</A> in the
-<A href="../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html">RSEUIPlugin</A>
-class in the <samp>org.eclipse.rse.ui</samp> plugin.
-</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html b/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html
deleted file mode 100755
index 41377c7af..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/Extensions.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<!-- David Dykstal (IBM) - [] remove unintended duplication from the list of extension points -->
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-<title>Remote System Explorer Extension Points</title>
-</head>
-
-<body>
-<h1>Remote System Explorer Extension Points</h1>
-
-<p>
-This product is built on the Eclipse platform 
-(<A href="http://www.eclipse.org">www.eclipse.org</A>)
-and so it offers all the
-capabilities of Eclipse. This includes the ability to create new Eclipse plug-ins to contribute
-additional functions to Eclipse. You can write plug-ins using Java, using Eclipse itself,
-with the Plug-in Development Environment (PDE) perspective. Plug-ins contain a file named <code>plugin.xml</code> that
-registers their functions. All such functions are created by use of <b>extension points</b>.
-These are either supplied by Eclipse or by other plug-ins. The plugin.xml file describes which extension
-points are being exploited by each plug-in, and for each identifies the Java class that supplies the
-additional functions. Each extension point identifies a Java interface (or base class) that
-classes exploiting the extension point must implement (or extend).
-</p>
-<p>
-There are many Eclipse-supplied extension points described in
-this documentation. In addition to the Eclipse extension points, there
-are unique Remote System Explorer extension points that enable you to contribute property pages and
-pop-up menu actions to remote objects within the Remote Systems view, among other things. The base Eclipse extension
-points are not sufficient for these, as they do not allow scoping of those property pages and
-actions such that they only appear for certain remote objects meeting specific filtering criteria.
-</p>
-
-<p>
-Listed below are the most common extension points defined by the Remote System Explorer.
-They are further described in the reference section along with others that are more special-purpose.
-The ones listed here are specifically designed to make
-it easy to contribute functions to the pop-up menus of remote objects displayed in the Remote
-Systems view. These extension points are defined by the
-<strong>org.eclipse.rse.core</strong> and <strong>org.eclipse.rse.ui</strong> plugins.
-</p>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Extension Point</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><A href="plugin/systemtype.html">org.eclipse.rse.core.systemTypes</A></TD>
-			<TD>For defining new system types that show up in the New Connection wizard.</TD>
-		</TR>
-		<TR>
-			<TD><A href="plugin/subsystem.html">org.eclipse.rse.core.subsystemConfigurations</A></TD>
-			<TD>For defining new subsystems that appear when a connection is expanded.</TD>
-		</TR>
-		<TR>
-			<TD><A href="../reference/extension-points/org_eclipse_rse_services_archivehandlers.html">org.eclipse.rse.services.archivehandlers</A></TD>
-			<TD>For supporting additional archive file types, such as is done today for zip, jar and tar files. This adds support for expanding the archives and supporting all the usual actions on the contents.</TD>
-		</TR>
-		<TR>
-			<TD><A href="plugin/popup.html">org.eclipse.ui.popupMenus</A></TD>
-			<TD>For	defining actions, which appear in the pop-up menu of remote objects
-			listed in the Remote Systems view.</TD>
-		</TR>
-		<TR>
-			<TD><A href="plugin/propertypage.html">org.eclipse.ui.propertyPages</A></TD>
-			<TD>For defining property pages, which appear in the Properties dialog when
-			users select the Properties action from the pop-up menu of remote
-			objects listed in the Remote Systems view.</TD>
-		</TR>
-		<!-- TODODeferred after RSE 1.0
-		<TR>
-			<TD><A href="../reference/extension-points/org_eclipse_rse_ui_compile.html">org.eclipse.rse.ui.<b>compile</b></A></TD>
-			<TD>For contributing compile commands to the Compile menus and Work With Compile Commands dialog.</TD>
-		</TR>
-		-->
-	</TBODY>
-</TABLE>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/Model.html b/rse/doc/org.eclipse.rse.doc.isv/guide/Model.html
deleted file mode 100755
index 4fd3de51c..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/Model.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<title>RSE Model</title>
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body>
-<h1>Remote System Explorer Model</h1>
-<p>The underlying containment model for the RSE static artifacts is shown here.</p>
-<p><img ref="ModelRSE.gif" src="ModelRSE.png"></p>
-		<p>At runtime, the model takes a slightly different form:</p>
-		<ul>
-<li>
-<A href="../reference/api/org/eclipse/rse/core/model/ISystemProfile.html">Profiles</A> are managed by a 
-<A href="../reference/api/org/eclipse/rse/core/model/ISystemProfileManager.html">profile manager</A>, and contain:
-</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/model/ISystemHostPool.html">Host Pools</A>, one per profile, which contain</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/model/IHost.html">Hosts</A></li>
-</ul>
-<li><A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPool.html">Filter pools</A>, keyed by Subsystem Configuration, and managed by a <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolManager.html">filter pool manager</A>
-which contain</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilter.html">Filters</A>, which contain</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterString.html">Filter strings</A></li>
-</ul>
-</ul>
-<!--
-<li><A href="../reference/api/org/eclipse/rse/ui/uda/ISystemUDActionElement.html">User actions</A>, keyed by Subsystem Configuration, which contain</li>
-<ul>
-<li><i>References</i> to <A href="../reference/api/org/eclipse/rse/ui/uda/ISystemUDTypeElement.html">named types</A></li>
-</ul>
-<li><A href="../reference/api/org/eclipse/rse/ui/compile/SystemCompileCommand.html">Compile commands</A></li>
--->
-</ul>
-<li><A href="../reference/api/org/eclipse/rse/core/subsystems/SubSystemConfiguration.html">Subsystem Configurations</A> contain:</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html">Subsystems</A>, keyed by host, which contain</li>
-<ul>
-<li><i><A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">References</A></i>
-to <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPool.html">filter pools</A>, which are managed by <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolManager.html">filter pool managers</A></li>
-</ul>
-<!--
-<li><A href="../reference/api/org/eclipse/rse/ui/uda/SystemUDTypeElement.html">Named types</A></li>
--->
-</ul>
-</ul>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/ModelRSE.png b/rse/doc/org.eclipse.rse.doc.isv/guide/ModelRSE.png
deleted file mode 100755
index d079e6e26..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/ModelRSE.png
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/actions/uiActionsAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/actions/uiActionsAPI.html
deleted file mode 100755
index 7bb76c000..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/actions/uiActionsAPI.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Actions API</title>
-<STYLE type="text/css">
-<!--
-TH {
-	background-color: #e5e5e5
-}
--->
-</STYLE>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Actions API</h1>
-<p>In Eclipse, we typically launch our dialogs and wizards and menu items from an action, which is
-a class that implements the JFace <samp>IAction</samp> interface. The Remote System Explorer offers classes to
-help simplify the creation of action classes, especially when used together with the RSE classes for
-<a href="../dialogs/uiDialogsAPI.html">dialogs</a> and <a href="../wizards/uiWizardsAPI.html">wizards</a>.
-</p>
-<p>There are two ways the Remote System Explorer API set can help you when it comes to actions:
-<ol>
-<li>A set of base action classes from which to base your own action classes.
-<li>A set of re-usable actions for specific requirements.
-</ol>
-</p>
-
-<h2>RSE-Supplied Base Classes for Actions</h2>
-<p>Here are the primary base classes the RSE supplies for actions, all of which are found in the
-package <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/package-summary.html">org.eclipse.rse.ui.actions</A></samp>
-in the plugin <samp>org.eclipse.rse.ui</samp>:</p>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html">SystemBaseAction</A></samp></TD>
-			<TD>This is the base action class for the other classes, and is only used directly for actions that do not
-			result in a dialog or wizard being presented to the user. It extends the JFace <samp>Action</samp> class,
-			adding to it support for properties such as the current shell and viewer and selection, as well as
-			overridable methods for easily enabling/disabling the action based on the selection, and a method for
-			setting the context help for the action. There are many other useful methods, such
-			as <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html#allowOnMultipleSelection(boolean)">allowOnMultipleSelection(boolean)</A></samp>
-			and <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html#setContextMenuGroup(java.lang.String)">setContextMenuGroup(String)</A></samp>, to
-			simplify when the action is enabled and where it appears in a popup menu.
-            </TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.html">SystemBaseSubMenuAction</A></samp></TD>
-			<TD>This base action class extends <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html">SystemBaseAction</A></samp>, and is used as the parent class when
-			for popup menu actions that are to cascade. A cascading menu is itself another menu, really, containing actions just like the primary
-			menu does. So, to create a cascading menu action, you simply subclass this class and override the method
-			<samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.html#populateSubMenu(org.eclipse.jface.action.IMenuManager)">populateSubMenu</A></samp>, where
-			you add all the actions to show in this cascading menu. And yes, one or more of those can themselves be cascading. The RSE views will
-			automatically call the method <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.html#getSubMenu()">getSubMenu</A></samp> when populating the initial popup menu, but your own views will need to do this.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseDialogAction.html">SystemBaseDialogAction</A></samp></TD>
-			<TD>This base action class extends <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html">SystemBaseAction</A></samp>, and is used when the action presents the
-			user with a dialog, preferably a dialog that extends the RSE
-			<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</A></samp> class. To use this class, subclass it and override the methods </TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseWizardAction.html">SystemBaseWizardAction</A></samp></TD>
-			<TD>This base action class extends <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html">SystemBaseAction</A></samp>, and is used when the action presents the
-			user with a wizard, preferably a wizard that extends the RSE <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html">AbstractSystemWizard</A></samp> class.</TD>
-		</TR>
-
-	</TBODY>
-</TABLE>
-
-<h2>Actions Pre-Supplied by RSE</h2>
-<p>You may find some of the actions supplied by the RSE to be immediately re-usable in your own code, saving some
-development and test effort.
-All these actions can be found in package
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/package-summary.html">org.eclipse.rse.ui.actions</A></samp>.
-Further, you can find many useful actions related to the selection of remote files or folders, in package
-<samp><A href="../../../reference/api/org/eclipse/rse/files/ui/actions/package-summary.html">org.eclipse.rse.files.ui.actions</A></samp>.
-</p>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/browseFolderDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/browseFolderDialog.gif
deleted file mode 100755
index 07af5fc43..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/browseFolderDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/deleteDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/deleteDialog.gif
deleted file mode 100755
index 2119a5357..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/deleteDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/dialogSample.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/dialogSample.html
deleted file mode 100755
index 05d6a717f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/dialogSample.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" CHARSET="UTF-8" TYPE="text/css">
-<title>RSE Validator Sample One</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Dialog Sample</h1>
-<p>This is an example of a sample<A href="sampleDlg.gif"> dialog</A> written on top of the RSE base dialog class, and with
-typical full error checking.
-<pre>
-
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.events.*;
-
-import org.eclipse.rse.samples.*;
-
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.*;
-import org.eclipse.rse.ui.widgets.*;
-import org.eclipse.rse.ui.messages.*;
-import org.eclipse.rse.ui.validators.*;
-
-/**
- * <I>A simple example of using the SystemPromptDialog class as the basis for a new dialog</I>.
- */
-public class <B>SampleDialog</B> extends SystemPromptDialog
-{
-	// <I>gui widgets</I>
-	private SystemHistoryCombo namePrompt;
-	private Text yearPrompt, monthPrompt, dayPrompt;
-	// <I>input</I>
-	private SampleCustomer inpCust;
-	// <I>validators</I>
-	private ISystemValidator nameValidator, yearValidator, monthValidator, dayValidator;
-	// <I>message</I>
-	private SystemMessage errorMessage;
-
-	/**
-	 * <I>Constructor for SampleDialog</I>.
-	 */
-	public <B>SampleDialog</B>(Shell shell)
-	{
-		super(shell, SamplesPlugin.getString(&quot;org.eclipse.rse.samples.ui.dialogs.dialog1.title&quot;));
-		setHelp(SamplesPlugin.HELPPREFIX + &quot;dlg11000&quot;);
-		nameValidator = new <A href="../validators/validatorSample1.html">SampleNameValidator</A>();
-		yearValidator = new <A href="../validators/validatorSample2.html">SampleBirthYearValidator</A>();
-		monthValidator = new <A href="../validators/validatorSample3.html">SampleBirthMonthValidator</A>();
-		dayValidator = new <A href="../validators/validatorSample4.html">SampleBirthDayValidator</A>();
-	}
-
-	/**
-	 * <I>Required parent override.</I>
-	 * <I>This is where we populate the client area</I>
-	 */
-	protected Control <B>createInner</B>(Composite parent)
-	{
-		int nbrColumns = 2;
-		Composite parentComposite = SystemWidgetHelpers.createComposite(parent, nbrColumns);
-
-		// <I>add gui widgets</I>...				
-		SystemWidgetHelpers.createLabel(parentComposite, SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.name.&quot;);
-		boolean readonly = false;
-		namePrompt = SystemWidgetHelpers.createHistoryCombo(parentComposite, null, &quot;name.history.key&quot;, readonly,
-		                 SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.name.tooltip&quot;);
-		
-		addSeparatorLine(parentComposite, nbrColumns);
-		boolean wantBorder = false;
-		SystemWidgetHelpers.createLabel(parentComposite, SamplesPlugin.getResourceBundle(),
-		      &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.birthday.verbiage.&quot;, nbrColumns, wantBorder);
-		
-		yearPrompt = SystemWidgetHelpers.createLabeledTextField(parentComposite, null,
-		                 SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.birthday.year.&quot;);
-		monthPrompt = SystemWidgetHelpers.createLabeledTextField(parentComposite, null,
-		                 SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.birthday.month.&quot;);
-		dayPrompt = SystemWidgetHelpers.createLabeledTextField(parentComposite, null,
-		                 SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.birthday.day.&quot;);
-		
-		// <I>if given an existing object, prefill it</I>...
-		inpCust = (SampleCustomer)getInputObject();
-		if (inpCust != null)
-		{
-			namePrompt.setText(inpCust.getName());
-			yearPrompt.setText(inpCust.getYear());
-			monthPrompt.setText(inpCust.getMonth());
-			dayPrompt.setText(inpCust.getDay());
-		}
-		
-		
-		// <I>add modify listeners</I>...	
-	        namePrompt.addModifyListener( new ModifyListener()
-	        {
-	      	   public void modifyText(ModifyEvent event)
-	      	   {
-	      	 	if (validateName())
-	      	 	  validate(namePrompt.getCombo());
-	      	   }
-	        } );
-	        yearPrompt.addModifyListener( new ModifyListener()
-	        {
-	      	   public void modifyText(ModifyEvent event)
-	      	   {
-	      	 	if (validateYear())
-	      	 	  validate(yearPrompt);
-	      	   }
-	        } );
-	        monthPrompt.addModifyListener( new ModifyListener()
-	        {
-	      	   public void modifyText(ModifyEvent event)
-	      	   {
-	      	 	if (validateMonth())
-	      	 	  validate(monthPrompt);
-	      	   }
-	        } );
-	        dayPrompt.addModifyListener( new ModifyListener()
-	        {
-	      	   public void modifyText(ModifyEvent event)
-	      	   {
-	      	 	if (validateDay())
-	      	 	  validate(monthPrompt);
-	      	   }
-	        } );
-	    		
-		// <I>initialize enabled state</I>...
-		setPageComplete(isPageComplete());
-			
-		return parentComposite;
-	}
-
-	/**
-	 * <I>Required parent override</I>.
-	 * <I>This is where we return the first input control, to give it focus when the dialog appears</I>.
-	 */
-	protected Control <B>getInitialFocusControl</B>()
-	{
-		return namePrompt.getCombo();
-	}
-
-	/**
-	 * <I>Typical parent override</I>.
-	 * <I>This is where we get control when the user presses OK</I>.
-	 */
-	protected boolean <B>processOK</B>()
-	{
-		errorMessage = null;
-		Control controlInError = validate(null);		
-		if (controlInError != null)
-		  controlInError.setFocus();
-		else
-		{
-			SampleCustomer newCust = inpCust;
-			if (newCust == null)
-			  newCust = new SampleCustomer();
-			newCust.setName(namePrompt.getText().trim());
-			newCust.setYear(yearPrompt.getText().trim());
-			newCust.setMonth(monthPrompt.getText().trim());
-			newCust.setDay(dayPrompt.getText().trim());
-			setOutputObject(newCust);
-			
-			SystemMessage completionMsg = null;
-			if (inpCust == null)
-				completionMsg = SamplesPlugin.getPluginMessage(&quot;SPPD1010&quot;);
-		    else
-				completionMsg = SamplesPlugin.getPluginMessage(&quot;SPPD1011&quot;);
-			completionMsg.makeSubstitution(newCust.getName());
-		    SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), completionMsg);
-		    msgDlg.open();
-		}		
-		return isPageComplete();
-	}
-
-	// ---------------------	
-	// <I>Validation methods</I>...
-	// ---------------------
-	/**
-	 * <I>Do full validation of all entry fields, optionally skipping a given one</I>.
-	 * <I>@return first control that is found to contain errors. Can be used to set focus</I>.
-	 */
-	protected Control <B>validate</B>(Control controlToSkip)
-	{
-		Control controlInError = null;
-		
-		if ((controlToSkip != namePrompt.getCombo()) &amp;&amp; !validateName())
-		  controlInError = namePrompt.getCombo();
-		if ((controlInError==null) &amp;&amp; (controlToSkip != yearPrompt) &amp;&amp; !validateYear())
-		  controlInError = yearPrompt;
-		if ((controlInError==null) &amp;&amp; (controlToSkip != monthPrompt) &amp;&amp; !validateMonth())
-		  controlInError = monthPrompt;
-		if ((controlInError==null) &amp;&amp; (controlToSkip != dayPrompt) &amp;&amp; !validateDay())
-		  controlInError = dayPrompt;
-		
-		return controlInError;		
-	}
-	/**
-	 * <I>Validate the customer name prompt. We only ensure it is not-empty.</I>
-	 */
-	protected boolean <B>validateName</B>()
-	{
-		String input = namePrompt.getText().trim();
-		setErrorMessageAndPageCompletionStatus(nameValidator.validate(input));
-		return (errorMessage==null);
-	}
-	/**
-	 * <I>Validate the customer birth year prompt</I>.
-	 */
-	protected boolean <B>validateYear</B>()
-	{
-		String input = yearPrompt.getText().trim();
-		setErrorMessageAndPageCompletionStatus(yearValidator.validate(input));
-		return (errorMessage==null);
-	}
-	/**
-	 * <I>Validate the customer birth month prompt</I>.
-	 */
-	protected boolean <B>validateMonth</B>()
-	{
-		String input = monthPrompt.getText().trim();
-		setErrorMessageAndPageCompletionStatus(monthValidator.validate(input));
-		return (errorMessage==null);
-	}
-	/**
-	 * <I>Validate the customer birth day prompt</I>.
-	 */
-	protected boolean <B>validateDay</B>()
-	{
-		String input = dayPrompt.getText().trim();
-		setErrorMessageAndPageCompletionStatus(dayValidator.validate(input));
-		return (errorMessage==null);
-	}
-	
-	/**
-	 * <I>A convenience method that issues or clears the error message on the message line</I>,
-	 *  <I>and sets the page completion status</I>
-	 */
-	protected void <B>setErrorMessageAndPageCompletionStatus</B>(SystemMessage errorMessage)
-	{
-		this.errorMessage = errorMessage;
-		if (errorMessage == null)
-		  clearErrorMessage();
-		else
-		  setErrorMessage(errorMessage);
-		setPageComplete(isPageComplete());
-	}
-	/**
-	 * <I>Return true if the OK button can be enabled</I>.
-	 */
-	protected boolean <B>isPageComplete</B>()
-	{
-		return ((errorMessage == null) &amp;&amp;
-		        (namePrompt.getText().trim().length()&gt;0) &amp;&amp;
-		        (yearPrompt.getText().trim().length()&gt;0) &amp;&amp;
-		        (monthPrompt.getText().trim().length()&gt;0) &amp;&amp;
-		        (dayPrompt.getText().trim().length()&gt;0));
-	}	
-}</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/renameManyDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/renameManyDialog.gif
deleted file mode 100755
index cfeb0c6cd..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/renameManyDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/renameOneDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/renameOneDialog.gif
deleted file mode 100755
index cc6256c23..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/renameOneDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/sampleDlg.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/sampleDlg.gif
deleted file mode 100755
index 0d55573b3..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/sampleDlg.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/selectTypesDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/selectTypesDialog.gif
deleted file mode 100755
index be5361af4..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/selectTypesDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/simpleSelectDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/simpleSelectDialog.gif
deleted file mode 100755
index b9bfca608..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/simpleSelectDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/uiDialogsAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/uiDialogsAPI.html
deleted file mode 100755
index 2a4725238..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/dialogs/uiDialogsAPI.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Dialogs API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Dialogs API</h1>
-<p>There are two ways the Remote System Explorer API set can help you when it comes to dialogs:
-<ol>
-<li>A base dialog class from which to base your own dialog classes.
-<li>A set of re-usable dialogs for specific requirements.
-</ol>
-</p>
-
-<h2>RSE-Supplied Base Class for Dialogs</h2>
-<p>Dialogs are secondary windows that prompt the user for information or display information to the user. They are typically
-<i>modal</i>, meaning the rest of the application (in this case eclipse) is disabled while the dialog is showing.
-Eclipse supplies a raw dialog class in SWT, as well as more robust dialog class in JFace. The RSE supplies its own
-class,
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</A></samp>
-in package
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/package-summary.html">org.eclipse.rse.ui.dialogs</A></samp>
-, that extends
-the JFace dialog class and adds to it the following capabilities inherited by all classes which extend it:
-</p>
-<ul>
-<li>Support for an optional visual message line at the bottom, on which messages can be displayed to the user. These can be either
-<samp>SystemMessage</samp> objects, or simple string messages. <samp><A
-		href="../messages/uiMessageAPI.html#SystemMessage">SystemMessage</A></samp> objects are preferred, as using these enables a button
-beside the message line which users can press to see the details for the message. This is supported via the <samp><A
-		href="../messages/uiMessageAPI.html#ISystemMessageLine">ISystemMessageLine</A></samp>
-interface, and so offers a consistent programming interface with the RSE property page and wizard page classes.
-<li>Support of automatic assignment of mnemonics for input-capable widgets such as buttons. This saves tremendous development
-effort if your user interface is translated as the assignment of unique mnemonics can be difficult after translation.
-<li>Built-in support for a number of typical push buttons at the bottom of the dialog: OK, Cancel, Browse, Test, Add and
-Details. You control via setters which buttons to show, and you can affect their label and tooltip text, although the
-default labels and tips are already translated for you. To program what happens when pressed, override the appropriate
-<samp>processXXX()</samp> method, such as <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#processOK()">processOK()</A></samp>. By default, you get OK and Cancel buttons.
-<li>Support for an optional built-in progress monitor at the bottom of the dialog, just like what eclipse offers for wizards.
-<li>Support of a simple <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#wasCancelled()">wasCancelled()</A></samp> method to easily test if the dialog was cancelled or not.
-<li>Support for methods to set an input object, and retrieving an output object, making it easy to pass in data and
-get back data. Your calling code sets the input object, your subclass code sets the output object (typically in
-its <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#processOK()">processOK()</A></samp> method) and your calling code gets the output object,
-if <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#wasCancelled()">wasCancelled()</A></samp> returns false.
-<li>Support of a <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setPageComplete(boolean)">setPageComplete(boolean)</A></samp> method, consistent with wizard pages, to enable/disable the OK button.
-This is typically called by your keystroke and button validators. That is, if an error is detected as input is entered, a message
-is issued to the message line and the OK button is disabled.
-<li>Support of a simple <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setHelp(java.lang.String)">setHelp(String helpId)</A></samp> method to set the dialog's popup help.
-<li>A simple way to toggle the cursor between busy and normal, using
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setBusyCursor(boolean)">setBusyCursor(boolean)</A></samp>
-<li>Helper methods for adding <A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#addFillerLine(org.eclipse.swt.widgets.Composite, int)">filler lines</A>
-and <A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#addSeparatorLine(org.eclipse.swt.widgets.Composite, int)">separator lines</A>.
-</ul>
-<p>To create your own dialog:</p>
-<ol>
-<li>Subclass <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</A></samp>, picking the appropriate constructor, the simplest
-of which simply requires the shell of the parent window and the title string for this dialog.
-<li>If buttons beyond OK and Cancel are desired, in your own constructor call the appropriate <samp>setShowXXXButton(true)</samp> methods to enable
-these buttons, and override the appropriate <samp>processXXX()</samp> methods to process these buttons when pressed by the user.
-<li>If a progress monitor is desired, in your own constructor call <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setNeedsProgressMonitor(boolean)">setNeedsProgressMonitor(true)</A></samp>. Later, to run
-a long-running operation that displays the progress monitor, use <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#getProgressMonitor()">getProgressMonitor()</A></samp>.
-<li>Override the <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#createInner(org.eclipse.swt.widgets.Composite)">createInner(Composite)</A></samp> method to populate the client area of the dialog with SWT widgets. Typically
-you create your composite with a GridLayout layout, populate it, and return it. To ease this programming burden, use the many
-static helper methods in <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemWidgetHelpers.html">SystemWidgetHelpers</A></samp>.
-<li>Override the <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#getInitialFocusControl()">getInitialFocusControl()</A></samp> method to supply the control to get initial focus when the dialog is displayed.
-<li>Override the <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#processOK()">processOK()</A></samp> method to supply the processing for when OK is pressed. You typically first validate
-the user input, and then return true if there are no errors found.
-<li>To allow the caller to get user-entered information out of the dialog, either supply getter methods,
-or call <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setOutputObject(java.lang.Object)">setOuputObject(Object)</A></samp>
-in your processOK logic so that your caller can code <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#getOutputObject()">getOutputObject()</A></samp>.
-</ol>
-<P>One of the more difficult efforts in building a dialog with multiple entry fields, is the code to do the validation of those entry fields. A common strategy is to add modify listeners to the entry fields, and for each one validate the data as it typed. If the validation fails, a message is issued. If the validation succeeds, then the other fields on the dialog are validated. At the end of the validation, the OK button is enabled or disabled depending on the error message status, and whether the required information has been supplied. The RSE can help with this effort, somewhat, through the use of re-usable <A
-	href="../validators/uiValidatorsAPI.html">validators</A> for various types of input.<BR>
-<BR>
-Follow this <A href="dialogSample.html">link</A> for an example of a fully-formed dialog class written on top of this RSE base class, complete with
-error checking.</P>
-
-<p>Typically, after creating your dialog, you will create an action to invoke it. The RSE can help with this too, via the
-supplied <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseDialogAction.html">SystemBaseDialogAction</A></samp> base class.
-
-<h2>Dialogs Pre-Supplied by RSE</h2>
-<p>You may find some of the dialogs supplied by the RSE to be immediately re-usable in your own code, saving some
-development and test effort. All these dialogs are in package <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/package-summary.html">org.eclipse.rse.ui.dialogs</A></samp>:
-</p>
-
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Class</TH>
-			<TH>Description</TH>
-			<TH>Sample</TH>
-			<TH>Action</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemRenameDialog.html">SystemRenameDialog</A></samp></TD>
-			<TD>Rename multiple items. Provides a table listing the old names and new names, which are editable. If your input objects
-			    do not adapt to <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp>
-			    or <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A></samp>,
-			    you should call <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemRenameDialog.html#setNameValidator(org.eclipse.rse.ui.validators.ISystemValidator)">setNameValidator</A></samp> to specify a validator that ensures the new name is correct, and your
-			    input objects should also either be IResource objects or implement
-			    <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/ISystemTypedObject.html">ISystemTypedObject</A></samp>.
-			</TD>
-			<TD align="center"><A href="renameManyDialog.gif">Sample image</A></TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemCommonRenameAction.html">SystemCommonRenameAction</A></samp></TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.html">SystemRenameSingleDialog</A></samp></TD>
-			<TD>Rename a single item. Provides a simple entry field for the new name. If your input object
-			    does not adapt to <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp> or
-			    <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A></samp>,
-			    you should call <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.html#setNameValidator(org.eclipse.rse.ui.validators.ISystemValidator)">setNameValidator</A></samp> to specify a validator that ensures the new name is correct, and your
-			    input object should also either be an IResource object or implement <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/ISystemTypedObject.html">ISystemTypedObject</A></samp>.
-			</TD>
-			<TD align="center"><A href="renameOneDialog.gif">Sample image</A></TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemCommonRenameAction.html">SystemCommonRenameAction</A></samp></TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.html">SystemDeleteDialog</A></samp></TD>
-			<TD>Confirm delete of one or more items. Provides a table listing the names of input objects. If your input objects
-			    do not adapt to <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp> or
-			    <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A></samp>,
-			    your input objects should either be IResource objects or implement <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/ISystemTypedObject.html">ISystemTypedObject</A></samp>.
-			</TD>
-			<TD align="center"><A href="deleteDialog.gif">Sample image</A></TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemCommonDeleteAction.html">SystemCommonDeleteAction</A></samp></TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.html">SystemSelectFileTypesDialog</A></samp></TD>
-			<TD>Presents a dialog listing all the file types defined in the eclipse File Associations preferences page, and
-			allows the user to select one or more of these types, or enter additional types not defined in eclipse.</TD>
-			<TD align="center"><A href="selectTypesDialog.gif">Sample image</A></TD>
-			<TD><samp></samp></TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.html">SystemSimpleSelectDialog</A></samp></TD>
-			<TD>Eclipse has a CheckboxTreeViewer that is designed to allow the user to select multiple items from a hierarchical model.
-			This is a nice viewer, but very difficult to program to, as you have to handle reflecting the state of the selected children
-			for each parent node yourself. This dialog makes that trivial. The trick is to create wrappers of your model objects using
-			<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemSimpleContentElement.html">SystemSimpleContentElement</A></samp>, maintaining the parent/child hierarchy, and pass the root element to the dialog. The rest is
-			done for you, and the result is the selected state set for those elements selected by the user. Note this can also be used
-			as a simple flat list checkbox selection dialog, just by passing a non-visible root with a flat list of children.</TD>
-			<TD align="center"><A href="simpleSelectDialog.gif">Sample image</A></TD>
-			<TD>None</TD>
-		</TR>
-
-	</TBODY>
-</TABLE>
-		<P><BR>While the dialogs can be instantiated directly, it is perhaps best to use them by instantiating their action class, and calling the run method on it.
-The action classes are all in <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/package-summary.html">org.eclipse.rse.ui.actions</A></samp> package.
-</P>
-		<p>In addition to these universal dialogs, there are dialogs specific to the predefined Files subsystem. These enable selection of remote files or folders. They can be found in the <a href="../../../reference/api/org/eclipse/rse/files/ui/dialogs/package-summary.html"><samp>org.eclipse.rse.files.ui.dialogs</samp></a> package.</p>
-		<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Class</TH>
-			<TH>Description</TH>
-			<TH>Sample</TH>
-			<TH>Action</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.html">SystemSelectRemoteFileOrFolderDialog</A></samp></TD>
-			<TD>Allows users to select a remote file, or folder (configurable) using a dialog similar to what is used in Eclipse for local file or
-			folder selection. Can be configured to allow user to select from any existing connection, or to be scoped to a particular connection,
-			or even a particular folder in a particular connection.
-			</TD>
-			<TD align="center"><A href="browseFolderDialog.gif">Sample image</A></TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFileAction.html">SystemSelectRemoteFileAction</A></samp> or
-			    <samp><A href="../../../reference/api/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.html">SystemSelectRemoteFolderAction</A></samp></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-		<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/logger/logPreferences.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/logger/logPreferences.gif
deleted file mode 100755
index 9d465a218..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/logger/logPreferences.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/logger/uiLoggerAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/logger/uiLoggerAPI.html
deleted file mode 100755
index 346a58651..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/logger/uiLoggerAPI.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Logger API</title>
-</head>
-
-<body>
-<h1>RSE Logger API</h1>
-<p>To log your messages to the workbench log file in <samp>.metadata\.log</samp>,
-either base your plugin class on the <samp>org.eclipse.rse.ui.SystemBasePlugin</samp> class and use
-the inherited logging methods, or instead of instantiating your own <samp>Logging</samp> object, re-use the
-RSE-supplied logging object by calling <samp>getDefault().getLog()</samp> in the <samp>org.eclipse.rse.ui.RSEUIPlugin</samp>
-class.
-</p>
-
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/massagers/uiMassagersAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/massagers/uiMassagersAPI.html
deleted file mode 100755
index 38216f1c0..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/massagers/uiMassagersAPI.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Massagers API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Massagers API</h1>
-<p>In addition to <a href="../validators/uiValidatorsAPI.html">validating</a> what a user types, we often need
-to transform it prior to saving. For example, we may need to fold it to uppercase or lowercase. The RSE abstracts
-and encapsulates this concept into massagers which can be re-used. A few are pre-supplied by RSE.
-</p>
-
-<h2>RSE Massager Interfaces</h2>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/ISystemMassager.html">ISystemMassager</A></samp> interface is in package
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/package-summary.html">org.eclipse.rse.ui</A></samp>.
-It is a very simple interface with one method:
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/ISystemMassager.html#massage(java.lang.String)">public String massage(String text)</A></samp>.
-Given input text, return the massaged text. While simple, by encapsulating this operation into an interface,
-you will be able to write re-usable dialogs that take a massager as input. Further, tricky massaging can be
-built as a re-usable object.
-</p>
-
-<h2>RSE-Supplied Massagers</h2>
-<p>The RSE supplies the following massagers in package <samp><A href="../../../reference/api/org/eclipse/rse/ui/package-summary.html">org.eclipse.rse.ui</A></samp>:
-</p>
-<BR>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Massager Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/MassagerFoldCase.html">MassagerFoldCase</A></samp></TD>
-			<TD>Simply folds the text to uppercase or lowercase</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/MassagerFoldCaseOutsideQuotes.html">MassagerFoldCaseOutsideQuotes</A></samp></TD>
-			<TD>Folds the text to uppercase or lowercase, except parts of the text that are surrounded by quotes or any given delimiter characters</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/MassagerFoldCaseUnlessQuoted.html">MassagerFoldCaseUnlessQuoted</A></samp></TD>
-			<TD>Folds the text to uppercase or lowercase, unless the whole text is surrounded by quotes or any given delimiter character</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgDialog.gif
deleted file mode 100755
index 7098dd018..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgLine_dialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgLine_dialog.gif
deleted file mode 100755
index 846ba78ae..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgLine_dialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgLine_properties.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgLine_properties.gif
deleted file mode 100755
index f293841e6..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgLine_properties.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgLine_wizard.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgLine_wizard.gif
deleted file mode 100755
index 9b9d58300..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgLine_wizard.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgSample_msgDlg.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgSample_msgDlg.gif
deleted file mode 100755
index 36829fe99..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgSample_msgDlg.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgSample_msgline.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgSample_msgline.gif
deleted file mode 100755
index 970377d5b..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/msgSample_msgline.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/sampleMessageFile.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/sampleMessageFile.html
deleted file mode 100755
index 5888bfc06..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/sampleMessageFile.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>Sample Message File</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Sample Message File</h1>
-<p>This is an example of a simple message file, say in <samp>sampleMessages.xml</samp>, which has defined messages for only a single component.
-<pre>
-
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE MessageFile SYSTEM "../org.eclipse.rse.ui/messageFile.dtd"&gt;
-&lt;!-- <I>This is an exammple of a message file used by SystemMessage and SystemMessageDialog</I> --&gt;
-&lt;MessageFile Version="1.0"&gt;
-     &lt;Component Name="Samples Plugin" Abbr="<B>SPP</B>"&gt;
-          &lt;Subcomponent Name="Dialogs" Abbr="<B>D</B>"&gt;
-                &lt;!-- Component 'D' for dialog sample messages --&gt;
-                &lt;MessageList&gt;
-<A name="SPPD1000"></A>                    &lt;Message ID="<B>1000</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;You must enter a name&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;You have left the customer name empty. Specify a name.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1001"></A>                    &lt;Message ID="<B>1001</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;You must enter a birth year&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;You have left the birth year empty. Specify a year.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1002"></A>                    &lt;Message ID="<B>1002</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;%1 is not a valid year&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The birth year specified is not within the valid range of %2 to %3.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1003"></A>                    &lt;Message ID="<B>1003</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;Year %1 is out of range&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The value you specified for the birth year is not a valid number.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1004"></A>                    &lt;Message ID="<B>1004</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;You must enter a birth month&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;You have left the birth month empty. Specify a month.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1005"></A>                    &lt;Message ID="<B>1005</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;%1 is not a valid month&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The value you specified for the birth month is not a valid number.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1006"></A>                    &lt;Message ID="<B>1006</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;Month %1 is out of range&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The birth month specified is not within the valid range of %2 to %3.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1007"></A>                    &lt;Message ID="<B>1007</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;You must enter a birth day&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;You have left the birth day empty. Specify a day.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1008"></A>                    &lt;Message ID="<B>1008</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;%1 is not a valid day&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The value you specified for the birth day is not a valid number.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1009"></A>                    &lt;Message ID="<B>1009</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;Day %1 is out of range&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The birth day specified is not within the valid range of %2 to %3.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1010"></A>                    &lt;Message ID="<B>1010</B>" Indicator="I"&gt;
-                          &lt;LevelOne&gt;Customer %1 created successfully. Re-run to see update mode.&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The customer was created. Re-running the same sample action will show the dialog in update mode.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1011"></A>                    &lt;Message ID="<B>1011</B>" Indicator="I"&gt;
-                          &lt;LevelOne&gt;Customer %1 updated successfully.&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;Congratulations!&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-                &lt;/MessageList&gt;
-          &lt;/Subcomponent&gt;
-     &lt;/Component&gt;
-&lt;/MessageFile&gt;
-</pre>
-
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessageAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessageAPI.html
deleted file mode 100755
index b0d252be7..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessageAPI.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Message API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Message API</h1>
-<p>To work with messages, which are defined in an xml <a href="uiMessageFile.html">message file</a>,
-you use:
-</p>
-<ul>
-<li>Static methods in the
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html">org.eclipse.rse.ui.SystemBasePlugin</A></samp>
-class to load the message file and extract messages from it.
-<li>Classes in the
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/package-summary.html">org.eclipse.rse.ui.messages</A></samp>
-package to do variable substitution, and display the messages to the user.
-</ul>
-
-<h2>Methods for Parsing the Message File</h2>
-<p>Once you have defined your message file, you must update your plugin class to load it at startup time.
-To do this, simply call the static method
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadMessageFile(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadMessageFile</a></samp>
-in the RSE-supplied <samp><a href="../plugin/uiPluginAPI.html">SystemBasePlugin</a></samp> class.
-<BR>
-<BR>
-After the message file is loaded into memory, you can extract messages from it by calling the static method
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getMessage(org.eclipse.rse.ui.messages.SystemMessageFile, java.lang.String)">getMessage</a></samp>
-from the same <samp><a href="../plugin/uiPluginAPI.html">SystemBasePlugin</a></samp> class.
-</p>
-
-<h2>Classes for Displaying Messages</h2>
-<p>The following classes are all defined in the <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/package-summary.html">org.eclipse.rse.ui.messages</a></samp> package. </p>
-
-<h3><A name="SystemMessageFile"></A>The <samp>SystemMessageFile</samp> Class</h3>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadMessageFile(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadMessageFile</a></samp> method in <samp>SystemBasePlugin</samp>, returns an instance of
-<samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessageFile.html">SystemMessageFile</a></samp>,
-representing the parsed message file. It is methods in this which return individual messages.
-<h3><A name="SystemMessage"></A>The <samp>SystemMessage</samp> Class</h3>
-The <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getMessage(org.eclipse.rse.ui.messages.SystemMessageFile, java.lang.String)">getMessage</a></samp> method in <samp>SystemBasePlugin</samp> returns an instance of
-<samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html">SystemMessage</a></samp>,
-representing an individual message from the message file.
-</p>
-<p>To do message <i>variable substitution</i>, call the appropriate overload of the <samp>makeSubstitution</samp> method in
-the <A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html">message</A> object, passing as many parameters as there are unique substitution variables in the message.
-</p>
-<p>To get the first level message text, call <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html#getLevelOneText()">getLevelOneText</a></samp> on the message object. To get
-the second level help, call <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html#getLevelTwoText()">getLevelTwoText</a></samp>.
-</p>
-
-<h3><A name="SystemMessageDialog"></A>The <samp>SystemMessageDialog</samp> Class</h3>
-<p>To display a message in a dialog, instantiate <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/SystemMessageDialog.html">SystemMessageDialog</a></samp>, passing
-in a parent shell and the message object, and then call the appropriate <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/SystemMessageDialog.html#open()">open</a></samp> method in the dialog object. Here is what the message
-dialog looks like, for a message of type Error (the type dictates the error icon):
-</p>
-<P><IMG border="0" src="msgDialog.gif" width="457" height="190"></P>
-
-<h3><A name="ISystemMessageLine"></A>The <samp>ISystemMessageLine</samp> Interface</h3>
-<p>If you are extending the RSE class <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</a></samp> for dialogs,
-or <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</a></samp> for wizard pages
-or <samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.html">SystemBasePropertyPage</a></samp> for property pages, you can display the message to the
-user by calling the <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html#setErrorMessage(org.eclipse.rse.ui.messages.SystemMessage)">setErrorMessage</a></samp> method all these classes support. These classes all implement
-the interface <b><samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html">ISystemMessageLine</a></samp></b>, which also includes the method <samp>clearErrorMessage</samp>. For non-error
-messages, use <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html#setMessage(org.eclipse.rse.ui.messages.SystemMessage)">setMessage</a></samp>
-and <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html#clearMessage()">clearMessage</a></samp>.</p>
-<p>
-Here is what a system message issued in a <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</a></samp> dialog looks like:</p>
-<P><IMG border="0" src="msgLine_dialog.gif" width="264" height="125"></P>
-<p>The user can select the question mark icon on the right to see the full message dialog, and hence access the second level help for the message.
-<p>Here is what a system message issued in an <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</a></samp> looks like:</p>
-<P><IMG border="0" src="msgLine_wizard.gif" width="439" height="98"></P>
-<p>If the user clicks the mouse on the message or icon, they will see the full message dialog for the message.</p>
-
-<p>Here is what a system message issued in a <samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.html">SystemBasePropertyPage</a></samp> looks like:</p>
-<P><IMG border="0" src="msgLine_properties.gif" width="491" height="75"></P>
-<p>Again, if the user clicks the mouse on the message or icon, they will see the full message dialog for the message.</p>
-
-<h2>Classes for Displaying Message Exceptions</h2>
-<p>The following class is defined in the <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/package-summary.html">org.eclipse.rse.services.clientserver.messages</a></samp> package.
-
-<h3>The <samp>SystemMessageDialog</samp> Class</h3>
-<p>Many of the RSE APIs throw <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessageException.html">org.eclipse.rse.services.clientserver.messages.SystemMessageException</a></samp>, which
-encapsulates a system message object. To get the encapsulated message, call <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessageException.html#getSystemMessage()">getSystemMessage()</a></samp>.
-To display the message in an RSE message dialog box, simply call <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessageException.html#displayMessage()">displayMessage()</a></samp> on the exception object.
-To get the first-level text, call <samp>getMessage()</samp>, or <samp>getSystemMessage().getLevelOneText()</samp>
-</p>
-
-<h1>Message Example</h1>
-<h2>Declaring the Messages</h2>
-<p>Declare the messages via the <samp>Message</samp> tag in a <a href="uiMessageFile.html">message file</a>, such as <samp>sampleMessages.xml</samp>
-<pre>&lt;?xml version=&quot;1.0&quot; encoding='UTF-8'?&gt;
-&lt;!DOCTYPE MessageFile SYSTEM &quot;../org.eclipse.rse.ui/messageFile.dtd&quot;&gt;
-&lt;!-- This is an exammple of a message file used by SystemMessage and SystemMessageDialog --&gt;
-&lt;MessageFile Version=&quot;1.0&quot;&gt;
-     &lt;Component Name=&quot;Samples Plugin&quot; Abbr=&quot;<B>SPP</B>&quot;&gt;
-          &lt;Subcomponent Name=&quot;Dialogs&quot; Abbr=&quot;<B>D</B>&quot;&gt;
-                &lt;!-- Component 'D' for dialog sample messages --&gt;
-                &lt;MessageList&gt;
-                    &lt;Message ID=&quot;<B>1003</B>&quot; Indicator=&quot;E&quot;&gt;
-                          &lt;LevelOne&gt;%1 is not a valid year&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The birth year specified is not within the valid range of %2 to %3.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-                    &lt;!-- <I>repeat Message elements as needed</I> --&gt;
-                &lt;/MessageList&gt;
-          &lt;/Subcomponent&gt;
-     &lt;/Component&gt;
-&lt;/MessageFile&gt;
-</pre>
-
-<h2>Processing the Message File</h2>
-In your plugin class, declare a message file static variable, load the message file in the constructor, and
-supply a static method for retrieving a message from the file.
-<pre>import org.eclipse.rse.ui.messages.*; // <I>for message file classes</I>
-import org.eclipse.rse.ui.*; // <I>for SystemBasePlugin</I>
-<B>...</B>
-private static SystemMessageFile messageFile = null;
-<B>...</B>
-messageFile = SystemBasePlugin.loadMessageFile(descriptor, &quot;sampleMessages.xml&quot;); // <I>in constructor</I>
-<B>...</B>
-
-/**
- * <I>Retrieve a message from this plugin's message file</I>
- * <I>@param msgId - the ID of the message to retrieve. This is the concatenation of the</I>
- *   <I>message's component abbreviation, subcomponent abbreviation, and message ID as declared</I>
- *   <I>in the message xml file.</I>
- */
-<A name="getPluginMessage"></A>public static SystemMessage <B>getPluginMessage</B>(String msgId)
-{
-    return SystemBasePlugin.getMessage(messageFile, msgId);
-}</pre>
-
-<h2>Retrieving the Message</h2>
-<pre>SystemMessage errorMessage = SamplesPlugin.getPluginMessage("SPPD1003");
-errorMessage.makeSubstitution(input, &quot;1900&quot;, &quot;2003&quot;);</pre>
-
-<h2>Displaying the Message</h2>
-<h3>On a Message Line</h3>
-<pre>setErrorMessage(errorMessage);</pre>
-
-<P><IMG border="0" src="msgSample_msgline.gif" width="227" height="208"></P>
-<h3>In a Message Dialog</h3>
-<pre>SystemMessageDialog msgDlg = new SystemMessageDialog(shell, errorMessage);</br>msgDlg.open(); // <I>to open with details not showing</I>
-//msgDlg.openWithDetails(); // <I>to open with details already showing</I> </pre>
-
-<P><IMG border="0" src="msgSample_msgDlg.gif" width="457" height="190"></P>
-<P><BR>
-</P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessageFile.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessageFile.html
deleted file mode 100755
index af83cab09..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessageFile.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Message File</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Message File</h1>
-<p>To exploit the message framework in RSE, you start by create an message file, named
-say <samp>mymessages.xml</samp>, which looks something like this:
-<pre>
-&lt;?xml version="1.0" encoding='UTF-8'?&gt;
-&lt;!-- This is a sample message file --&gt;
-&lt;MessageFile Version="1.0"&gt;
-     &lt;Component Name="ACME Tools" Abbr="ACME"&gt;
-          &lt;Subcomponent Name="General" Abbr="G"&gt;
-                &lt;MessageList&gt;
-                    &lt;Message ID="1001" Indicator="E"&gt;
-                          &lt;LevelOne&gt;You made a mistake&lt;/LevelOne&gt;
-                          &lt;LevelTwo&gt;Fix your mistake, then re-attempt the operation.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-                &lt;/MessageList&gt;
-          &lt;/Subcomponent&gt;
-     &lt;/Component&gt;
-&lt;/MessageFile&gt;
-</pre>
-
-<h2>RSE Message File Elements</h2>
-<p>Typically, this file is created in plugin project's root folder.</p>
-<p>The important elements in this file are:
-</p><TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Element</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD>MessageFile</TD>
-			<TD>The overall element for the file. There is only one of these tags.</TD>
-		</TR>
-		<TR>
-			<TD>Component</TD>
-			<TD>Identifies a course-grained component within your plugin. You can specify multiple component tags. It is up to you to decide<BR>how many components to divide your plugin into. The abbreviation (Abbr) of the component constitutes the first part of the message ID for messages defined in this component, aiding in servicing when an error message is reported.
-			</TD>
-		</TR>
-		<TR>
-			<TD>Subcomponent</TD>
-			<TD>Identifies a fine-grained subcomponent within a component. The abbreviation (Abbr) of the subcomponent is appended to the component's abbreviation when the message ID is created for messages in this subcomponent. It is up to you to decide how many subcomponents to divide your component into, and what to name them.</TD>
-		</TR>
-		<TR>
-			<TD>MessageList</TD>
-			<TD>Simply encapsulates the list of Message elements for this subcomponent.</TD>
-		</TR>
-		<TR>
-			<TD>Message</TD>
-			<TD>Defines a message. <BR>
-			The <b>ID</b> attribute can be anything you like, but following a naming or numbering convention is a good idea. The ID is appended to the component and subcomponent abbreviations to form the message ID the user will see. 
-			<BR>The <b>Indicator</b> attribute identifies the severity of the message: <b>I</b> for Information, <b>E</b> for Error, <b>W</b> for Warning, <b>U</b> for Unexpected, and <b>Q</b> for Question. This affects the icon that will be used for this message, and the buttons allowed on the message dialog.
-			</TD>
-		</TR>
-		<TR>
-			<TD>LevelOne</TD>
-			<TD>The first-level message the user will initially see. Use %n for substitution variables, where n is a positive integer incrementing up from 1.</TD>
-		</TR>
-		<TR>
-			<TD>LevelTwo</TD>
-			<TD>The second-level help for the message, the user will only see if they ask to see it. Use %n for substitution variables. Any variable used here and in the LevelOne text will be consistently substituted with the same value.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-<h2>RSE Message File Sample</h2>
-<p>This is a bigger <A href="sampleMessageFile.html">sample</A>.</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessagesCore.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessagesCore.html
deleted file mode 100755
index 1995258e5..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/messages/uiMessagesCore.html
+++ /dev/null
@@ -1,1338 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML> 
-<HEAD> 
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<TITLE> Message File systemmessages.xml </TITLE>
-<style type="text/css">
-h2 { background-color: #CCCCFF }
-</style>
-</HEAD> 
-<BODY>
-<H1>Remote System Explorer Messages</H1>
-<br>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Sub-Component Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%">
-<A href=#General>General</A></TD>
-<TD><b>Message prefix</b>=RSEG</TD></TR>
-<TR BGCOLOR="white">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%">
-<A href=#Other>Other</A></TD>
-<TD><b>Message prefix</b>=RSEO</TD></TR>
-<TR BGCOLOR="white">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%">
-<A href=#Files>Files</A></TD>
-<TD><b>Message prefix</b>=RSEF</TD></TR>
-<TR BGCOLOR="white">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%">
-<A href=#Communications>Communications</A></TD>
-<TD><b>Message prefix</b>=RSEC</TD></TR>
-</TABLE>
-<A NAME="General"><!-- --></A><H2>General Messages</H2>
-<H3>RSEG0402</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1 must be between %2 and %3.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1001</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Under construction<br>
-<b>LevelTwo: </b>This function is not yet available.<br>
-<H3>RSEG1002</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>This will reload the Remote System Explorer. Are you sure?<br>
-<b>LevelTwo: </b>This action should only be used after receiving files from a team repository. It reloads the RSE from the workspace, incorporating the new files.<br>
-<H3>RSEG1003</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>An unexpected exception has occurred<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEG1006</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter name<br>
-<b>LevelTwo: </b>You must enter a name in the field where the cursor is positioned.<br>
-<H3>RSEG1007</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name in use<br>
-<b>LevelTwo: </b>This name is already used by another resource. Enter a unique name.<br>
-<H3>RSEG1008</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name not valid<br>
-<b>LevelTwo: </b>The name entered does not have valid syntax<br>
-<H3>RSEG1009</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>You must rename %1<br>
-<b>LevelTwo: </b>You have left the new name the same as the old name. Enter a new name that is different from the old name.<br>
-<H3>RSEG1010</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name %1 is specified more than once<br>
-<b>LevelTwo: </b>Two or more resources have been renamed to the same new name. Each resource must have a unique name.<br>
-<H3>RSEG1011</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name %1 not valid<br>
-<b>LevelTwo: </b>The name %1 does not have valid syntax<br>
-<H3>RSEG1012</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter new name<br>
-<b>LevelTwo: </b>You have the new name entry field empty. You must enter a unique new name.<br>
-<H3>RSEG1013</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Expand failed or cancelled. Try again.<br>
-<b>LevelTwo: </b>When expanding a node in the tree, and retrieving the resources, either an error occurred or you cancelled the operation. The expand is cancelled.<br>
-<H3>RSEG1014</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter profile name<br>
-<b>LevelTwo: </b>You must enter a name for the profile. Profiles contain all connections, filters and user defined actions. They are shared by the team, but each team member sees only those profiles which are active. Each profile can be private to you, or used by the whole team if all team members make the profile active. The name should reflect this. That is, if the profile is to be private to you, pick a name that is least likely to collide with a name chosen by other team members.<br>
-<H3>RSEG1015</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Profile of that name already exists<br>
-<b>LevelTwo: </b>There is already a profile of that name. Choose a unique name for the profile.<br>
-<H3>RSEG1016</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Not a valid profile name<br>
-<b>LevelTwo: </b>Profiles are stored as folders in the file system, so profile names must be valid folder names for the workbench. Furthermore, they must not contain pound signs (#) or exceed 100 characters in length. Profile names are not case sensitive, but are case tolerant.<br>
-<H3>RSEG1017</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter number<br>
-<b>LevelTwo: </b>The value %1 you entered is not numeric. Enter only numeric input.<br>
-<H3>RSEG1018</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name not valid as folder name<br>
-<b>LevelTwo: </b>The name must be a valid folder name within the workbench and the underlying file system.<br>
-<H3>RSEG1019</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name not valid as file name<br>
-<b>LevelTwo: </b>The name must be a valid file name within the workbench and the underlying file system.<br>
-<H3>RSEG1020</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Please enter a valid system type.<br>
-<b>LevelTwo: </b>You must select a system type. The system type is the type of the operating system of the remote sytem.<br>
-<H3>RSEG1021</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Please enter a valid connection name.<br>
-<b>LevelTwo: </b>You must enter a connection name. This name is arbitrary, but must be unique to the selected profile.<br>
-<H3>RSEG1022</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connection name is not unique for the selected profile.<br>
-<b>LevelTwo: </b>Connection names must be unique to the profile that contains the connection. Specify a name not already in use.<br>
-<H3>RSEG1023</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Invalid connection name. Must be a valid folder name in the underlying file system.<br>
-<b>LevelTwo: </b>The connection name is not syntactically valid. The name must be a valid folder name within the workbench and the underlying file system.<br>
-<H3>RSEG1024</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter host name or IP address<br>
-<b>LevelTwo: </b>You must specify a host name or TCP/IP address for the remote system.<br>
-<H3>RSEG1025</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter user ID<br>
-<b>LevelTwo: </b>You must specify a user ID to be used to connect to the system.<br>
-<H3>RSEG1026</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Not a valid user ID<br>
-<b>LevelTwo: </b>The user ID entered is not syntactically valid. The only restriction for a user ID is that it not use the characters '=' or ';'.<br>
-<H3>RSEG1027</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter port number<br>
-<b>LevelTwo: </b>You must specify a port number that is used to connect with the server-side communication layer.<br>
-<H3>RSEG1028</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Not a valid port number<br>
-<b>LevelTwo: </b>The value you entered is not a valid port number. It must be a positive integer between 1 and 65536.<br>
-<H3>RSEG1029</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter value<br>
-<b>LevelTwo: </b>You must enter a value in the field where the cursor is.<br>
-<H3>RSEG1030</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Entry is not unique<br>
-<b>LevelTwo: </b>The value you entered is already in use. Specify a value that is not already in use.<br>
-<H3>RSEG1031</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Syntax is not valid<br>
-<b>LevelTwo: </b>The syntax of the value at the cursor position is not valid.<br>
-<H3>RSEG1032</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter path<br>
-<b>LevelTwo: </b>You must specify a file system path.<br>
-<H3>RSEG1033</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Path is not unique<br>
-<b>LevelTwo: </b>The path you specified is already in use.<br>
-<H3>RSEG1034</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Path syntax is not valid<br>
-<b>LevelTwo: </b>The syntax of the path you specified is not valid. Enter a file system path that is valid for the remote operating system.<br>
-<H3>RSEG1035</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter password<br>
-<b>LevelTwo: </b>You must specify your password.<br>
-<H3>RSEG1036</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Password has expired<br>
-<b>LevelTwo: </b>Your password has expired, and must be reset before continuing.<br>
-<H3>RSEG1037</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter filter pool name<br>
-<b>LevelTwo: </b>You must specify a name for your filter pool. Filter pool names are arbitrary, but typically reflect the contents of the filters, such as "Release 1" or "Accounts Payable".<br>
-<H3>RSEG1038</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter pool name already exists in this profile<br>
-<b>LevelTwo: </b>A filter pool with this name already exists in the profile.<br>
-<H3>RSEG1039</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter pool name not valid<br>
-<b>LevelTwo: </b>The filter pool name you specified is not a valid name. The name must be a valid folder name in the workbench, and must not contain the pound sign '#'. It must also not exceed 50 characters in length.<br>
-<H3>RSEG1040</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Profile name %1 is reserved<br>
-<b>LevelTwo: </b>The given profile name is reserved. Specify another name for the profile.<br>
-<H3>RSEG1041</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Connection of name %1 already exists in profile %2. Continue?<br>
-<b>LevelTwo: </b>A connection of this name exists in another profile. While this allowed, it is discouraged as it may lead to confusion. Press Yes to create the connection, or No to cancel the creation.<br>
-<H3>RSEG1042</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter filter name<br>
-<b>LevelTwo: </b>You must specify a name for your filter. You can specify any name you like. Choose a name that tells others the contents of this filter. For example, "Source Files for Release 1".<br>
-<H3>RSEG1043</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter name already exists in this filter pool<br>
-<b>LevelTwo: </b>The filter name you specified is in use. You must specify a name unique for the parent filter pool.<br>
-<H3>RSEG1044</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter name not valid<br>
-<b>LevelTwo: </b>The filter name you specified is not a valid name. The name must be a valid file name in the workbench, and must not contain the pound sign '#'. It must also not exceed 100 characters in length.<br>
-<H3>RSEG1045</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter filtering information<br>
-<b>LevelTwo: </b>You must specify filtering information<br>
-<H3>RSEG1046</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string already exists<br>
-<b>LevelTwo: </b>You specified a filter string which already exists in this filter. Having duplicate filter strings will result in duplicate resources in the expanded filter. Specify unique filter strings, preferably which result in unique resources. For example, don't specify both ABC* and A*.<br>
-<H3>RSEG1047</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string not valid<br>
-<b>LevelTwo: </b>The filter string you specified is not syntactically correct.<br>
-<H3>RSEG1048</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Duplicate filter string '%1'.<br>
-<b>LevelTwo: </b>You have defined the same filter string twice or more. This will result in multiple copies of the same resource, when this filter is expanded. Delete the redundant filter strings.<br>
-<H3>RSEG1049</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string '%1' already exists in filter %2<br>
-<b>LevelTwo: </b>This filter string cannot be copied or moved to the target filter. The same filter string already exists there<br>
-<H3>RSEG1050</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Save to disk failed with an unexpected exception<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEG1051</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Restore of data failed with unexpected exception<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEG1052</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Delete selected resources?<br>
-<b>LevelTwo: </b>This is a permanent deletion of the selected resources and cannot be undone<br>
-<H3>RSEG1053</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Delete profile '%1'?<br>
-<b>LevelTwo: </b>Do you want to delete this profile, including all of its connections, filters and user actions? Select Yes to delete, or No to cancel the delete request<br>
-<H3>RSEG1054</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connecting to %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1055</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connecting to %1 at port %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1056</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Connect to %1 failed with an unexpected exception<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1057</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connect failed. Host %1 not found or not responding<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1058</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connect to %1 was cancelled<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1059</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Disconnecting from %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1060</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Disconnecting from %1 at port %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1061</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Disconnect from %1 failed with exception<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1062</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Disconnect from %1 was cancelled<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1063</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Unexpected error deleting %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1064</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Unexpected error renaming %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1065</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unexpected error moving %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1066</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Operation failed with exception '%1'<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1067</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Operation cancelled.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1068</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Warning. Profile '%1' should be made active. Active connection '%2' contains a reference to it.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1069</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Warning. Profile '%1' should be active. Active connection '%2' contains a reference to it.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1070</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Resolving %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1071</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Running %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1072</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying '%1' to '%2'<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1073</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying connection %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1074</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying connections<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1075</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter pools<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1076</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter pool %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1077</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filters<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1078</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1079</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter strings<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1080</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter string %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1081</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying subsystems<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1082</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Filter pool(s) successfully copied to '%1'. You must create a new filter pool reference to see it (them).<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1083</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving '%1' to '%2'<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1084</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving connection %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1085</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving connections<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1086</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filter pools<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1087</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filter pool %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1088</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filters<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1089</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filter %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1090</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filter strings<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1091</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Moving filter string %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1092</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Filter pool(s) successfully moved to '%1'. You must create a new filter pool reference to see it (them).<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1093</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Setting %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1094</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Setting properties<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1095</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Querying %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1096</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Querying properties<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1097</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Running %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1098</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Expand failed. Try again<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1099</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Expand cancelled. Try again<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1100</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Empty list<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1101</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>List cancelled<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1102</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Filter created successfully. Expand this again to create another<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1103</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connection %1 not found<br>
-<b>LevelTwo: </b>No connection named %1 currently exists<br>
-<H3>RSEG1104</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Profile %1 not found<br>
-<b>LevelTwo: </b>No profile named %1 currently exists<br>
-<H3>RSEG1105</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Folder %1 not found on host %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1106</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 not found on host %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1107</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File or folder %1 not found on host %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1108</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connection created successfully. Expand this again to create another<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1109</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Connection busy<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1110</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Command interrupted<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1111</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to run command<br>
-<b>LevelTwo: </b>Possible causes: connection has been deleted, connection has been renamed, or connection has been disconnected<br>
-<H3>RSEG1112</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Command cancelled<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1115</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1116</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1117</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying %1...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1118</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving %1...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1119</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Saving %1...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1120</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1 is not a valid archive name.<br>
-<b>LevelTwo: </b>You must give a filename with an extension that is recognized as a valid archive type extension.<br>
-<H3>RSEG1122</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The archive is corrupted or unreadable.<br>
-<b>LevelTwo: </b>The archive cannot be opened because its format is unrecognized, or its contents are damaged in some way.<br>
-<H3>RSEG1123</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Cannot create archive.<br>
-<b>LevelTwo: </b>There was an error creating the empty archive. The archive was not created.<br>
-<H3>RSEG1124</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Creation of the virtual file or folder %1 failed.<br>
-<b>LevelTwo: </b>There was an error creating the virtual file or folder. The virtual file or folder was not created.<br>
-<H3>RSEG1125</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Deletion of the virtual file or folder %1 failed.<br>
-<b>LevelTwo: </b>There was an error deleting the virtual file or folder. The virtual file or folder was not deleted.<br>
-<H3>RSEG1126</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Could not move the virtual file or folder %1.<br>
-<b>LevelTwo: </b>There was an error moving the virtual file or folder. The virtual file or folder was not moved.<br>
-<H3>RSEG1130</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Permanently delete selected remote resource(s)?<br>
-<b>LevelTwo: </b>This is a permanent deletion of the selected remote resources from disk. This action cannot be undone<br>
-<!-- [191013] commenting out user actions
-<H3>RSEG1140</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Error occurred while loading the user-defined action information from file: %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1141</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>The xml file '%1' appears to be corrupted. It has been replaced<br>
-<b>LevelTwo: </b>Expected root tag to be named '%2'. The corrupted file has been renamed to '%3' and a new file created for you<br>
--->
-<H3>RSEG1150</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to perform action as the underlying file system folder is in use<br>
-<b>LevelTwo: </b>The file system folder %1 is in use by another task and cannot be removed or modified<br>
-<H3>RSEG1151</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to perform action as the underlying file system file is in use<br>
-<b>LevelTwo: </b>The file system file %1 is in use by another task and cannot be removed or modified<br>
-<H3>RSEG1160</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Filter pool %1 created. Create a reference to it in the selected subsystem?<br>
-<b>LevelTwo: </b>New filter pools are not accessible until a reference is added to them in a subsystem. Select Yes to add a reference to the new filter pool in selected subsystem %2<br>
-<H3>RSEG1161</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter update failed: %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1162</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter rename failed: %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1170</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter numeric value<br>
-<b>LevelTwo: </b>You must enter a numeric value<br>
-<H3>RSEG1171</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Value %1 not numeric<br>
-<b>LevelTwo: </b>The value specified is not a valid number<br>
-<H3>RSEG1172</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Value %1 not in range<br>
-<b>LevelTwo: </b>The value specified is not within the valid range of %2 to %3<br>
-<!-- [191013] commenting out user actions
-<H3>RSEG1180</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter action name<br>
-<b>LevelTwo: </b>You must enter a name for this action<br>
-<H3>RSEG1181</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Action name is not unique<br>
-<b>LevelTwo: </b>There is already an action with the given name in the selected profile. Specify a name that is not already in use<br>
-<H3>RSEG1182</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Action name is not valid<br>
-<b>LevelTwo: </b>The given name is not a valid action name<br>
-<H3>RSEG1183</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter comment<br>
-<b>LevelTwo: </b>You must enter a comment for this action<br>
-<H3>RSEG1184</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Action comment is not valid<br>
-<b>LevelTwo: </b>The given comment has syntactical errors<br>
-<H3>RSEG1185</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter command<br>
-<b>LevelTwo: </b>You must enter a command for this action<br>
-<H3>RSEG1186</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Action command is not valid<br>
-<b>LevelTwo: </b>The given command has syntactical errors<br>
-<H3>RSEG1187</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter type name<br>
-<b>LevelTwo: </b>You must enter a name for this collection of resource types<br>
-<H3>RSEG1188</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Type name %1 in use<br>
-<b>LevelTwo: </b>There is already a named type with the given name. Specify a name that is not already in use<br>
-<H3>RSEG1189</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Type name %1 is not valid<br>
-<b>LevelTwo: </b>The given name is not valid for a named type. It must not contain blanks<br>
-<H3>RSEG1190</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Specify one or more resource types<br>
-<b>LevelTwo: </b>You must specify one or more simple or generic resource types to constitute this named type<br>
-<H3>RSEG1191</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Types not valid<br>
-<b>LevelTwo: </b>Syntactical errors were found in the list of resource types<br>
--->
-<H3>RSEG1192</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter source type<br>
-<b>LevelTwo: </b>You must enter a source type<br>
-<H3>RSEG1193</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Source type "%1" not valid<br>
-<b>LevelTwo: </b>The source type you entered is not valid.<br>
-<H3>RSEG1194</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Source type "%1" already exists<br>
-<b>LevelTwo: </b>The source type you entered has already been specified. Specify a unique source type.<br>
-<!-- [191013] commenting out user actions
-<H3>RSEG1195</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter a label for this compile command<br>
-<b>LevelTwo: </b>You must enter a label for this compile command, that will be shown in menus and lists<br>
-<H3>RSEG1196</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Compile command label "%1" is in use<br>
-<b>LevelTwo: </b>There is already a compile command with the given label. Specify a label that is not already in use<br>
-<H3>RSEG1197</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Compile command label "%1" is not valid<br>
-<b>LevelTwo: </b>The given label is not a valid compile label<br>
-<H3>RSEG1198</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter command string for this compile command<br>
-<b>LevelTwo: </b>You must enter a command string for this compile command. This is what is run when this compile command is selected.<br>
-<H3>RSEG1199</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Compile command string "%1" is not valid<br>
-<b>LevelTwo: </b>The given string is not a valid command.<br>
--->
-<H3>RSEG1201</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Changes pending. Save changes?<br>
-<b>LevelTwo: </b>You have changes pending. Select Yes to save those changes. Select No to discard those changes<br>
-<H3>RSEG1202</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Changes pending. Continue?<br>
-<b>LevelTwo: </b>You have changes pending. Select Yes to discard those changes. Select No to cancel the operation so you can first save your changes<br>
-<H3>RSEG1220</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Host name '%1' not found or valid<br>
-<b>LevelTwo: </b>A remote system of host name '%1' was not found. If you are working disconnected, de-select the checkbox to verify the host name<br>
-<H3>RSEG1221</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Verifying host name...<br>
-<b>LevelTwo: </b><br>
-<!-- [191013] commenting out user actions
-<H3>RSEG1230</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Delete selected user actions?<br>
-<b>LevelTwo: </b>This is a permanent deletion of the selected actions and cannot be undone.Select Yes to delete and No to cancel the delete action<br>
-<H3>RSEG1231</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Delete selected types?<br>
-<b>LevelTwo: </b>This is a permanent deletion of the selected types and cannot be undone.Select Yes to delete and No to cancel the delete action<br>
--->
-<H3>RSEG1240</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>There is an error on another page<br>
-<b>LevelTwo: </b>Another page of the wizard has an error that must be corrected before the wizard can be finished<br>
-<H3>RSEG1242</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Daemon failed to launch server on %1 using port %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEG1243</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Failed to connect to the daemon on %1 using port %2 with an unexpected exception<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEG1244</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The selected encoding is not supported.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1250</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The pattern may not be blank<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1251</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Invalid regular expression<br>
-<b>LevelTwo: </b>The value %1 you entered is not a valid regular expression<br>
-<H3>RSEG1255</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1 - Running<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1256</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1 - Finished<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1257</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1 - Cancelled<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1258</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1 - Disconnected<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1260</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The invocation may not be blank<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1270</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Invalid transfer operation<br>
-<b>LevelTwo: </b>The source %1 cannot be transferred into the target %2<br>
-<H3>RSEG1280</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Downloading %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1281</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Uploading %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1282</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Synchronizing Resources...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1285</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Extracting %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1290</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1 of %2 complete (%3)<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1295</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Downloading resources...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1296</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Uploading resources...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1297</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The new password is invalid.<br>
-<b>LevelTwo: </b>The remote system indicated that the new password is unacceptable. Please ensure the new password follows all password rules for the remote system.<br>
-<H3>RSEG1300</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The FTP service is unavailable on the remote system.<br>
-<b>LevelTwo: </b>The RSE server needs to be installed manually.<br>
-<H3>RSEG1301</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The Telnet service is unavailable on the remote system.<br>
-<b>LevelTwo: </b>The RSE server needs to be started manually or a system administrator needs to install the RSE daemon.<br>
-<H3>RSEG1302</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to start the RSE server.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1303</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to install the RSE server.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1304</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Archive Management is not supported by the current File subsystem's configuration.<br>
-<b>LevelTwo: </b>In the properties for the File subsystem, choose a configuration that supports Archive Management.<br>
-<H3>RSEG1400</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>This action will take a few minutes. Proceed?<br>
-<b>LevelTwo: </b>This action uncompresses a large number of HTML files from a zip file. It will take awhile, and require sufficient disk space. Press Yes to continue, No to cancel.<br>
-<H3>RSEG1401</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Classic help already enabled.<br>
-<b>LevelTwo: </b>The HTML files for the CODE and VisualAge RPG help have already been uncompressed.<br>
-<H3>RSEG1500</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Remote Error List: %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1600</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Folder path must not be empty.<br>
-<b>LevelTwo: </b>Select a folder from the dropdown list or click the Browse... button and select a folder from the dialog.<br>
-<H3>RSEG1601</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Regular expression is not valid.<br>
-<b>LevelTwo: </b>The value %1 you entered is not a valid regular expression.<br>
-<br>
-<hr>
-<A NAME="Other"><!-- --></A><H2>Other Messages</H2>
-<H3>RSEO1000</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1001</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1003</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1004</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1005</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1006</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1007</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1008</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1009</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1010</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEO1011</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEO1012</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEO1013</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEO1014</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<br>
-<hr>
-<A NAME="Files"><!-- --></A><H2>Files Messages</H2>
-<H3>RSEF1001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Operation failed. Security violation<br>
-<b>LevelTwo: </b>Message reported from file system: %1<br>
-<H3>RSEF1002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Operation failed. File system input or output error<br>
-<b>LevelTwo: </b>Message reported from file system: %1<br>
-<H3>RSEF1003</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Folder is not empty. Cannot delete<br>
-<b>LevelTwo: </b>The operation failed. One possible reason is that the folder is not empty<br>
-<H3>RSEF1004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Folder '%1' not found<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1005</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Folder '%1' not found. Would you like to create it?<br>
-<b>LevelTwo: </b>The folder you specified does not exist. Select Yes to create it, No to cancel the operation<br>
-<H3>RSEF1006</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File '%1' not found<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1011</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter file name pattern<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1007</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string '%1' already exists in this filter<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1008</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string name pattern not valid<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1009</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>You must include files or folders or both<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1010</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>No file types specified<br>
-<b>LevelTwo: </b>Either specify one or more file types, or select to subset by file name<br>
-<H3>RSEF1200</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Create a new File<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1201</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Create a new Folder<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1202</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Enter folder name<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1203</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Names cannot begin or end with whitespace.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1204</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1 is an invalid character in a name.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1205</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Enter file name<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1300</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Deletion of the object %1 failed<br>
-<b>LevelTwo: </b>Either the object does not exist or you do not have enough authority to delete the object. If this is a folder, the folder may not be empty<br>
-<H3>RSEF1301</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Renaming of the object %1 failed<br>
-<b>LevelTwo: </b>Rename operation failed because, the object to rename does not exist, or the object with new object name already exists, or the user does not have enough authority to rename  the object<br>
-<H3>RSEF1302</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>No authority or file name not valid<br>
-<b>LevelTwo: </b>The file could not be created because of one of the following reasons:
-                        - the user does not have enough authority to create the file
-                        - the file name is not valid<br>
-<H3>RSEF1303</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File already exists<br>
-<b>LevelTwo: </b>The new file %1 already exists<br>
-<H3>RSEF1304</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Creation of the folder failed<br>
-<b>LevelTwo: </b>The folder %1 could not be created because of one of the following reasons:
-                        - the user does not have enough authority to create the folder
-                        - the folder name is not valid<br>
-<H3>RSEF1305</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The operation did not complete successfully. See additional messages in the Remote Shell view<br>
-<b>LevelTwo: </b>The operation requested failed. Look in the Remote Shell view to see additional messages indicating the cause of the failure<br>
-<H3>RSEF1306</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Copy of the file or folder %1 failed<br>
-<b>LevelTwo: </b>The file system reported the copy operation failed. You may not have authority to the target folder, or it may be in use<br>
-<H3>RSEF1307</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Move of the file or folder %1 failed<br>
-<b>LevelTwo: </b>The file system reported the move operation failed. You may not have authority to the source folder or file, or you may not have authority to the target folder, or it may be in use<br>
-<H3>RSEF1308</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Target folder cannot equal source folder<br>
-<b>LevelTwo: </b>Attempting to move a file or folder to the same folder as it exists in is equivalent to a rename operation. Use the rename action for this<br>
-<H3>RSEF1309</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Folder already exists<br>
-<b>LevelTwo: </b>The new folder %1 already exists<br>
-<H3>RSEF1310</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>New resource will not be visible due to subsetting. Create it anyway?<br>
-<b>LevelTwo: </b>The name of the resource you are creating does not match the current filter criteria. If you select Yes to create the resource, it will not be visible within the current filter.<br>
-<H3>RSEF1311</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Resource will not be visible due to subsetting. Rename it anyway?<br>
-<b>LevelTwo: </b>The new name of the resource does not match the current filter criteria. If you select Yes to rename the resource, it will not be visible within the current filter.<br>
-<H3>RSEF1312</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Target folder cannot descend from source folder<br>
-<b>LevelTwo: </b>It is impossible to move a folder to one of its subfolders.<br>
-<H3>RSEF1315</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Deleting %1...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF5001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 on %2 can not be opened. You do not have read access to the file.<br>
-<b>LevelTwo: </b>Change file permissions to ensure you have read access to the file.<br>
-<H3>RSEF5002</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>You do not have write access to file %1 on %2. Do you want to open the file in browse mode?<br>
-<b>LevelTwo: </b>You do not have write permission to the file %1 on %2. You can open the file in browse (read-only) mode. If you want to edit the file, change file permissions to allow write access to the file.<br>
-<H3>RSEF5003</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 can not be saved on %2. You do not have write access to the file.<br>
-<b>LevelTwo: </b>Change file permissions to ensure you have write access to the file.<br>
-<H3>RSEF5004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 can not be saved on %2. You do not have write access to the file.<br>
-<b>LevelTwo: </b>Change file permissions to ensure you have write access to the file.<br>
-<H3>RSEF5005</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>File %1 on %2 was modified since you opened this file or saved the file on the server. Do you want to replace the current contents of the file on the server?<br>
-<b>LevelTwo: </b>The file %1 was changed on the server after it was retrieved from %2 or since the last time the file was saved on the server. Choose Yes to replace the contents of the file. Choose No to leave the file on the server with its current contents.<br>
-<H3>RSEF5006</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 was not completely saved on %2. The file was saved in the local file system.<br>
-<b>LevelTwo: </b>An error occurred while saving the file on the server. A possible cause is the connection to the server was terminated. The file may only have been saved partially on the server. However, it was saved locally to help you recover. You will be asked to save the local copy to the server the next time you connect.<br>
-<H3>RSEF5007</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>File %1 on %2 may not have been saved completely during an earlier edit session. The file was saved on the local file system. Do you want to replace the file with the local copy now?<br>
-<b>LevelTwo: </b>An error occurred during an earlier attempt to save the file. But a local copy of the file was saved for recovery. Choose Yes to save the local copy on the server. Choose No if recovery is not required.<br>
-<H3>RSEF5008</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>File %1 does not exist on %2. Do you want to create the file?<br>
-<b>LevelTwo: </b>Choose Yes to create the file on the server and save the contents to the file. Choose No if you do not want the file to be created.<br>
-<H3>RSEF5009</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>You are currently editing file %1 on %2. Do you want to open the file in browse mode?<br>
-<b>LevelTwo: </b>You are allowed to edit a file in one editor only. You can, however, open the file in another editor for browsing. Browsing lets you view the file but does not allow you to edit its contents.<br>
-<H3>RSEF5010</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Profile named %1 does not exist.<br>
-<b>LevelTwo: </b>Profile may have been renamed or deleted.<br>
-<H3>RSEF5011</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connection named %1 does not exist.<br>
-<b>LevelTwo: </b>Connection may have been renamed or deleted.<br>
-<H3>RSEF5012</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>File %1 already exists. Do you want to replace it?<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF5013</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Parent folder %1 does not exist. Do you want to create it?<br>
-<b>LevelTwo: </b>The parent folder must be created for the file to be created.<br>
-<H3>RSEF5014</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Parent folder %1 does not exist. Verify that the correct path was entered.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF5020</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Folder %1 is not readable. Cannot expand<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF5101</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to use connection.<br>
-<b>LevelTwo: </b>Please correct, or select alternate connection.<br>
-<H3>RSEF5102</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unexpected exception received: %1.<br>
-<b>LevelTwo: </b>Please see error log for details.<br>
-<H3>RSEF5103</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>The file '%1' already exists on %2. Do you want to overwrite it?<br>
-<b>LevelTwo: </b>Click Yes to overwrite the existing file, or click No to cancel the export.<br>
-<H3>RSEF6001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File type extension can not be empty.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF6002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File type extension must not contain '*' or '.'<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF6003</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The encoding is not supported.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF6101</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>One or more cached files have changes that have not been saved on the host.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF6102</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Unable to synchronize cache changes to host. Operation cancelled.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF6201</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The IP address or host name can not be empty.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF6202</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The IP address is not valid.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF6203</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The host name is not valid.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF7001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter CCSID<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF7002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>CCSID must be a number between 0 and 65535<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF8001</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>An unknown error occurred.<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8002</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>An unexpected error occurred.<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8003</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Value is not valid<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Input %1 is not valid<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8050</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Can not copy root file system<br>
-<b>LevelTwo: </b>The root is not something that can be copied<br>
-<H3>RSEF8051</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Could not close import stream for %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF8052</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to import %1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEF8053</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Creating folder %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF8054</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Problems were encountered during import<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8055</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Error opening input stream for %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEF8056</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to import %1<br>
-<b>LevelTwo: </b>The file cannot be copied onto itself<br>
-<H3>RSEF8057</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Error occurred while exporting %1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEF8058</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Problems were encountered during export<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8059</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Cannot overwrite file %1<br>
-<b>LevelTwo: </b>The file does not have its write attribute set, so it cannot be written to<br>
-<H3>RSEF8060</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Target folder does not exist. Would you like to create it?<br>
-<b>LevelTwo: </b>Press Yes to create the folder %1, No to cancel<br>
-<H3>RSEF8061</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Target folder already exists, as a file<br>
-<b>LevelTwo: </b>The remote resource %1 already exists, but as a file, not a folder<br>
-<H3>RSEF8062</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Destination folder conflicts with location of %1<br>
-<b>LevelTwo: </b>You are attempting to export to the local file system, to a location that overlaps the resources being exported.<br>
-<H3>RSEF8063</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Source is a file, not a folder<br>
-<b>LevelTwo: </b>The remote resource %1 is a file, but a folder is required<br>
-<H3>RSEF8064</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>There are no resources currently selected for import<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF8065</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Select the source directory<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF8066</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Enter or select a source folder<br>
-<b>LevelTwo: </b>You have left the source folder empty, but it must be set to continue.<br>
-<H3>RSEF8067</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Export problems<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8068</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>There are no resources currently selected for export<br>
-<b>LevelTwo: </b>Select resources to be exported and try again<br>
-<H3>RSEF8069</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Please enter a destination folder<br>
-<b>LevelTwo: </b>The destination folder is empty. You must select a destination folder.<br>
-<H3>RSEF8070</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Import problems<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8071</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>There are no resources currently selected for import<br>
-<b>LevelTwo: </b>Select resources to be imported and try again<br>
-<H3>RSEF8072</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Filtering selection...<br>
-<b>LevelTwo: </b><br>
-<br>
-<hr>
-<A NAME="Communications"><!-- --></A><H2>Communications Messages</H2>
-<H3>RSEC1001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connection to %1 could not be established.<br>
-<b>LevelTwo: </b>A socket connection to %1 could not be established.  If you are connecting via the communications daemon make sure the daemon is running on the remote system.  If you are connecting directly to the communications server make sure the server is started on the remote system.  If you are connecting using REXEC, make sure that the server is installed on the remote system and that the REXEC service is running on that system.<br>
-<H3>RSEC1002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Invalid password or user ID<br>
-<b>LevelTwo: </b>Authentication with %1 failed because the password or user ID is not correct.<br>
-<H3>RSEC1003</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The user ID %1 is not valid<br>
-<b>LevelTwo: </b>The user ID %1 on host %2 is not valid.  Change the user ID and try again.<br>
-<H3>RSEC1004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The saved password is not correct.<br>
-<b>LevelTwo: </b>The saved password for user ID %1 on host %2 is not correct.  Please enter the password and try again.<br>
-<H3>RSEC2001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Environment variable %1 is already defined<br>
-<b>LevelTwo: </b>An environment variable %1 has already been defined.  Change the new environment variable's name and press the Add button.<br>
-<H3>RSEC2002</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Environment variable must have a name.<br>
-<b>LevelTwo: </b>An attempt was made to define an environment variable with a blank name.  Type a value for the environment variable name.<br>
-<H3>RSEC2003</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Environment variable must have a name.<br>
-<b>LevelTwo: </b>An attempt was made to clear the name of an environment variable.  To remove an environment variable, select the variable in the list add press the Remove button.<br>
-<H3>RSEC2004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Environment variable name contains an invalid character.<br>
-<b>LevelTwo: </b>The environment variable name cannot contain a space or the '=' character.<br>
-<H3>RSEC2101</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Saved password for %1 on %2 already exists.<br>
-<b>LevelTwo: </b>The password for user ID %1 on host %2 is already saved.  Enter a different user ID or host name or change the existing saved password.<br>
-<H3>RSEC2102</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>New and verify passwords do not match.<br>
-<b>LevelTwo: </b>The new and verify passwords must match (case sensitive) in order to save the new password.  Retype the new and verify passwords and try again.<br>
-<H3>RSEC2103</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Entry field cannot be blank.<br>
-<b>LevelTwo: </b>The hostname, user ID, system type and password entry fields cannot be blank.  Type a value and press the Enter key to save the changes.<br>
-<H3>RSEC2104</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>There are no tools installed which support saving password information.<br>
-<b>LevelTwo: </b>The password information preference page is a centralized place for Workbench tools to save password information.  Each tool registers and provides its own encryption algorithm.  There are no tools installed that have registered with the password information preference page.<br>
-<H3>RSEC2301</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to launch server on host %1.<br>
-<b>LevelTwo: </b>Message from host: %2<br>
-<H3>RSEC2302</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Invalid password or user ID for %1.<br>
-<b>LevelTwo: </b>Message from host: %2<br>
-<H3>RSEC2303</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Incompatible host server running on remote system %1.<br>
-<b>LevelTwo: </b>The host server is not a Remote System Explorer server.<br>
-<H3>RSEC2304</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Incompatible Remote System Explorer host server running on remote system %1.<br>
-<b>LevelTwo: </b>The host server needs to be updated to work with the current client.<br>
-<H3>RSEC2305</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to connect to REXEC host service on port %1 of host %2<br>
-<b>LevelTwo: </b>Message from host: %3<br>
-<H3>RSEC2306</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Port %1 is normally used for the %2 service.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEC2307</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to establish a secure connection with the Remote System Explorer host server.<br>
-<b>LevelTwo: </b>Make sure both the client and server are configured to use SSL.  The SSL handshake between client and server failed with the following exception: %1<br>
-<H3>RSEC2308</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>The host server running on remote system %1 is an older version than the RSE client.<br>
-<b>LevelTwo: </b>It is recommended that the client and server versions match.<br>
-<H3>RSEC2309</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>The host server running on remote system %1 is a newer version than the RSE client.<br>
-<b>LevelTwo: </b>It is recommended that the client and server versions match.<br>
-<H3>RSEC2310</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Starting Remote System Explorer host server using REXEC<br>
-<b>LevelTwo: </b><br>
-<H3>RSEC2311</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Starting Remote System Explorer host server using daemon<br>
-<b>LevelTwo: </b><br>
-<H3>RSEC2312</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connecting to Remote System Explorer host server on port %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEC2313</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Initializing Remote System Explorer host server<br>
-<b>LevelTwo: </b><br>
-<H3>RSEC2314</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Communication with the remote system %1 has been secured using SSL. Continue?<br>
-<b>LevelTwo: </b><br>
-<H3>RSEC2315</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connection %1 has not been secured using SSL. Proceed anyway?<br>
-<b>LevelTwo: </b><br>
-<H3>RSEC2316</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The specified server port is out of the allowed range: %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEC3001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The connection %1 is currently offline and cannot be connected.<br>
-<b>LevelTwo: </b>You have performed an action which requires a live connection to the remote system.  Switch the connection to online and perform the action again.  To switch the connection online, right click on the connection %1 and deselect the Work Offline action.<br>
-<br>
-</BODY>
-</HTML>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/modelAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/modelAPI.html
deleted file mode 100755
index a6f2407d6..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/modelAPI.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSE Model API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Model API</h1>
-<p>The front door to accessing the elements of the RSE model is the <A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html">ISystemRegistry</A>, which is a
-singleton object accessible via <A href="../../reference/api/org/eclipse/rse/core/model/SystemStartHere.html#getSystemRegistry()">SystemStartHere.getSystemRegistry()</A>.
-</p>
-<p>The system registry will get you access to profiles, connections and subsystem factories.
-From a <A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.html">subsystem configuration</A> you can access subsystems, filter pools,
-user actions and compile commands.
-From <A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">ISubSystem</A> you can access remote resources, as well
-as filter pools referenced by the subsystem.
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/plugin/uiPluginAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/plugin/uiPluginAPI.html
deleted file mode 100755
index 2d27c6cd9..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/plugin/uiPluginAPI.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Base Plugin Class</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Base Plugin Class</h1>
-<p>You may find it of value to base your own plugin class on the RSE-supplied base plugin class.
-If so, there are some methods you are encouraged to create or override in your class. The benefits
-of using this as your base class is the inherited methods you can access.
-</p>
-<h2>Methods required in your plugin subclass</h2>
-<p>To use the RSE base plugin class
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html">org.eclipse.rse.ui.SystemBasePlugin</A></samp>,
-you subclass it for your own plugin class, and supply some key static methods of your own:
-</p>
-<ul>
-<li><samp>getDefault()</samp>. Return a singleton instance of your plugin.
-<li><samp>getResourceBundle()</samp>. Return the resource bundle for your plugin. This is stored in
-a static field, initialized in your constructor by calling the <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadResourceBundle(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadResourceBundle(...)</A></samp> inherited method.
-<li><samp>getString(String key)</samp>. Return a translated string by calling the inherited method
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getString(java.util.ResourceBundle, java.lang.String)">getString(ResourceBundle rb, String key)</A></samp>, passing in the static resource bundle field.
-<li><samp>getPluginMessageFile()</samp>. Return your RSE message file instance, initialized in your
-constructor by calling <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadMessageFile(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadMessageFile(...)</A></samp>.
-<li><samp>getPluginMessage(String msgID)</samp>. Return the
-<samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html">SystemMessage</A></samp> for the given ID, by
-calling the inherited method
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getMessage(org.eclipse.rse.services.clientserver.messages.SystemMessageFile, java.lang.String)">getMessage(getPluginMessageFile(), msgId)</a></samp>. You will call this method often to get message objects.
-</ul>
-<p>You may also override some RSE-supplied instance methods:
-<ul>
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#initializeImageRegistry()">initializeImageRegistry()</A></samp>. Call
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#putImageInRegistry(java.lang.String, java.lang.String)">putImageInRegistry(String id, String imageFileName)</A></samp>
-to load each of your images.
-</ul>
-</p>
-<p>Of course, there are the usual eclipse-supplied instance methods to override too:
-<ul>
-<li><samp>initializeDefaultPreferences()</samp>. Good place to call the <samp>initDefaults()</samp> method of your preference pages. Be sure to call <samp>super.initializeDefaultPreferences()</samp>.
-<li><samp>startup()</samp>. Good place to register adapters and so forth. Be sure to call <samp>super.startup()</samp> at the beginning.
-<li><samp>shutdown()</samp>. Good place to close any open communication layers. Be sure to call <samp>super.shutdown()</samp> at the end.
-</ul>
-</p>
-
-<h2>Methods inherited from the RSE base class</h2>
-<p>The methods you get access to by using the RSE-supplied base plugin class include:</p>
-<ul>
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getPluginId()">getPluginId()</A></samp>. Return this plugin's ID.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getActiveWorkbenchShell()">getActiveWorkbenchShell()</A></samp>. Return the shell of the active workbench window.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getActiveWorkbenchWindow()">getActiveWorkbenchWindow()</A></samp>. Return the active workbench window.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getWorkspaceRoot()">getWorkspaceRoot()</A></samp>. Return the root of the workspace.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getWorkspace()">getWorkspace()</A></samp>. Return the workspace root.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getInstallLocation()">getInstallLocation()</A></samp>. Return the install directory for this plugin.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getIconPath()">getIconPath()</A></samp>. Return the typical path for icons, relative to the plugin's folder: "icons/"
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#putImageInRegistry(java.lang.String, java.lang.String)">putImageInRegistry(String id, String fileName)</A></samp>. Load an image in the image registry, given the ID to retrieve it with, and its filename and path relative to this plugin's folder
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getImage(java.lang.String)">getImage(String id)</A></samp>. Return an Image given the ID with which it was registered in putImageInRegistry.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getImageDescriptor(java.lang.String)">getImageDescriptor(String id)</A></samp>. Return an ImageDescriptor given the ID with which it was registered in putImageInRegistry.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadResourceBundle(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadResourceBundle(IPluginDescriptor descriptor, String fileName)</A></samp>. Load a resource bundle, given its file name, relative to the given plugin's installation folder.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadResourceBundle(java.lang.String)">loadResourceBundle(String fileName)</A></samp>. Load a resource bundle, given its file name, relative to this plugin's installation folder.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getString(java.util.ResourceBundle, java.lang.String)">getString(ResourceBundle rb, String id)</A></samp>. Return a translated string from a resource bundle, given its key ID.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getString(java.util.ResourceBundle, java.lang.String, java.lang.String)">getString(ResourceBundle rb, String id, String default)</A></samp>. Return a translated string from a resource bundle, given its key ID. If key not found in the resource bundle, returns the given default string.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadMessageFile(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadMessageFile(IPluginDescriptor descriptor,String fileName)</A></samp>. Parse an RSE-style message file into memory, given the plugin and message file name.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getMessage(org.eclipse.rse.services.clientserver.messages.SystemMessageFile, java.lang.String)">getMessage(SystemMessageFile msgFile, String msgId)</A></samp>. Retrieve a SystemMessage object, given the message file that contains it, and its message ID including component and subcomponent abbreviations.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#scanForDuplicateMessages(org.eclipse.rse.services.clientserver.messages.SystemMessageFile)">scanForDuplicateMessages(SystemMessageFile msgFile)</A></samp>. Scan given message file for duplicate IDs. Typically only called during the development cycle.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#printMessages(org.eclipse.rse.services.clientserver.messages.SystemMessageFile, java.lang.String)">printMessages(SystemMessageFile msgFile, String fullyQualifiedTargetFile)</A></samp>. Generate an HTML file documenting the messages in the given message file, given the fully qualified name of the target HTML file.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#showProgrammerErrorMessage(java.lang.String)">showProgrammerErrorMessage(String msg)</A></samp>. Show a message to the user, when the message file support is not available.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logInfo(java.lang.String)">logInfo(String message)</A></samp>. Log an informational message to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logWarning(java.lang.String)">logWarning(String message)</A></samp>. Log a warning message to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logError(java.lang.String)">logError(String message)</A></samp>. Log an error message to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logError(java.lang.String, java.lang.Throwable)">logError(String message, Throwable exception)</A></samp>. Log an error message resulting from an exception to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logDebugMessage(java.lang.String, java.lang.String)">logDebugMessage(String prefix, String message)</A></samp>. Log a debug (trace) message to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getLogger()">getLogger()</A></samp>.Return the Logger instance for the RSE default logging file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-</ul>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_checkBox.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_checkBox.gif
deleted file mode 100755
index 19d23df68..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_checkBox.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_comboBox.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_comboBox.gif
deleted file mode 100755
index 853d0082a..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_comboBox.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_keyValue.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_keyValue.gif
deleted file mode 100755
index 26caa8048..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_keyValue.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_string.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_string.gif
deleted file mode 100755
index f43c0681f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/fldEditor_string.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/rsePreferences.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/rsePreferences.gif
deleted file mode 100755
index cc58177fb..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/rsePreferences.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/uiPreferencesAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/uiPreferencesAPI.html
deleted file mode 100755
index 9df581818..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/preferences/uiPreferencesAPI.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Preferences API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Preferences API</h1>
-
-<h2>RSE Preference Pages Category</h2>
-<p>All Remote System Explorer preference pages are rooted within the
-preferences category <samp>org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage</samp>,
-as shown here:</p>
-<P><IMG border="0" src="rsePreferences.gif"></P>
-
-<h2>RSE Preference Pages Classes</h2>
-<p>There is no RSE-supplied base class for preference pages, but we recommend
-you extend <samp>FieldEditorPreferencePage</samp> in package <samp>org.eclipse.jface.preference</samp>.
-This JFace class allows you to create a preferences page as a sequence of "field
-editors" which know how to initialize, load and store their values from their preferences store.
-</p>
-<p>We also suggest the following when designing your preference pages:
-<ol>
-<li>A interface for your preferences constants. It should store two constants per preference: the preference store key, and its default value.
-<li>Static getter and setter methods in your preference page classes, one per preference, to query or update the preference value in the preferences store.
-<li>An <samp>initDefaults(IPreferenceStore store)</samp> method per preferences class, that initializes the preference store value of each preference on that page.
-<li>In your plugin class, an override of the <samp>initializeDefaultPreferences(IPreferenceStore store)</samp> method, so it calls your
-<samp>initDefaults(store)</samp> method for each preference page class.
-</ol>
-<p>Should you need to query, or update, any RSE preferences you can do so via
-the getters and setters in <samp>org.eclipse.rse.core.SystemPreferencesManager</samp>.
-</p>
-<p>The RSE supplies a few field editors, complementing what JFace supplies
-in <samp>org.eclipse.jface.preference</samp>. The RSE-supplied field editors, and the
-RSE-supplied preferences pages, are all found in package <samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/package-summary.html">org.eclipse.rse.ui.propertypages</A></samp>:
-</p>
-<ul>
-<li><b><samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemBooleanFieldEditor.html">SystemBooleanFieldEditor</A></samp></b>. Extends <samp>BooleanFieldEditor</samp> to add support for tooltip text.
-<p><IMG border="0" src="fldEditor_checkBox.gif"></p>
-<li><b><samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemComboBoxFieldEditor.html">SystemComboBoxFieldEditor</A></samp></b>. Shows a combo box allowing the user to choose from a finite list of discrete possibilities.
-<p><IMG border="0" src="fldEditor_comboBox.gif"></p>
-<li><b><samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemKeyValueFieldEditor.html">SystemKeyValueFieldEditor</A></samp></b>. Shows a list of hard-coded keys, each of which supports a user-specifiable value.
-<p><IMG border="0" src="fldEditor_keyValue.gif"></p>
-<li><b><samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemStringFieldEditor.html">SystemStringFieldEditor</A></samp></b>. For simple string preferences. Unlike the JFace string editor, this supports tooltip text and RSE validators and massagers on the typed text.
-<p><IMG border="0" src="fldEditor_string.gif"></p>
-</ul>
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/properties/uiPropertiesAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/properties/uiPropertiesAPI.html
deleted file mode 100755
index b5dae9e86..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/properties/uiPropertiesAPI.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Properties API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Properties API</h1>
-<p>You can supply your own property pages to any node in the Remote Systems tree or table views.
-As you author your property page classes, you may find the RSE-supplied base class for property pages
-of value.
-
-<h2>RSE-Supplied Base Class for Property Pages</h2>
-<p>The RSE supplies a base class for property pages,
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.html">org.eclipse.rse.ui.propertypages.SystemBasePropertyPage</A></samp>,
-that extends the base eclipse property page <samp>org.eclipse.ui.dialogs.PropertyPage</samp>. The advantages
-of using this RSE-supplied class are:
-</p>
-<ul>
-<li>Supports <samp><a href="../messages/uiMessageAPI.html">SystemMessage</A></samp> error messages, allowing the user to click on a message to see its details.
-<li>Supports automatic assignment of mnemonics for input-capable fields.
-<li>Supports automatic management of the "isValid" property based on current error message status in the message line. This
-property is important to set correct, so eclipse knows when to prevent the user from switching focus to other property pages.
-</ul>
-
-
-<h2>Property Pages for RSE Non-Remote Resources</h2>
-<p>You can simply use the eclipse-supplied extension point <samp>org.eclipse.ui.propertyPages</samp> to
-contribute property pages to any of the non-remote artifacts from the RSE model. To use this extension
-point, you need to know the class or, preferably, interface that the objects implement, which we describe here:
-</p>
-
-<TABLE border="1" width="100%">
-	<TBODY>
-		<TR>
-			<TH>RSE Resource</TH>
-			<TH>Implements Interface</TH>
-		</TR>
-		<TR>
-			<TD>Profile</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/model/ISystemProfile.html">org.eclipse.rse.core.model.ISystemProfile</A></samp></TD>
-		</TR>
-		<TR>
-			<TD>Host</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/model/IHost.html">org.eclipse.rse.core.model.IHost</A></samp></TD>
-		</TR>
-		<TR>
-			<TD>Subsystem</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp></TD>
-		</TR>
-		<TR>
-			<TD>Filter pool reference</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp></TD>
-		</TR>
-		<TR>
-			<TD>Filter reference</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<h2>Property Pages for RSE Remote Resources</h2>
-<p>See <a href="../../../guide/plugin/propertypage.html">Plugging In Property Pages</a>
-for information on how to contribute property pages for remote resources.
-Because remote resources have no underlying eclipse resource, and typically all are instances of the same class,
-Eclipse Filtering capabilities are used to allow very explicit scoping of the property page to very specific types of remote resources.
-</p>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/resourceAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/resourceAPI.html
deleted file mode 100755
index d5043eb7e..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/resourceAPI.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSE Remote Resource API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Remote Resource API</h1>
-<p>RSE supplies subsystems for accessing the file system and for executing commands, for
-all system types ("universally").
-</p>
-<p>
-To programmatically access the files in a remote system
-identified by a particular system connection, use the
-<A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html">system registry</A> to get to the
-<A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#getSubSystemsBySubSystemConfigurationCategory(String, org.eclipse.rse.core.model.IHost)">file subsystem</A>
-for that connection, by passing in the file category as a String. This <A href="../../reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.html">file subsystem</A> offers methods for accessing the remote files.
-</p>
-<p>
-Similarly, to programmatically run commands in a remote system
-identified by a particular system connection, use the
-<A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html">system registry</A> to get to the
-<A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#getSubSystemsBySubSystemConfigurationCategory(String, org.eclipse.rse.core.model.IHost)">command subsystem</A>
-for that connection, by passing in the command category as a String. This <A href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.html">command subsystem</A> offers methods for running remote commands,
-either in a new command shell or an existing command shell. You can also set environment variables
-using this subsytem object.
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/uiAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/uiAPI.html
deleted file mode 100755
index 42e409da3..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/uiAPI.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSE User Interface API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE User Interface API</h1>
-<p>The RSE provides a number of classes that can help with programming productivity when authoring
-user interface artifacts, such as actions, dialogs, wizards, property pages and preferences pages.
-Further, a common requirement in all of these artifacts is the need to display translated messages
-to the user. The RSE supplies a framework for defining and displaying rich messages that have second
-level help, severity and ID attributes.
-</p>
-<p>
-In the following sections we introduce the support offered by the RSE for these UI constructs.
-<h2>Plugin Class</h2>
-<p>The RSE supplies a base plugin class <samp><a href="plugin/uiPluginAPI.html">SystemBasePlugin</a></samp> that offers
-some advantages over the base eclipse <samp>AbstractUIPlugin</samp> class:
-<ol>
-<li>Simplified methods for registering images, and support for retrieving them either as an image
-or an image descriptor.
-<li>Support for <a href="logger/uiLoggerAPI.html">logging</a> error, warning and information messages, using the RSE logging framework.
-<li>Support for loading a resource bundle, and easily retrieving translated strings from it.
-<li>Support for loading an RSE <a href="messages/uiMessageFile.html">message file</a>, and easily retrieving translated messages from it.
-<li>Helper methods for getting the active workbench window and shell.
-</ol>
-</p>
-<p>To use the base plugin class effectively, you must subclass it and supply some critical
-methods of your own.
-</p>
-
-<h2>Messages</h2>
-<p>The Java property file for messages is not very rich, as it offers only the ability to define a
-single message string. Throughout the RSE perspective you will notice that the messages are richer
-than this. They contain second level help, severity, and ID and more. Further, there is a unique
-error message dialog for displaying messages, with their second level help, and specialized support
-in the RSE dialog, wizard and property page classes for displaying messages on a message line. These
-messages can be selected by the user, to bring up the specialized message dialog displaying the
-additional properties of the message. Further, there is support for logging severe errors to a log
-file, enabling better service support.
-</p>
-<p>
-Your own plugins can enjoy this rich message support too, even independently of using the rest of
-the RSE for remote resource access. This support involves defining an xml
-<a href="messages/uiMessageFile.html">message file</a>, which defines
-the messages, and using a set of
-<a href="messages/uiMessageAPI.html">supplied classes</a> to work with the messages.
-</p>
-<p>Before defining your own messages, you may wish to peruse the list of <a href="messages/uiMessagesCore.html">RSE-supplied messages</a> that are
-already defined. The key benefit to using an existing message is translation, as these are already
-translated into many languages.
-</p>
-
-<h2>Preference Pages</h2>
-<p>When defining your own <a href="preferences/uiPreferencesAPI.html">preferences pages</a>,
-you may want to place your preference pages within the Remote Systems preference page category.
-As you author your preference page classes, you may find some of the RSE-supplied classes for
-preference pages to be useful.
-</p>
-
-<h2>Property Pages</h2>
-<p>Property pages can appear in the Properties dialog of any object in eclipse. This dialog is available by selecting
-"Properties" from the pop-up menu for the object. The RSE supports defining your own
-<a href="properties/uiPropertiesAPI.html">property pages</a> for the resources in its model, although there is a
-distinction between local and remote resources.
-</p>
-
-<h2>Validators</h2>
-<p>Validating user-entered text is a common and tedious task in any GUI programming. Using validators to encapsulate
-the error checking for a particular type of data is a highly recommended practice. The
-<a href="validators/uiValidatorsAPI.html">RSE validator</a> support is very
-helpful for this, offering both a common interface for all manner of validators and a large list of pre-supplied
-validators.
-</p>
-
-<h2>Massagers</h2>
-<p>While validating user-entered text is common, so is affecting user-entered text prior to saving it. For example, folding it
-to upper or lower case. The <a href="massagers/uiMassagersAPI.html">RSE massager</a> support encapsulates this concept, and
-supplies a few re-usable massagers for you.
-</p>
-
-<h2>Widgets</h2>
-<p>Populating preference pages, property pages, dialogs and wizards requires use of SWT widget programming. The RSE
-<a href="widgets/uiWidgetsAPI.html">widget support</a> can help, with helper methods and classes, and re-usable widgets you may
-find useful.
-</p>
-
-<h2>Dialogs</h2>
-<p>The RSE supplies rich support for <a href="dialogs/uiDialogsAPI.html">dialogs</a>, including a powerful base class
-and, re-usable pre-built dialogs.
-</p>
-
-<h2>Wizards</h2>
-<p>Wizards are a common building block of an eclipse GUI. Typically, a wizard is used to prompt for information to create
-something new, while a dialog is used to prompt for information for other purposes.
-The RSE <a href="wizards/uiWizardsAPI.html">wizard support</a> includes base classes that can simplify the task of creating wizards.
-</p>
-
-<h2>Actions</h2>
-<p>Populating popup and pulldown menu items requires the creation of actions. These actions typically popup dialogs or wizards,
-and need to be able to pass selections and inputs from the action to the dialog or wizard, and get outputs back. The RSE
-<a href="actions/uiActionsAPI.html">action support</a> can significantly help with this programming task, especially when used
-together with the RSE dialog and wizard support.
-</p>
-
-<p>Often we want to refresh the contents of the Remote Systems view or Table view from within our actions, to visualize
-changes to the selected resources. To do this, use the
-<samp><A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#fireRemoteResourceChangeEvent(int, java.lang.Object, java.lang.Object, org.eclipse.rse.core.subsystems.ISubSystem, java.lang.String)">method</a></samp>.
-To get the system registry, use the
-<samp><A href="../../reference/api/org/eclipse/rse/core/model/SystemStartHere.html#getSystemRegistry()">method</a></samp>.
-</p>
-
-<p>At times, you may want to post events in a dispatch thread rather than using the
-original client's thread; or you may need access to the System Clipboard.
-Such operations are only possible when the UI 
-is loaded, and therefore you need to use
-<samp><A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#fireRemoteResourceChangeEvent(int, java.lang.Object, java.lang.Object, org.eclipse.rse.core.subsystems.ISubSystem, java.lang.String, java.lang.Object)">ISystemRegistry.fireEvent()</a></samp>
-method in that case. To get the system registry UI interface, use the
-<samp><A href="../../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html#getTheSystemRegistryUI()">RSEUIPlugin.getTheSystemRegistryUI()</a></samp>
-method.
-</p>
-
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/uiValidatorsAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/uiValidatorsAPI.html
deleted file mode 100755
index 6894a0a58..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/uiValidatorsAPI.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validators API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validators API</h1>
-<p>Throughout an eclipse UI there are times when we need to validate what the user has typed in. Validators
-offer a way to encapsulate the error checking for a particular domain, so it can be re-used wherever the user
-is prompted for this. This includes dialogs, property pages, preference pages, wizard pages and viewer
-cells. Eclipse's JFace offers two interfaces for this, one for viewer cells and one for the rest. In RSE,
-there is a single interface combining the requirements of both, so you can author a single validator that is
-re-usable anywhere. Further, the RSE validator interface and sub-interfaces force additional information to be
-supplied to enhance re-use, such as the maximum length, which can be used to set the text limit for a text field.
-</p>
-
-<h2>RSE Validator Interfaces</h2>
-<p>All RSE validator interfaces and classes are in package <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/package-summary.html">org.eclipse.rse.ui.validators</A></samp>.
-
-<h3>ISystemValidator Interface</h3>
-<p>The primary validator interface is <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html">ISystemValidator</A></samp>, which is extends <samp>org.eclipse.jface.dialogs.IInputValidator</samp>
-and <samp>org.eclipse.jface.viewers.ICellEditorValidator</samp>. Both parent interfaces define an <samp>isValid</samp> method,
-but the former takes a String while the latter takes an Object. They both return a String which is the error message if an
-error was detected, or null if no error detected. The <samp>ISystemValidator</samp> interface adds the following additional methods:
-</p>
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Method</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp>public int <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#getMaximumNameLength()">getMaximumNameLength()</A></samp></TD>
-			<TD>Returns the maximum length allowed for this text. Can be used to set text limit of text widgets.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public SystemMessage <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#getSystemMessage()">getSystemMessage()</A></samp></TD>
-			<TD>If <samp>isValid</samp> returns false, this returns a <samp>SystemMessage</samp> object that offers richer message support than just a string.
-			Return null if you don't support <samp><A href="../messages/uiMessageAPI.html">SystemMessages</A></samp>.
-			Callers don't need to use this if they use <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#validate(java.lang.String)">validate(String)</A></samp> instead of <samp>isValid(String)</samp>.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public SystemMessage <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#validate(java.lang.String)">validate(String text)</A></samp></TD>
-			<TD>An alternative to <samp>isValid</samp> if your validator does support <samp>SystemMessage</samp> objects versus simple strings for error messages.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-<h3>ISystemValidatorUniqueString Interface</h3>
-<p>Often our validation requires checking that the given text is unique, in some given list of existing things, like names say. To facilitate
-this, there is an interface <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html">ISystemValidatorUniqueString</A></samp>, which extends <samp>ISystemValidator</samp> and adds some additional
-methods required for uniqueness validation:
-</p>
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Method</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp>public void <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html#setCaseSensitive(boolean)">setCaseSensitive(boolean caseSensitive)</A></samp></TD>
-			<TD>Specifies whether the test for an existing string should consider case or not.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public void <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html#setExistingNamesList(java.lang.String[])">setExistingNamesList(String[] existingList)</A></samp></TD>
-			<TD>Sets the existing list to test against, as an array.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public void <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html#setExistingNamesList(java.util.Vector)">setExistingNamesList(Vector existingList)</A></samp></TD>
-			<TD>Sets the existing list to test against, as a vector of Strings.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public String[] <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html#getExistingNamesList()">getExistingNamesList()</A></samp></TD>
-			<TD>Returns the existing list that is used to test against.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<p>If you desire to create a unique string validator, you probably will start by subclassing <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUniqueString.html">ValidatorUniqueString</A></samp>.
-</p>
-
-<h3>IValidatorRemoteSelection Interface</h3>
-<p>The third validator interface is <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/IValidatorRemoteSelection.html">IValidatorRemoteSelection</A></samp>, which is specifically intended to be used
-in the remote resource selection dialogs supplied by the RSE. It allows you to decide when to enable the OK button, based on what
-is selected. It contains only the following method:</p>
-<samp>public SystemMessage <A href="../../../reference/api/org/eclipse/rse/ui/validators/IValidatorRemoteSelection.html#isValid(org.eclipse.rse.core.model.IHost, java.lang.Object[], org.eclipse.rse.ui.view.ISystemRemoteElementAdapter[])">isValid(SystemConnection selectedConnection, Object[] selectedObjects, ISystemRemoteElementAdapter[] remoteAdaptersForSelectedObject)</A>;</samp>
-<p>You typically won't implement this interface directly, but rather sublcass <samp>ValidatorRemoteSelection</samp>.</p>
-
-<h3>Validator Samples</h3>
-<ul>
-<li><A href="validatorSample1.html">Sample 1</A></li>
-<li><A href="validatorSample2.html">Sample 2</A></li>
-<li><A href="validatorSample3.html">Sample 3</A></li>
-<li><A href="validatorSample4.html">Sample 4</A></li>
-</ul>
-
-<h2>RSE-Supplied Validators</h2>
-<p>You may be able to avoid creating a new validator if you find that RSE has already supplied one you need. Or, you may find it
-appropriate to simply subclass one of these RSE-supplied validators. All of them are designed to be either used as-is, or configured
-via setter calls, or subclassed, whichever is most convenient.</p>
-<p>All of these validators support rich <samp><A href="../messages/uiMessageAPI.html">SystemMessage</A></samp> objects, versus just simple strings for the error message. When used with the
-RSE dialog, property page or wizard page classes, you should call
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#validate(java.lang.String)">validate(String)</A></samp> and call
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html#setErrorMessage(org.eclipse.rse.ui.messages.SystemMessage)">setErrorMessage</A></samp> with the result. When used
-in other places you should use <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#isValid(java.lang.String)">isValid(String)</A></samp> as it returns just the first-level text of the system message.</p>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Validator Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorCompileCommandLabel.html">ValidatorCompileCommandLabel</A></samp></TD>
-			<TD>Validates the label for a compile command in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorConnectionName.html">ValidatorConnectionName</A></samp></TD>
-			<TD>Validates the name of a connection in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFileName.html">ValidatorFileName</A></samp></TD>
-			<TD>Validates the name of a file in eclipse.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFilterName.html">ValidatorFilterName</A></samp></TD>
-			<TD>Validates the name of a filter in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.html">ValidatorFilterPoolName</A></samp></TD>
-			<TD>Validates the name of a filter pool in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFilterString.html">ValidatorFilterString</A></samp></TD>
-			<TD>Validates the contents of a filter string in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFolderName.html">ValidatorFolderName</A></samp></TD>
-			<TD>Validates the name of a folder in eclipse.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorIntegerInput.html">ValidatorIntegerInput</A></samp></TD>
-			<TD>Validates the given string is a valid integer.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorIntegerRangeInput.html">ValidatorIntegerRangeInput</A></samp></TD>
-			<TD>Validates the given string is a valid integer within a given range.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorLongInput.html">ValidatorLongInput</A></samp></TD>
-			<TD>Validates the given string is a valid long integer.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorLongRangeInput.html">ValidatorLongRangeInput</A></samp></TD>
-			<TD>Validates the given string is a valid long integer within a given range.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorPathName.html">ValidatorPathName</A></samp></TD>
-			<TD>Validates the given string is a valid folder path in eclipse.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorPortInput.html">ValidatorPortInput</A></samp></TD>
-			<TD>Validates the given string is a valid TCP/IP port number.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorProfileName.html">ValidatorProfileName</A></samp></TD>
-			<TD>Validates the name of a system profile in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorRemoteSelection.html">ValidatorRemoteSelection</A></samp></TD>
-			<TD>This is a very special case abstract base class, for validators that decide the enablement of the OK button
-			 in the RSE-supplied remote resource selection dialogs.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorSourceType.html">ValidatorSourceType</A></samp></TD>
-			<TD>A validator for source types, such as a file type or "*.java". It is intended to be subclassed.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorSpecialChar.html">ValidatorSpecialChar</A></samp></TD>
-			<TD>A base class for validators that need to ensure the given string doesn't contain certain characters.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorSystemName.html">ValidatorSystemName</A></samp></TD>
-			<TD>A name validator, to be used when the name being prompted for must follow Java identifier rules.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUniqueString.html">ValidatorUniqueString</A></samp></TD>
-			<TD>A base class, or configurable class, to be used for any validation that requires the string to be unique within a given list.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserActionCommand.html">ValidatorUserActionCommand</A></samp></TD>
-			<TD>Validates the command of a user defined action in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserActionComment.html">ValidatorUserActionComment</A></samp></TD>
-			<TD>Validates the comment of a user defined action in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserActionName.html">ValidatorUserActionName</A></samp></TD>
-			<TD>Validates the name of a user defined action in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserId.html">ValidatorUserId</A></samp></TD>
-			<TD>Validates a user ID. Does only basic checking, intended to be subclassed.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserTypeName.html">ValidatorUserTypeName</A></samp></TD>
-			<TD>Validates the name of a named type in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserTypeTypes.html">ValidatorUserTypeTypes</A></samp></TD>
-			<TD>Validates the type list of a named type in the RSE.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample1.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample1.html
deleted file mode 100755
index b323525fb..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample1.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validator Sample One</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validator Sample One</h1>
-<p>This is an example of a validator written from scratch, that just validates a customer name field is not empty.
-Note that while that is all is does today, the power of encapsulation is that we can easily add additional error
-checking in the future, and all dialogs or wizards that use the validator will pick up that change.
-<pre>
-
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-import org.eclipse.rse.samples.*;
-import org.eclipse.rse.ui.messages.SystemMessage;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-
-/**
- * <I>A validator for a customer name. We simply ensure it is not empty, but this could easily be expanded.</I>
- */
-public class <B>SampleNameValidator</B> implements ISystemValidator
-{
-	private SystemMessage currentMsg;
-	private SystemMessage emptyMsg;
-
-	/**
-	 * <I>Constructor for SampleNameValidator.</I>
-	 */
-	public <B>SampleNameValidator</B>()
-	{
-		super();
-		emptyMsg = SamplesPlugin.<A
-	href="../messages/uiMessageAPI.html#getPluginMessage">getPluginMessage</A>(<A
-	href="../messages/sampleMessageFile.html#SPPD1000">&quot;SPPD1000&quot;</A>);
-	}
-
-	/**
-	 * <I>Required ISystemValidator interface method.</I>
-	 * <I>Return the maximum length for customer names. We return 100.</I>
-	 */
-	public int <B>getMaximumNameLength</B>()
-	{
-		return 100;
-	}
-
-	/**
-	 * <I>Required ISystemValidator interface method.</I>
-	 * <I>@see org.eclipse.rse.ui.validators.ISystemValidator#getSystemMessage()</I>
-	 */
-	public SystemMessage <B>getSystemMessage</B>()
-	{
-		return currentMsg;
-	}
-
-	/**
-	 * <I>Required ISystemValidator interface method.</I>
-	 * <I>@see org.eclipse.rse.ui.validators.ISystemValidator#validate(String)</I>
-	 */
-	public SystemMessage <B>validate</B>(String text)
-	{
-		isValid(text);
-		return currentMsg;
-	}
-	/**
-	 * <I>@see org.eclipse.jface.dialogs.IInputValidator#isValid(String)</I>
-	 */
-	public String <B>isValid</B>(String newText)
-	{
-		if ((newText==null) || (newText.length()==0))
-		  currentMsg = emptyMsg;
-		// todo: more error checking
-		
-		if (currentMsg != null)
-		  return currentMsg.getLevelOneText();
-		else
-		  return null;
-	}
-	/**
-	 * <I>@see org.eclipse.jface.viewers.ICellEditorValidator#isValid(Object)</I>
-	 */
-	public String <B>isValid</B>(Object value)
-	{
-		if (value instanceof String)
-		  return isValid((String)value);
-		return null;
-	}
-}
-</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample2.html
deleted file mode 100755
index 5b2d63fe4..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample2.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validator Sample Two</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validator Sample Two</h1>
-<p>This is an example of a validator written by extending an existing RSE-supplied validator, and
-simply supplying unique messages.
-<pre>
-
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-import org.eclipse.rse.ui.validators.ValidatorIntegerRangeInput;
-import org.eclipse.rse.samples.*;
-
-/**
- * <I>An example of a customized validator, that prompts for a birth year.</I>
- */
-public class <B>SampleBirthYearValidator</B> extends ValidatorIntegerRangeInput
-{
-	/**
-	 * <I>Constructor. Specifies the valid range, and unique error messages.</I>
-	 */
-	public SampleBirthYearValidator()
-	{
-		super(1900, 2003);
-		super.setErrorMessages(SamplesPlugin.<A
-	href="../messages/uiMessageAPI.html#getPluginMessage">getPluginMessage</A>(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1001">SPPD1001</A>&quot;),  // <I>empty</I>
-		                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1002">SPPD1002</A>&quot;),  // <I>non-numeric</I>
-                                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1003">SPPD1003</A>&quot;)); // <I>out of range</I>
-	}
-
-}</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample3.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample3.html
deleted file mode 100755
index 551b14350..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample3.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validator Sample Three</title></head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validator Sample Three</h1>
-<p>This is an example of a validator written by extending an existing RSE-supplied validator, and
-simply supplying unique messages.
-<pre>
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-import org.eclipse.rse.ui.validators.ValidatorIntegerRangeInput;
-import org.eclipse.rse.samples.*;
-
-/**
- * <I>An example of a customized validator, that prompts for a birth month.</I>
- */
-public class <B>SampleBirthMonthValidator</B> extends ValidatorIntegerRangeInput
-{
-	/**
-	 * <I>Constructor. Specifies the valid range, and unique error messages.</I>
-	 */
-	public SampleBirthMonthValidator()
-	{
-		super(1, 12);
-		super.setErrorMessages(SamplesPlugin.<A
-	href="../messages/uiMessageAPI.html#getPluginMessage">getPluginMessage</A>(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1004">SPPD1004</A>&quot;), // <I>empty</I>
-		                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1005">SPPD1005</A>&quot;), // <I>non-numeric</I>
-                                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1006">SPPD1006</A>&quot;)); // <I>out of range</I>
-	}
-
-}</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample4.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample4.html
deleted file mode 100755
index 23fdb97f2..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/validators/validatorSample4.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validator Sample Four</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validator Sample Four</h1>
-<p>This is an example of a validator written by extending an existing RSE-supplied validator, and
-simply supplying unique messages.
-<pre>
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-import org.eclipse.rse.core.ui.validators.ValidatorIntegerRangeInput;
-import org.eclipse.rse.samples.*;
-
-/**
- * <I>An example of a customized validator, that prompts for a birth day.</I>
- */
-public class <B>SampleBirthDayValidator</B> extends ValidatorIntegerRangeInput
-{
-	/**
-	 * <I>Constructor. Specifies the valid range, and unique error messages</I>.
-	 */
-	public SampleBirthDayValidator()
-	{
-		super(1, 31);
-		super.setErrorMessages(SamplesPlugin.<A
-	href="../messages/uiMessageAPI.html#getPluginMessage">getPluginMessage</A>(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1007">SPPD1007</A>&quot;), // <I>empty</I>
-		                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1008">SPPD1008</A>&quot;), // <I>non-numeric</I>
-                                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1009">SPPD1009</A>&quot;)); // <I>out of range</I>
-	}
-
-}</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/widgets/uiWidgetsAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/widgets/uiWidgetsAPI.html
deleted file mode 100755
index 39f1366ed..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/widgets/uiWidgetsAPI.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Widgets API</title>
-</head>
-
-<body bgcolor="#ffffff">
-
-<h1>RSE Widgets API</h1>
-<p>Whether coding dialogs, property pages, preference pages or wizard pages we need to write the code to display
-and process the widgets in the client area. The RSE offers some help in this area in two ways:
-</p>
-<ol>
-<li>A <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemWidgetHelpers.html">SystemWidgetHelpers</A></samp>
-class full of static methods to make it easier to create SWT widgets.
-<li>A few re-usable widgets that extend SWT.
-</ol>
-
-<h2>SystemWidgetHelpers Class</h2>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemWidgetHelpers.html">SystemWidgetHelpers</A></samp>
-class in <samp><A href="../../../reference/api/org/eclipse/rse/ui/package-summary.html">org.eclipse.rse.ui</A></samp>
-is chock full of static methods to simplify the work in populating a GridLayout composite with widgets. The GridLayout composite is the most
-flexible and useful of the layouts, yet the most work to code to. These methods will help with that. The methods include:
-</p>
-<ul>
-<li>Methods for creating a GridLayout composite. You typically call this at the start of your code that populates the client area.
-<li>Methods for creating all the common SWT controls, with the GridData values specified for you.
-<li>Methods for creating readonly flavours of input controls, such as a Text field or Combo box.
-<li>Methods for creating labeled entry fields that have a prompting label in front of an input widget.
-<li>Methods for automatically assigning unique mnemonics to all input widgets on a given composite or page.
-<li>Methods for setting composite, widget, action and menu item contextual help.
-<li>Methods for creating RSE-supplied widgets.
-<li>Methods for creating populated combo boxes for connections, remote folders, system types and host names.
-</ul>
-
-<h2>RSE-Supplied Widgets</h2>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/package-summary.html">org.eclipse.rse.ui.widgets</A></samp>
-package contains some specialized widgets you may find a use for:
-</p>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Widget Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/SystemHistoryCombo.html">SystemHistoryCombo</A></samp></TD>
-			<TD>A entry field that remembers its previous values and shows them in a dropdown so the user can easily re-select a previously typed value. The history is maintained for you, and is indexed by a key. This allows the combos to share history across numerous dialogs, property pages or wizard pages. The history can be bounded and pre-filled, and the user can clear the history at any time. This handy widget is used extensively within the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/InheritableEntryField.html">InheritableEntryField</A></samp></TD>
-			<TD>An entry field with an left-right arrow beside it. When toggled left, the entry field is not editable and displays a supplied value. When toggled right, the entry field is editable. Useful in cases where the user can choose between an inherited or default value, or enter their own value.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/SystemPortPrompt.html">SystemPortPrompt</A></samp></TD>
-			<TD>Uses the InheritableEntryField to prompt for a TCP/IP port, where toggling to the left means port 0, or let the &quot;first available port&quot;.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/SystemHostCombo.html">SystemHostCombo</A></samp></TD>
-			<TD>This is a combo box that displays the currently defined RSE system connections. The list can be subset by system type or types. Further, you can optionally display a New button beside the combo that allows the user to create a new connection.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<p>There are also many useful widgets related to the selection of remote files or folders, in package
-<samp><A href="../../../reference/api/org/eclipse/rse/files/ui/widgets/package-summary.html">org.eclipse.rse.files.ui.widgets</A></samp>
-
-<P><BR></P>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/api/wizards/uiWizardsAPI.html b/rse/doc/org.eclipse.rse.doc.isv/guide/api/wizards/uiWizardsAPI.html
deleted file mode 100755
index 89adf7765..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/api/wizards/uiWizardsAPI.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Wizards API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Wizards API</h1>
-<p>Typically in eclipse GUI design we use a wizard to create new things, and a dialog
-to prompt for secondary information, or update existing things. The Remote System Explorer
-can offer help in creating wizards, just as it does in creating dialogs.
-</p>
-
-<h2>RSE-Supplied Base Classes for Wizards</h2>
-<p>The RSE offers the following classes, in package
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/package-summary.html">org.eclipse.rse.ui.wizards</A></samp> to simplify the creation of wizards.</p>
-
-<h3>The <samp>AbstractSystemWizardPage</samp> class</h3>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</A></samp> abstract base class extends the
-JFace <samp>WizardPage</samp> class to offer the following benefits to subclasses:</p>
-<ol>
- <li>Designed to work in conjunction with <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html">AbstractSystemWizard</A></samp>,
-     propogating settings from the wizard to the individual wizard pages.
- <li>Supports using the overall wizard page title as set
-     by <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setWizardPageTitle(java.lang.String)">setWizardPageTitle(String)</A></samp>
-     in <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html">AbstractSystemWizard</A></samp>,
-     if no title specified in the constructor.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html#setHelp(java.lang.String)">setHelp(String)</A></samp> method to set the wizard page's overall contextual help
- <li>Implements <samp><A
-		href="../messages/uiMessageAPI.html#ISystemMessageLine">ISystemMessageLine</A></samp> so supports setting error messages as
-      either strings or, preferably, <samp><A
-		href="../messages/uiMessageAPI.html#SystemMessage">SystemMessage</A></samp> objects.
- <li>Supports automatic assignment of unique mnemonics for all input-capable controls on the page, to aid in accessibility.
- <li>Supports setting a default-focus control, which gets initial focus when the page is shown.
- <li>Supports helper methods to aid in population of the client area:
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html#addSeparatorLine(org.eclipse.swt.widgets.Composite, int)">addSeparatorLine(Composite,int)</A></samp>,
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html#addFillerLine(org.eclipse.swt.widgets.Composite, int)">addFillerLine(Composite,int)</A></samp> and
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html#addGrowableFillerLine(org.eclipse.swt.widgets.Composite, int)">addGrowableFillerLine(Composite,int)</A></samp>.
-</ol>
-
-
-<h3><A name="AbstractSystemWizard"></A>The <samp>AbstractSystemWizard</samp> class</h3>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html">AbstractSystemWizard</A></samp> abstract base class extends the JFace <samp>Wizard</samp>
-class to offer the following benefits to subclasses:</p>
-<ol>
- <li>Designed to work in conjunction with the <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseWizardAction.html">SystemBaseWizardAction</A></samp>,
-     and <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemWizardDialog.html">SystemWizardDialog</A></samp> classes, propogating settings
-     from these to the wizard, and further propogating those to the individual wizard pages.
- <li>The overall wizard title and image can be set via the constructor or setter methods.
- <li>Supports setting an input object, and getting an output object. This is exploited by the
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseWizardAction.html">SystemBaseWizardAction</A></samp> class, when this wizard is launched from a subclass of that action class.
- <li>Supports setting a wizard page title via <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setWizardPageTitle(java.lang.String)">setWizardPageTitle(String)</A></samp>, that all
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</A></samp> pages will use by default for
-     their title, if the non-title constructor is used for that page.
- <li>If being hosted by a <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemWizardDialog.html">SystemWizardDialog</A></samp>, supports dynamically
-     updating the wizard size via <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#updateSize()">updateSize()</A></samp>,
-     if dynamic content is added to a wizard page, causing the page to grow beyond its initial size.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setHelp(java.lang.String)">setHelp(String)</A></samp> method to set the overall wizard's contextual help. This is propogated to each
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</A></samp> as it is added.
- <li>Supports setting the viewer that launched this wizard, as wizards often need to know this so they can update the UI upon Finish.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#wasCancelled()">wasCancelled()</A></samp> method so callers can easily test if the wizard was cancelled by the user.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setMinimumPageSize(int, int)">setMinimumPageSize(int,int)</A></samp> method to set the minimum width and height of the wizard.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setPageError(org.eclipse.jface.wizard.IWizardPage)">setPageError(IWizardPage)</A></samp> method that can be called in performFinish when an error is detected on a
-     non-current page. This issues a message telling the user there is an error on another page.
-</ol>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/file_conn.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/file_conn.gif
deleted file mode 100755
index 136f576a3..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/file_conn.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/file_profiles.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/file_profiles.gif
deleted file mode 100755
index e0ad94fca..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/file_profiles.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/images/configexample.jpg b/rse/doc/org.eclipse.rse.doc.isv/guide/images/configexample.jpg
deleted file mode 100755
index 62197bc69..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/images/configexample.jpg
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/images/layers.jpg b/rse/doc/org.eclipse.rse.doc.isv/guide/images/layers.jpg
deleted file mode 100755
index 0dd8792ec..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/images/layers.jpg
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/overview.html b/rse/doc/org.eclipse.rse.doc.isv/guide/overview.html
deleted file mode 100755
index de5f0c361..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/overview.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<title>Remote System Explorer Overview</title>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body bgcolor="#ffffff">
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/ChangeFilterDialog_Default.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/ChangeFilterDialog_Default.gif
deleted file mode 100755
index 55e98e121..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/ChangeFilterDialog_Default.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/NewConnection.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/NewConnection.gif
deleted file mode 100755
index 567d476dd..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/NewConnection.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/NewFilterWizard_Default.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/NewFilterWizard_Default.gif
deleted file mode 100755
index e39164720..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/NewFilterWizard_Default.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/RSView_iSeries.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/RSView_iSeries.gif
deleted file mode 100755
index c268d212f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/RSView_iSeries.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/other.html b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/other.html
deleted file mode 100755
index 7ff8df528..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/other.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Other Relevant Extension Points</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Other Relevant Extension Points</h1>
-<p>There are some Eclipse extension points that are relevant as-is to the Remote System Explorer,
-which we list here. We do not describe how to use these extension points here, except to document
-the information needed to enable them to in Remote System Explorer.
-</p>
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Extension Point</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><a name="viewActions"></a>
-			<samp><a href="../../../org.eclipse.platform.doc.isv/guide/workbench_basicext_viewActions.htm">org.eclipse.ui.viewActions</a></samp></TD>
-			<TD>For adding actions to the pulldown menu in any view's local toolbar, or to the toolbar itself.
-			To use this you need to know the ID of the RSE views, for the <samp>targetID</samp> attribute: There are:
-			<ul>
-			<li><samp>org.eclipse.rse.ui.view.systemView</samp> for the primary
-			  <A href="view_RS.gif">Remote Systems</A> view.
-			<li><samp>org.eclipse.rse.ui.view.teamView</samp> for the
-			  <A href="view_Team.gif">Team</A> view in the RSE perspective.
-			<li><samp>org.eclipse.rse.ui.view.systemTableView</samp> for the
-			  <A href="view_Table.gif">Remote System Details</A> view in the RSE perspective.
-			</ul>
-			</TD>
-		</TR>
-		<TR>
-			<TD><a name="property"></a>
-			<samp>
-			   <!-- a href="../../../org.eclipse.platform.doc.isv/guide/preferences_prop_contribute.htm" -->
-			   <a href="propertypage.html">
-			   org.eclipse.ui.propertyPages</a></samp></TD>
-			<TD>For adding property pages for objects within the
-			Remote System Explorer. To use this you need to know the class type
-			of these objects for the <samp>objectClass</samp> attribute of the <samp>&lt;page&gt;</samp> element:
-			<ul>
-            <li>Connections: <samp><A href="../../reference/api/org/eclipse/rse/core/model/IHost.html">org.eclipse.rse.core.model.IHost</A></samp></li>
-            <li>SubSystems: <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp></li>
-            <li>Filter Pools: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp></li>
-            <li>Filters: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp></li>
-       		<li>Remote Elements: your model objects, which are adaptable to <samp>ISystemViewElementAdapter</samp>.
-          		For the RSE-provided reusable file, process and shell subsystems, these are
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFile.html">IRemoteFile</a></samp>, 
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/processes/core/subsystem/IRemoteProcess.html">IRemoteProcess</a></samp> and
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCommandShell.html">IRemoteCommandShell</a></samp>, respectively.
-          		In the Remote Command View, you'll also find
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteError.html">IRemoteError</a></samp> and 
-    	      <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteOutput.html">IRemoteOutput</a></samp>. 
-			</li>
-			</ul>
-            Because all RSE elements adapt to 
-            <samp><A href="../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp>,
-            which in turn implements 
-            <samp><A href="../../../org.eclipse.platform.doc.isv/reference/api/org/eclipse/ui/IActionFilter.html">org.eclipse.ui.IActionFilter</A></samp>,
-            it is possible to scope your property pages to only appear for certain system types or subsystems, using
-            the extension point's <samp>&lt;filter&gt;</samp> element. For example:<br>
-            <pre><code>
-               &lt;extension point=&quot;org.eclipse.ui.propertyPages&quot;&gt;
-                   &lt;page name=&quot;Team Info&quot;
-                         class=&quot;samples.ui.propertypages.TeamFilterPropertyPage&quot;
-                         id=&quot;samples.ui.pp.filter.team&quot;
-                         objectClass=&quot;org.eclipse.rse.core.filters.ISystemFilterReference&quot; &gt;
-                    <b>&lt;filter name=&quot;subsystemConfigurationId&quot; value=&quot;samples.subsystems.factory&quot;/&gt;</b>
-                   &lt;/page&gt;
-               &lt;/extension&gt;
-            </code></pre>
-            See <a href="#scoping">Scoping</a> for all the filter <samp>names</samp> supported by RSE objects.
-            </TD>
-		</TR>
-		<TR>
-			<TD><a name="popup"></a>
-			<samp>
-			  <!-- a href="../../../org.eclipse.platform.doc.isv/guide/workbench_basicext_popupMenus.htm" -->
-			  <a href="popup.html">
-			  org.eclipse.ui.popupMenus</a></samp>
-			</TD>
-			<TD>For adding pop-up menu actions for objects within the Remote System Explorer.
-			To use this you need to know the class type of these objects for the <samp>objectClass</samp> attribute
-			of the &lt;objectContribution&gt; element:
-			<ul>
-            <li>Connections: <samp><A href="../../reference/api/org/eclipse/rse/core/model/IHost.html">org.eclipse.rse.core.model.IHost</A></samp></li>
-            <li>SubSystems: <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp></li>
-            <li>Filter Pools: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp></li>
-            <li>Filters: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp></li>
-       		<li>Remote Elements: your model objects, which are adaptable to <samp>ISystemViewElementAdapter</samp>.
-          		For the RSE-provided reusable file, process and shell subsystems, these are
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFile.html">IRemoteFile</a></samp>, 
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/processes/core/subsystem/IRemoteProcess.html">IRemoteProcess</a></samp> and
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCommandShell.html">IRemoteCommandShell</a></samp>, respectively.
-          		In the Remote Command View, you'll also find
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteError.html">IRemoteError</a></samp> and 
-    	      <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteOutput.html">IRemoteOutput</a></samp>. 
-			</li>
-			</ul>
-            Because all RSE elements adapt to 
-            <samp><A href="../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp>,
-            which in turn extends 
-            <samp><A href="../../../org.eclipse.platform.doc.isv/reference/api/org/eclipse/ui/IActionFilter.html">org.eclipse.ui.IActionFilter</A></samp>,
-            it is possible to scope your actions to only appear for certain system types or subsystems, using
-            the extension point's <samp>&lt;filter&gt;</samp> element. For example:<br>
-            <pre><code>
-               &lt;extension point=&quot;org.eclipse.ui.popupMenus&quot;&gt;
-                   &lt;objectContribution
-                         id =&quot;samples.ui.actions.TeamFilterActions&quot;
-                         objectClass=&quot;org.eclipse.rse.core.filters.ISystemFilterReference&quot;&gt;
-                         <b>&lt;filter name=&quot;subsystemConfigurationId&quot; value=&quot;samples.subsystems.factory&quot;/&gt;</b>
-                         &lt;action id=&quot;samples.ui.actions.TeamFilterAction1&quot;
-                                 label=&quot;Sample Team Filter Action&quot;
-                                 class=&quot;samples.ui.actions.ShowJarContents&quot;&gt;
-                         &lt;/action&gt;
-                   &lt;/objectContribution&gt;
-               &lt;/extension&gt;
-             </code></pre>
-            See <a href="#scoping">Scoping</a> for all the filter <samp>names</samp> supported by RSE objects.
-            </TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-<a name="scoping"></a><h2>Scoping</h2>
-<p>For the <samp>org.eclipse.ui.propertyPages</samp> and <samp>org.eclipse.ui.popupMenus</samp> extension points, it is
-possible to scope your property pages and actions to only filters in a particular subsystem, or connections of a
-particular system type, say. These extension points support the <samp>&lt;filter&gt;</samp> element, which
-allows you to specify a property name, and a property value, such that the page or action will only show if
-that property's value is the one given:<br>
-<pre><code>
-  &lt;filter name="<i>name</i>" value="<i>value</i>"/&gt;
-</code></pre>
-It is up to the selected object's adapter to perform this test, in its
-<code>testAttribute(Object target,String <i>name</i>,String <i>value</i>)</code> method. This method is implemented for the adapters for every object shown in the
-Remote Systems view, and what follows is a list of the tests it will do on the given <samp><i>value</i></samp>,
-for the given <samp><i>name</i></samp>:</p>
-<ul>
-<li><b><samp>"name"</samp></b>. Will test the <i>value</i> for an exact match on an object's name,
-or beginning-of-name match if ends with an asterisk.
-<li><b><samp>"type"</samp></b>. Will test the <i>value</i> for an exact match on an object's type.
-<li><b><samp>"offline"</samp></b>.Will test the <i>value</i> against "true" if the user is working
-in "offline" mode or "false" if not. Currently only supported for iSeries connections.
-<li><b><samp>"connected"</samp></b>. Will test the <i>value</i> against "true" if the connection
-containing the selected object is active or "false" if not.
-<li><b><samp>"hasChildren"</samp></b>. Will test the <i>value</i> against "true" if this object's
-adapter reports that it has children or "false" if it doesn't have children.
-<li><b><samp>"systemType"</samp></b>. Will test the <i>value</i> for an exact match on the system type of
-this object's parent SystemConnection object.
-You can specify multiple values if you comma-separate them.
-<li><b><samp>"subsystemConfigurationId"</samp></b>. Will test the <i>value</i> for an exact match on the
-<samp>ID</samp> of the subsystem factory that created this object's subsystem. Returns false for SystemConnection objects.
-You can specify multiple values if you comma-separate them.
-<li><b><samp>"subsystemConfigurationCategory"</samp></b>. Will test the <i>value</i> for an exact match
-on the <samp>category</samp> of the subsystem factory that created this object's subsystem.
-You can specify multiple values if you comma-separate them.
-</ul>
-
-<p>For system filter objects of type <samp>org.eclipse.rse.core.filters.ISystemFilterReference</samp>,
-the following names are also supported:
-<ul>
-<li><b><samp>"filterType"</samp></b>. Will test the <i>value</i> for an exact match on the selected filter's
-untranslated type, as set internally. The only RSE-supplied subsystem to support multiple filter types is
-the iSeries Objects subsystem for iSeries connections. It contains these types:
-  <ul>
-       <li><samp>"Library"</samp>.
-       <li><samp>"LibraryList"</samp>.
-       <li><samp>"Object"</samp>.
-       <li><samp>"Member"</samp>.
-  </ul>
-</ul>
-
-<p>For the <samp>org.eclipse.ui.popupMenus</samp> extension point, you can also use the above names
-in the &lt;visibility&gt; and &lt;enablement&gt; elements, for extreme flexibility in when
-the action is shown, and when it is enabled or disabled. These map to the <samp>objectState</samp>
-attribute. For example:
-<pre><code>
-   &lt;enablement&gt;
-       &lt;objectState name="hasChildren" value="true"/&gt;
-   &lt;/enablement&gt;
-</code></pre>
-
-
-<p>Be aware the <samp>&lt;visibility&gt;</samp> element is available at the
-<samp>&lt;objectContribution&gt;</samp> level, while the <samp>&lt;enablement&gt;</samp>
-element is available at the <samp>&lt;Action&gt;</samp> level.
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/popup.html b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/popup.html
deleted file mode 100755
index 63fbe4009..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/popup.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Plugging In Popup Menu Actions</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Plugging In Popup Menu Actions</h1>
-<p>The <samp><a href="../../../org.eclipse.platform.doc.isv/reference/extension-points/org_eclipse_ui_popupMenus.html">org.eclipse.ui.popupMenus</a></samp> extension point 
-from the base Eclipse Platform is used to contribute popup menus.
-</p>
-<p>The primary element in the markup for this extension point is the <b><samp>&lt;objectContribution&gt;</samp></b> element,
-which scopes the remote objects to which the child elements apply:
-</p>
-<ul>
-<li><b>id</b>.A unique ID for this extension point. Not used, but required by Eclipse.</li>
-<li><a name="objectClass"></a>
-	<b>objectClass</b>. The element on which the popup menu action should appear.
-	To use this you need to know the class type of these objects for the <samp>objectClass</samp> attribute
-	of the &lt;objectContribution&gt; element:
-	<ul>
-       <li>Connections: <samp><A href="../../reference/api/org/eclipse/rse/core/model/IHost.html">org.eclipse.rse.core.model.IHost</A></samp></li>
-       <li>SubSystems: <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp></li>
-       <li>Filter Pools: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp></li>
-       <li>Filters: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp></li>
-       <li>Remote Elements: your model objects, which are adaptable to <samp>ISystemViewElementAdapter</samp>.
-          For the RSE-provided reusable file, process and shell subsystems, these are
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFile.html">IRemoteFile</a></samp>, 
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/processes/core/subsystem/IRemoteProcess.html">IRemoteProcess</a></samp> and
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCommandShell.html">IRemoteCommandShell</a></samp>, respectively.
-          In the Remote Command View, you'll also find
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteError.html">IRemoteError</a></samp> and 
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteOutput.html">IRemoteOutput</a></samp>. 
-       </li>
-	</ul></li>
-<li><a name="filtering"></a>
-	<b><i>filtering attributes</i></b>.To scope which remote objects these actions should show up for.
-    Because all RSE elements adapt to 
-    <samp><A href="../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp>,
-    which in turn extends 
-    <samp><A href="../../../org.eclipse.platform.doc.isv/reference/api/org/eclipse/ui/IActionFilter.html">org.eclipse.ui.IActionFilter</A></samp>,
-    it is possible to scope your actions to only appear for certain system types or subsystems, using
-    the extension point's <samp>&lt;filter&gt;</samp> element. For example:<br>
-    <pre><code>
-       &lt;extension point=&quot;org.eclipse.ui.popupMenus&quot;&gt;
-           &lt;objectContribution
-                 id =&quot;samples.ui.actions.TeamFilterActions&quot;
-                 objectClass=&quot;org.eclipse.rse.core.filters.ISystemFilterReference&quot;&gt;
-                 <b>&lt;filter name=&quot;subsystemConfigurationId&quot; value=&quot;samples.subsystems.factory&quot;/&gt;</b>
-                 &lt;action id=&quot;samples.ui.actions.TeamFilterAction1&quot;
-                         label=&quot;Sample Team Filter Action&quot;
-                          class=&quot;samples.ui.actions.ShowJarContents&quot;&gt;
-                 &lt;/action&gt;
-           &lt;/objectContribution&gt;
-       &lt;/extension&gt;
-    </code></pre>
-    See <a href="other.html#scoping">Scoping</a> for all the filter <samp>names</samp> supported by RSE objects.
-    </li>
-</ul>
-<p>Within each <samp>&lt;objectContribution&gt;</samp> element are zero or more <B><samp>&lt;menu&gt;</samp></B> elements for
-optionally defining cascading submenus, and &lt;<B>action</B>&gt; elements for the actual actions.
-To have the actions show up in a cascading menu, use the <samp>&lt;menu&gt;</samp> element with these
-attributes:
-</p>
-<ul>
-<li><b>id</b>. Unique id for the submenu. Used later to target actions into this cascading submenu.
-<li><b>label</b>. The text the user sees in the pop-up menu.
-<li><b>path</b>. For multi-cascading menus, use this attribute to identify a previously specified menu that
-this menu is to be nested within. The syntax is a bit tricky. It is <samp>id/group</samp>, where <samp>id</samp>
-matches the id attribute from a previous <samp>&lt;menu&gt;</samp> element, and <samp>group</samp> matches the name attribute
-of a <samp>&lt;separator&gt;</samp> sub-element within that previous <samp>&lt;menu&gt;</samp> element. For multi-nesting, repeat the <samp>id</samp>
-part, as in <samp>id1/id2/id3/group</samp>. In this case, there must be a <samp>&lt;menu&gt;</samp> element with and id value of
-<samp>id3</samp> that refers to another <samp>&lt;menu&gt;</samp> element <samp>id2</samp> via is path attribute, which in turn
-refers to <samp>&lt;menu&gt;</samp> element <samp>id1</samp> via its <samp>path</samp> attribute. If the group does not exist,
-it will be created.
-<br>
-For the root cascading menu, you can also use this to specify a group within the remote object's pop-up,
-for where to place this cascading menu. The default is the <samp>additions</samp> group, which is near the
-bottom of the pop-up menu. The RSE-supplied groups for pop-up menus are listed shortly in Table 4. There are
-also a few RSE-supplied cascading menus listed in Table 4, which can be specified for the id prefix in order
-to add a cascading menu to an RSE-supplied cascading menu.
-</ul>
-<P>Within each <samp>&lt;menu&gt;</samp> element are one or more <b><samp>&lt;separator&gt;</samp></b> elements that partition the cascading
-menu into groups. Groups are simply named physical areas of the menu. The order in which they are defined is the order they
-appear in the menu. Actions always go into groups. Groups avoid the need to specify relative information to identify where
-within a pop-up menu to place actions. There is only one attribute for this element:
-</P>
-<ul>
-<li><b>name</b>. The name to give this group. Users do not see this, but it is used in the <samp>action</samp> element to identify where to place
-the action within this submenu. Groups exist in the order they are defined, top to bottom. Between groups is a separator unless
-contiguous groups are empty. There is always a default group named <samp>additions</samp> supplied for you.
-</ul>
-<p>Finally, within <samp>&lt;objectContribution&gt;</samp> elements are one or more <b><samp>&lt;action&gt;</samp></b> elements identifying the
-actual actions, each of which only show up if the scoping criteria is met for that parent <samp>&lt;objectContribution&gt;</samp>
-element. The attributes for <samp>&lt;action&gt;</samp> elements are:
-</p>
-<ul>
-<li><b>id</b>. Unique id for the action.
-<li><b>label</b>. What the user sees in the pop-up menu.
-<li><b>icon</b>. Optional icon to show beside the label. This is the name of a file qualified by a path relative to this plugin's directory.
-<li><b>class</b>. Name of the class extending one of the classes listed in the documentation.
-<li><b>menubarPath</b>. Where to put this action. This is optional and only required when you do not want the action to go into the
-default location within the remote object's pop-up menu. This is a group name, optionally preceded by slash-delimited Ids for actions
-that go inside cascading menus, where each Id matches an id attribute from a previously specified <samp>&lt;menu&gt;</samp> element.
-If no menubarPath is specified, the action goes into the <samp>&lt;additions&gt;</samp> area of the object's popup menu, which is
-near the bottom of the pop-up menu. The RSE-supplied groups for remote object pop-up menus are listed in Table 4, as well as menu Ids
-for RSE-supplied cascading menus, should you wish to add an action to an RSE-supplied cascading menu.
-<li><b>enablesFor</b>. Tells when to enable this action based on how many items are selected. Typically, specify "1" for
-single-selection or "+" for multiple-selection. You can also change the enabled state of your action within your class,
-by calling the <samp>setEnabled(boolean)</samp> method or overriding the <samp>getEnabled(Object[] currentlySelected)</samp> method that is called
-when the selection changes.
-<li><b>state</b>. Specify if this is a toggle (checkable) menu item. Specify "true" or "false" to indicate initial
-toggle status. Call <samp>setChecked(boolean)</samp> in your class to change the toggled state.
-<li><b>helpContextId</b>. Allows F1 help for this action. Optional.
-</ul>
-<p>
-The <samp>path</samp> attribute for the <samp>&lt;menu&gt;</samp> element, and the <samp>menubarPath</samp> attribute for the <samp>&lt;action&gt;</samp>
-element, are the most difficult to master. The rules are reasonably simple though:
-</p>
-<ol>
-<li>To have your action show up in the initial pop-up menu, just specify a group name on the <samp>menubarPath</samp> attribute. That name can be
-one of the RSE-supplied group names defined in Table 4, or your own group name, which will be created and appended to the end of the
-pop-up menu. The default group is <samp>"additions"</samp>.
-<br>Example: <samp>menubarPath="myGroup"</samp>
-<li>To have your action show up in a simple RSE-supplied cascading menu within the pop-up menu, in your <samp>&lt;action&gt;</samp> element,
-specify the RSE-supplied menu ID from Table 4 in the <samp>menubarPath</samp> attribute, then a slash followed by the name of a group. The only
-RSE-supplied group for cascading menus is <samp>"additions"</samp>. If you specify anything else for the group, the group will be created for you
-at the bottom of the menu.
-<br>Example: <samp>menubarPath="menu.new/myGroup"</samp>
-<li>To have your action show up in a simple cascading menu of your own, first define the menu with a <samp>&lt;menu&gt;</samp> element,
-giving it an ID via the id attribute. In your <samp>&lt;action&gt;</samp> element, in the <samp>menubarPath</samp> attribute specify that id followed by a slash
-and then the name of a group. That group name can be one specified on a <samp>&lt;separator&gt;</samp> element within your menu, or a new name, which
-results in a new group at the bottom of the menu. In the latter case, there will be no separators delimiting the group, while in the former case
-there will be.
-<br>Example: <samp>menubarPath="myMenu1/myGroup"</samp>
-<li>To have your action show up in a multi-cascading menu of your own, define each of the menu via <samp>&lt;menu&gt;</samp> elements. For all but the
-first, identify the parent menu using the path attribute, specifying the Ids for each of the parent menus, slash-separated. At
-the end of the path attribute, specify the group within the final parent menu into which this menu will be placed. Again, this
-will either be a group defined with a <samp>&lt;separator&gt;</samp> element in the parent <samp>menu</samp> element, or specify a non-existing group that will be
-created for you. Once your multi-cascading menu is created, you identify it in your <samp>&lt;action&gt;</samp> element via the <samp>menubarPath</samp> attribute,
-specifying all the menu Ids up to the final menu, slash-separated, and then the group within that final menu, as usual.
-<br>Example: <samp>menubarPath="myMenu1/myMenu2/myGroup"</samp>
-</ol>
-
-<h2>Programming Details</h2>
-<p>To use this extension point you will create a class that implements
-<samp>
-<A href="../../../org.eclipse.platform.doc.isv/reference/api/org/eclipse/ui/IObjectActionDelegate.html">IObjectActionDelegate</A>
-</samp> from the Eclipse platform.
-</p>
-<br><hr>
-<p>See the <a href="../tutorial/popup.html">pop-up menu action tutorial</a> for a step-by-step example.</p>
-<p>See the <a href="../../../org.eclipse.platform.doc.isv/guide/workbench_basicext_popupMenus.htm">Eclipse Platform Programmer's Guide</a>
-for more background information.</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/propertypage.html b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/propertypage.html
deleted file mode 100755
index 2d85c396f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/propertypage.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<!-- David Dykstal (IBM) - [193740] fix links for referenced classes -->
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Plugging In Property Pages</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Plugging In Property Pages</h1>
-<p>The <samp><a href="../../../org.eclipse.platform.doc.isv/reference/extension-points/org_eclipse_ui_propertyPages.html">org.eclipse.ui.propertyPages</a></samp> extension point 
-from the base Eclipse Platform is used to contribute property pages.<BR>
-What is a property page?
-It is a page that shows up in the Eclipse <A href="propertypage_figure2.gif">Properties dialog</A> that users
-get to by right-clicking on an object within any tree or table view, and selecting
-the <A href="propertypage_figure1.gif">Properties action</A>.</p>
-<p>Extenders supply one or more <samp>&lt;page&gt;</samp> elements within the beginning and ending <samp>&lt;extension&gt;</samp> element for this.
-The attributes of this <samp>&lt;page&gt;</samp> element are:</p>
-<ul>
-<li><b>id</b>. A unique ID for this extension point. Not actually used, but required by Eclipse.</li>
-<li><b>name</b>. A translated node-name to show in the left tree view in the Eclipse-supplied
-Properties dialog that comes up when the user selects "Properties..." from the pop-up menu.</li>
-<li><b>icon</b>. An optional icon to show in the Properties dialog for this property page.</li>
-<li><b>class</b>. The fully qualified name of the class that implements the Eclipse interface
-<samp>org.Eclipse.ui.IWorkbenchPropertyPage</samp>. This is usually done by extending the Eclipse class
-<samp>org.Eclipse.ui.dialog.PropertyPage</samp>. Your class will populate the detail page on the right of the
-Eclipse-supplied Properties dialog when the node-name is selected in the left hand tree view.</li>
-<li><b><i>objectClass</i></b>. Specify the class or interface of the model objects for which 
-this property page should be registered. Available interfaces are are identical to those in the
-<samp><A href="popup.html#objectClass">popupMenus</A></samp> extension point.</li>
-<li><b><i>filtering criteria</i></b>. To scope which objects these property pages should show up for,
-there are a series of filtering attributes. These attributes are identical to those in the <samp><A href="popup.html#filtering">popupMenus</A></samp>
-extension point.</li>
-<!--
-Supported through the
-<samp><a href="../../reference/api/org/eclipse/rse/core/SystemRemoteObjectMatcher.html">SystemRemoteObjectMatcher</a></samp>
-class, providers supply as many as needed to uniquely identify their target objects. Every one of these
-values can be scalar or "simple generic", meaning it can start or end with an asterisk for pattern matching:
-<ul>
-<li><b>subsystemconfigurationid</b>. Restrict to remote objects originating from subsystems created by this subsystem factory.
-<li><b>typecategoryfilter</b>. Restrict to remote objects originating from subsystems created by a subsystem factory that specified this value for their category attribute
-<li><b>namefilter</b>. Restrict to remote objects matching this simple generic name
-<li><b>typefilter</b>. Restrict to remote objects matching this simple type filter. The "type" of any remote object is subsystem-determined.
-<li><b>subtypefilter</b>. Restrict to remote objects matching this simple sub-type filter. The "subtype" of any remote object is subsystem-determined.
-<li><b>subsubtypefilter</b>. Restrict to remote objects matching this simple sub-sub-type filter. The "sub-subtype" of any remote object is subsystem-determined.
-</ul>
--->
-</ul>
-
-<h2>Programming Details</h2>
-<p>To use this extension point your class will typically extend <samp><A href="../../reference/api/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.html">SystemBasePropertyPage</A></samp> to
-make it easier to create these property pages for remote objects. The only methods you must implement in your 
-class are <samp>createContentArea(Composite)</samp>, which populates the details page on the right side when the node is
-selected on the left side; and <samp>verifyPageContents()</samp> which, naturally, validates the contents of the page.
-</p>
-
-<br><hr>
-<p>See the <a href="../tutorial/propertypage.html">property page tutorial</a> for a step-by-step example.</p>
-<p>See the <a href="../../../org.eclipse.platform.doc.isv/guide/preferences_prop_contribute.htm">Eclipse Platform Programmer's Guide</a>
-   for more background information.</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/propertypage_figure1.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/propertypage_figure1.gif
deleted file mode 100755
index 14bda64e8..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/propertypage_figure1.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/propertypage_figure2.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/propertypage_figure2.gif
deleted file mode 100755
index 7950bb9aa..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/propertypage_figure2.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/subsystem.html b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/subsystem.html
deleted file mode 100755
index 5b0ff5ad4..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/subsystem.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<!-- David Dykstal (IBM) - [193747] updated links and corrected syntax errors -->
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Plugging In SubSystems</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Plugging In SubSystems</h1>
-<p>The <samp><A href="../../reference/extension-points/org_eclipse_rse_core_subsystemConfigurations.html">org.eclipse.rse.core.subsystemConfigurations</a></samp>
-extension point is defined in the plugin <samp>org.eclipse.rse.ui</samp>.
-This is the most complex extension point to use, but also the most powerful. It enables
-tool providers to register a class that creates subsystem objects, which appear under
-a connection when a connection is expanded in the Remote Systems view.
-For example, <A href="RSView_iSeries.gif">here is an iSeries connection</A> with four subsystems,
-each created by a subsystem configuration registered with this extension point.
-</p>
-<p>The <A href="../../reference/extension-points/org_eclipse_rse_core_subsystemConfigurations.html">extension markup</A> is quite simple for this extension point,
-as it has only one element, <b><samp>&lt;configuration&gt;</samp></b>, with only a few simple attributes to supply:
-</p>
-<ul>
-<li><b>id</b>.
-Unique id for the extension, as required for all extensions.
-There is also a way to <A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#getSubSystemConfiguration(java.lang.String)">query</A> a subsystem configuration
-object via its ID.</li>
-<li><b>vendor</b>.
-Your company name, shown in properties dialog for subsystems created by this subsystem configuration.</li>
-<li><b>icon</b>.
-The icon displayed in the Remote Systems view for each subsystem created by this subsystem configuration.</li>
-<li><b>iconlive</b>.
-The icon used when the subsystem is physically connected to its remote system.</li>
-<li><b>name</b>.
-The name displayed in the Remote Systems view for each subsystem created by this subsystem configuration.</li>
-<li><b>systemTypeIds</b>.
-A semi-colon separated list of system type IDs which this subsystem configuration supports. When a user creates a
-connection, this configuration will only be asked to create a subsystem for connections to systems of these types. Wildcards are 
-supported; in order to register against all system types, specify a single "*".</li>
-<li><b>serviceType</b>. An optional semi-colon separated list of names and transports that can be used to match this service with remotelly advertised services through DNS-SD or any other supported service discovery protocol.
-The name would usually be the keyword used by the <A href="http://www.iana.org/assignments/port-numbers">IANA</A>  
-or by <A href="http://www.dns-sd.org/ServiceTypes.html">DNS SRV service types (RFC 2782)</A>.</li>
-<li><b>category</b>. A name used to categorize this subsystem's functionality. Used by the <A href="popup.html">popupMenus</A>
-and <A href="propertypage.html">propertyPages</A> extension points to allow actions and property pages to be scoped to
-resources shown in subsystems of a particular category. Multiple subsystems can have the same category.</li>
-<li><b>class</b>. A class implementing <A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.html">ISubSystemConfiguration</A>
-interface, as described in the following programming details section.</li>
-</ul>
-
-
-<h2>Programming Details</h2>
-<p>It is important to remember what the purpose of a subsystem is, and how it fits in the overall RSE <A
-	href="../Model.html">model</A>, so as to understand the programming details for supporting
-subsystems via this subsystem configuration extension point. Minimally speaking, this extension point requires a class that implements the interface
-<samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.html"><B>ISubSystemConfiguration</B></A></samp>.
-Ultimately, the intent of a subsystem <I>configuration</I> is to provide individual
-subsystem <I>instances</I> to each connection, and the intent of a subsystem instance is to present remote resources for display or manipulation purposes. Thus, you must also create a class implementing the interface <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html"><B>ISubSystem</B></A></samp>.
-<BR>
-The intent of each subsystem is to show remote resources from the remote system
-identified by the parent connection, for the user. (Subsystems can in fact be hidden, which means their their role is to return remote resources for programmatic purposes only.)   When the first request is made for remote objects, the subsystem is asked to connect to the remote system if it is not already.
-This job is deferred to a <A href="../../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html">IConnectorService</A> object whose role it is to manage connecting and disconnecting
-to the remote physical system. By use of a <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">connector service manager</a>,
-one system can manage the live connections of multiple subsystems in the same system connection, should they happen to share the same communication pipe.
-If filters are <A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.html#supportsFilters()">supported</A>
-(the default), the first connection is made, and the remote resources are subsequently shown, when filters within the subsystem
-are expanded, which results in a call to
-<samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html#internalResolveFilterString(java.lang.String,%20org.eclipse.core.runtime.IProgressMonitor)">resolveFilterString</A></samp>
-in the subsystem object. <BR>
-Furthermore, you will want to supply your own
-<B><A
-	href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html">new-filter</A></B> and
-<A href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html"><B>change-filter</B></A> actions.
-If filters are not supported, then these remote resources are shown immediately when the subsystem itself is expanded, via a call to
-<samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html#getChildren()">getChildren</A></samp>.
-Either way the resulting resources are displayed to the user. To facilitate the displaying of these objects in the RSE views, the objects
-themselves must implement the Eclipse IAdaptable interface (to enable the property sheet viewer) and there must be a specific RSE
-<B><A
-	href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html">view
-adapter</A></B>
-and an RSE <B><A
-	href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">remote-information
-adapter</A></B>
-registered for the remote objects, which the RSE views consult to get the labels, images, actions,
-and property sheet values for the remote objects.
-Typically, you will supply actions by leveraging the 
-<A href="../api/uiAPI.html">user interface elements</A> supplied by the RSE, such as base classes for 
-<A href="../api/messages/uiMessageAPI.html">messages</A>, 
-<A href="../api/actions/uiActionsAPI.html">actions</A>, 
-<A href="../api/dialogs/uiDialogsAPI.html">dialogs</A>, 
-<A href="../api/wizards/uiWizardsAPI.html">wizards</A>, 
-<A href="../api/properties/uiPropertiesAPI.html">property pages</A> and 
-<A href="../api/preferences/uiPreferencesAPI.html">preference page editors</A>. You will probably also supply a
-	property page for your subsystem objects, via the Eclipse <samp>propertyPages</samp> extension point, and for your remote resource objects, via the RSE <A
-	href="propertypage.html">propertyPages</A> extension point.</p>
-
-<h3>Base Classes</h3>
-<P>For many of the interfaces you must implement, there are base classes supplied that you can extend to make the development effort easier.</P>
-<p>The
-following summarizes the minimum set of classes you will be creating in order to realize your own subsystem support, including the RSE-supplied base classes to extend:</p>
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Class(es)</TH>
-			<TH>Base Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD>subsystem configuration</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystemConfiguration.html">SubSystemConfiguration</A></samp></TD>
-			<TD>The factory class responsible for creating instances of subsystem class</TD>
-		</TR>
-		<TR>
-			<TD>subsystem</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html">SubSystem</A></samp></TD>
-			<TD>The subsystem class. There will be one instance created for each connection. In addition to storing
-			your unique attributes, this must return the remote resource objects when a filter is expanded within the
-			subsystem. How that communication with the remote system is done is left up to you.</TD>
-		</TR>
-		<TR>
-			<TD>system</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html">AbstractConnectorService</A></samp></TD>
-			<TD>Represents and manages a live connection to the remote system, doing the connecting and disconnecting.</TD>
-		</TR>
-		<TR>
-			<TD>connector service manager</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">AbstractConnectorServiceManager</A></samp></TD>
-			<TD>Manages a single connector service instance that is shared among multiple subsystems in a single connection. Even if you only have a single subsystem configuration it is useful to use this in
-			case you later add additional factories, and their subsystems share the same communication pipe. To enable this, all your subsystem classes need to implement a unique interface of your own creation.</TD>
-		</TR>
-		<TR>
-			<TD>remote resource</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractResource.html">AbstractResource</A></samp></TD>
-			<TD>Can be used as a base class for the objects representing remote resources.</TD>
-		</TR>
-		<TR>
-			<TD>new-filter wizard</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html">SystemNewFilterAction</A></samp> and
-			<samp><A href="../../reference/api/org/eclipse/rse/ui/filters/SystemFilterStringEditPane.html">SystemFilterStringEditPane</A></samp></TD>
-			<TD>Displays a wizard prompting for a new filter. Filters contain filter strings, which are up to each subsystem to design and interpret. The New Filter wizard
-			prompts for a single filter string (more can be added in change mode). Typically you subclass <samp>SystemFilterStringEditPane</samp> to create your own
-			prompt for the filter string information, and then subclass <samp>SystemNewFilterAction</samp> so as to configure the default New Filter wizard to use
-			your edit pane in the first page.</TD>
-		</TR>
-		<TR>
-			<TD>change-filter dialog</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html">SystemChangeFilterAction</A></samp> and
-			<samp><A href="../../reference/api/org/eclipse/rse/ui/filters/SystemFilterStringEditPane.html">SystemFilterStringEditPane</A></samp></TD>
-			<TD>Displays a dialog prompting to change an existing filter. The default dialog allows the user to create and edit filter strings. Typically, you
-			override the <samp>SystemChangeFilterAction</samp> class, and configure the dialog to use the same edit pane used in the New Filter wizard.
-            </TD>
-		</TR>
-		<TR>
-			<TD>remote element adapter</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html">AbstractSystemViewAdapter</A></samp> and
-			    <samp><A href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A></samp>
-			</TD>
-			<TD>The view adapter is an amalgamation of all the required information needed to populate the RSE views. You will define one class per unique remote object interface or class, and in it you will override methods to return the remote object's label, image, popup-menu actions, property sheet properties and children (if expandable). You can also decide whether to enable common RSE popup menu actions like rename, delete and refresh. <BR>Your view adapter will usually also implement the remote adapter interface, enabling the many common RSE capabilities to work, such as the copy, paste, drag and drop, and more. </TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-<h3><A name="steps"></A>Overview of Steps</h3>
-<p>Implementing a subsystem involves the following steps, in the following order:</p>
-<OL>
-  <li>Creating an interface for your subsystem. It can, and often is, an empty interface.</li>
-  <li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html">AbstractConnectorService</A>.
-      The code here will interact as necessary with your subsystem to manage the connection lifecycle to the remote system.</li>
-  <li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">AbstractConnectorServiceManager</A>.
-      The code here will re-use the same IConnectorService object from step 2 for all subsystems that implement the interface from step 1, within the same connection.</li>
-  <li>Designing the classes to represent the remote resources (your <i>model</i>) that you will show from your subsystem.
-      Each must implement the <samp>org.eclipse.core.runtime.IAdaptable</samp> interface from Eclipse.
-      It is also very helpful if they also maintain a reference to the subsystem which created them. The base class
-      <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractResource.html">AbstractResource</A> is offered to help with this.</li>
-  <li>Designing the syntax of the <i>filter string</i> that will be used as a pattern to tell your subsystem what resources to show. For example, for files this might be of the
-         form "path/generic-name /options". It is the job of your subsystem to interpret these strings and return a list of remote resources matching the
-         criteria capturing in the string. You will eventually design a user interface to prompt the user for one the
-         contents of one of these filter strings. You might find it helps to create a class that holds one of these filter strings passed via a constructor, and
-         can parse it into its constituent pieces via getter methods. It should also support a default constructor and setting of constituent pieces via setter methods,
-         and the generation of the filter string via toString().
-   </li>
-  <li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html">SubSystem</A>
-      that implements the interface you designed in step 1. This will:
-      <ul>
-       <li>manage persistent properties via calls to the inherited <A href="../../reference/api/org/eclipse/rse/core/model/PropertySetContainer.html#createPropertySet(java.lang.String)">createPropertySet</A>,
-       <A href="../../reference/api/org/eclipse/rse/core/model/PropertySetContainer.html#getPropertySet(java.lang.String)">getPropertySet</A> and related methods,</li>
-       <li>use your communications layer to return instances of your model objects in its <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html#internalResolveFilterString(java.lang.String,%20org.eclipse.core.runtime.IProgressMonitor)">internalResolveFilterString</A> method.
-       The input to this is one or more strings such as you designed in step 5. It will return all remote resources matching the criteria captured in the input filter string.
-       You may also find the <A href="../../reference/api/org/eclipse/rse/services/clientserver/NamePatternMatcher.html">org.eclipse.rse.services.clientserver.NamePatternMatcher</a>
-       class to be handy in comparing a generic pattern to a particular input. This class is in the <samp>runtime/clientserver.jar</samp> file,
-       and has no eclipse-dependencies, so it can be used in your client subsystem code, or your server-side code.</li>
-      </ul>
-   </li>
-  <li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystemConfiguration.html">SubSystemConfiguration.</A></li>
-  <li>Defining your <A href="../../reference/extension-points/org_eclipse_rse_core_subsystemConfigurations.html">subsystemConfigurations extension</a> in your <samp>plugin.xml</samp> file.</li>
-  <li>For each remote resource class you created in step 4, you need to create an adapter class, which extends
-      <A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html">AbstractSystemViewAdapter</A> and which
-      implements <A href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A>.
-  </li>
-  <li>Register your adapters with the platform. First you create an
-      adapter class that extends <samp><a href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemRemoteAdapterFactory.html">AbstractSystemRemoteAdapterFactory</a></samp>
-      and implements interface <samp><b>org.eclipse.core.runtime.IAdapterFactory</b></samp>. Next,
-      in the <samp>startup()</samp> method of your plugin class, add code to instantiate the class and register the object with
-      the platform adapter manager, once for each class in your resource model. For example:
-      <br><samp>
-		MyAdapterFactory factory = new MyAdapterFactory(); // extends AbstractSystemRemoteAdapterFactory<br>
-		IAdapterManager manager = Platform.getAdapterManager();<br>
-		manager.registerAdapters(factory, MyModelObject1.class);<br>
-		manager.registerAdapters(factory, MyModelObject2.class);<br>
-      </samp>
-  </li>
-  <li>If your filter string from step 5 is complicated enough, you will probably find the
-  RSE-supplied <a href="NewFilterWizard_Default.gif">filter wizard</a> and
-  <a href="ChangeFilterDialog_Default.gif">change-dialog</a> insufficient. The idea with these is that the
-  New Filter wizard prompts in its first page for a single filter string. The change dialog
-  allows the user to change that single filter string, or add additional filter strings. To
-  change these for your subsystem, you need to:
-    <ol>
-      <li type="i">Create your own
-            <a href="../../reference/api/org/eclipse/rse/ui/filters/SystemFilterStringEditPane.html">filter string edit pane</a>
-            subclass that contains your own GUI prompts as desired.</li>
-      <li type="i">Create your own
-            <a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html">new-filter wizard action</a>
-            subclass, and configure it to use your own edit pane subclass by overriding
-            <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html#configureNewFilterWizard(org.eclipse.rse.ui.filters.dialogs.SystemNewFilterWizard)">configureNewFilterWizard</a></samp>
-            and in it calling <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.html#setFilterStringEditPane(org.eclipse.rse.ui.filters.SystemFilterStringEditPane)">setFilterStringEditPane</a></samp>
-            on the given wizard.</li>
-      <li type="i">Create your own
-            <a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html">change-filter action</a>
-            subclass, and configure it to use your own edit pane subclass by overriding
-            <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html#configureFilterDialog(org.eclipse.rse.ui.filters.dialogs.SystemChangeFilterDialog)">configureFilterDialog</a></samp>
-            and in it calling <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/dialogs/SystemChangeFilterDialog.html#setFilterStringEditPane(org.eclipse.rse.ui.filters.SystemFilterStringEditPane)">setFilterStringEditPane</a></samp>
-            on the given dialog.</li>
-      <li type="i">Override the <samp><a href="../../reference/api/org/eclipse/rse/ui/subsystems/ISubSystemConfigurationAdapter.html#configureNewFilterAction(org.eclipse.rse.core.subsystems.ISubSystemConfiguration,%20org.eclipse.rse.ui.filters.actions.SystemNewFilterAction,%20java.lang.Object)">getNewFilterPoolFilterAction(SystemFilterPool, Shell)</a></samp>
-            method in your subsystem configuration, to configure your new-filter action.
-            You can actually avoid creating an action subclass if you choose, by calling the configuration methods
-            in the RSE-supplied <a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html">new-filter action class</a>.</li>
-    </ol>
-  </li>
-</OL>
-
-<br><hr>
-<p>See the <a href="../tutorial/subsystem.html">subsystem tutorial</a> for a step-by-step example.</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/systemtype.html b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/systemtype.html
deleted file mode 100755
index bbb4b652c..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/systemtype.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Plugging In System Types</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Plugging In System Types</h1>
-<p>The <samp><A href="../../reference/extension-points/org_eclipse_rse_core_systemTypes.html">org.eclipse.rse.core.systemTypes</a></samp> 
-and <samp><A href="../../reference/extension-points/org_eclipse_rse_core_systemTypeProviders.html">org.eclipse.rse.core.systemTypeProviders</a></samp>
-extension points are defined in the
-plugin <samp>org.eclipse.rse.core</samp>. It enables new system types to be
-defined in the Remote System Explorer's <A href="NewConnection.gif">New
-Connection wizard</A>, such that users can define connections to systems of that type. For example,
-you might define a new system type of "Solaris" or "RedHat" or some other specific type
-of operating system. The reason to define a system type is to enable tools to be created,
-via the <A href="subsystem.html">subsystem extension point</A>, that are scoped so as to
-only appear for connections to systems of that type.
-</p>
-<p>
-Defining a new system type is easy. You merely need to supply the name of the system
-type, and two icons - one icon for connections to that systems of that type, and another
-adorned icon that is used when there is a live connection to that particular system.
-</p>
-<p>
-When you create a new connection, the Remote System Explorer framework will consult
-each registered <A href="subsystem.html">subsystem extension point</A> to see if it supports
-that connection's system type, and if so the extension point's subsystem factory class
-will be used to create a new subsystem within the new connection. Thus, when the user
-expands a connection in the Remote Systems view, only subsystems supported for that
-connection's system type are available.
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_Cmds.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_Cmds.gif
deleted file mode 100755
index 377862151..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_Cmds.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_RS.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_RS.gif
deleted file mode 100755
index 8ee06ea76..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_RS.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_Table.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_Table.gif
deleted file mode 100755
index 0cb086739..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_Table.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_Team.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_Team.gif
deleted file mode 100755
index 80bd2c7c7..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/view_Team.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/preference_activeProfiles.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/preference_activeProfiles.gif
deleted file mode 100755
index b241fe998..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/preference_activeProfiles.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/preferences.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/preferences.gif
deleted file mode 100755
index e31a1104b..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/preferences.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/rse.gif
deleted file mode 100755
index cfdc37dc1..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int.html
deleted file mode 100755
index 0a2b2865d..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Programmer's Guide</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-
-<body>
-<h1>RSE Programmer's Guide</h1>
-<div class="p">
-This book explains how to use the Remote System Explorer APIs and Extension Points.
-It provides an
-<ul>
-  <li><a href="rse_int_architecture.html">Architectural Overview</a>,</li>
-  <li><a href="usingAPIs.html">API Description</a> as well as some extensive</li>
-  <li><a href="tutorials.html">Tutorials</a></li>.
-</ul>
-</div>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_architecture.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_architecture.html
deleted file mode 100755
index ee61db6de..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_architecture.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Architecture</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Architecture</h1>
-
-
-<p> The Remote System Explorer is structured into three major layors:</p>
-<ul>
-  <li><A href="#Services">Service Layer</A></li>
-  <li><A href="#Subsystems">Subsystem Layer</A></li>
-  <li><A href="#UI">UI Layer</A></li>
-</ul>
-
-
-<A name="Services"></A><h2>RSE Service Layer</h2>
-<p>
-This is the headless, barebones API layer that is used to interact with different protocols to
-provide remote services that can be integrated into RSE.  By default, RSE defines the following
-types of services:
-
-		<ul>
-  <li>File Service - for listing, modifying, copying, and transfering remote file and folders</li>
-  <li>Shell Service - for launching remote shells and interacting with the associated IO</li>
-  <li>Process Services - for listing remote processes</li>
-</ul>
-		<p>
-New service types can be added as needed, either in core RSE, or extensions to the base.  The service
-interfaces are defined loosely so that different implementations of the same service can be made using
-different protocols.  For example, the IFileService could be implemented locally with java.io, FTP, DataStore or some
-other protocol.  Similarly, the IShellService could be implemented locally via DataStore, telnet, SSH or something
-else.
-</p>
-<A name="Subsystems"></A><h2>RSE Subsystem Layer</h2>
-<p>
-RSE subsystems integrate the services of the service layer with connection information, model artifacts and persistence.
-Each subsystem is associated with a single service type. For example, the file service subsystem is associated with the
-file service. Each <a href="rse_int_subsystems.html">subsystem</a> is associated with one or more services from the service layer,
-a <a href="rse_int_connectorservices.html">connector service</a> and, in some cases, a model adapter, which is used to
-convert artifacts from the service layer into a form that is suitable for the subsystem layer.
-</p>
-<p>
-Subsystems are contributed via the subsystem configuration extension point.  A subsystem configuration is registered with
-one or more system type (i.e. Local, Linux, Windows, etc.).  When there is an RSE <a href="rse_int_hosts.html">host</a>
-of a particular system type, the subsystem configurations that are registered with that system type are used to instantiate
-and configure the subsystems for that host.  Each subsystem configuration determines the subsystem to instantiate, the service
-implementation, the connector service and anything else that requires customization for it's service.
-</p>
-<p>
-Multiple subsystem configurations can exist for the same type of subsystem.  This will be the case when there are more than
-one protocols that can be used to implement the same service.  For example, there are both FTP and DataStore implementations of
-the IFileService.  Subsystem configurations are contributed for both the FTP implementation and the DataStore one.  In
-such cases, only one subsystem is instantiated for each host, however that subsystem can have its configuration changed from FTP
-to DataStore and vice versa.
-</p>
-<p>
-Subsystems do not have to be implemented on top of a formally defined service layer, although this is highly recommended.
-Instead it may have all the services implemented directly in the subsystem itself. 
-If a subsystem does not use a service layer it should return <strong>null</strong> when implementing getServiceType(). 
-</p>
-<p>
-Subsystems are RSE objects that are persistable and maintain higher level functionality from the service layer.  Subsystems that
-are used to query information on a host often have <a href="rse_int_filters.html">filters</a>.  Filters provide the user the means to
-specify a criteria for which to query a set of data.  In addition to filters, there are more arbitrary properties that can be
-associated with a subsystem, each of which can be saved and restored across sessions.
-</p>
-
-<A name="UI"></A><h2>RSE UI Layer</h2>
-<p>
-The Remote System Explorer perspective provides views that render the subsystems and associated artifacts.  Users can create
-new connections, which can be expanded to reveal subsystems and the information the subsystems reveal about a system.
-</p>
-
-</body>
-</html>
-
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_connectorservices.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_connectorservices.html
deleted file mode 100755
index 8dfb4872c..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_connectorservices.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Connector Services</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Connector Services</h1>
-<p>
-Connector Services provide the mechanism for maintaining a connection to a particular remote system, requesting whatever credentials are 
-required for authentication, and for controlling the persistence of those credentials. A connector service is typically created 
-or referenced by a subsystem configuration when a new subsystem instance is being created.
-</p><p>
-Every subsystem has a connector service. Some subsystems will share a connector service among themselves. 
-Subsystems that share a connector service all connect and disconnect at the same time.
-For example, a file subsystem and
-a shell subsystem that are both using the SSH protocol will share the same connector service instance so that their connections are established and
-removed at the same time.
-</p><p>
-Connector services use credentials providers (see <code>ICredentialsProvider</code>) to establish any credentials needed for authentication to a 
-remote system.
-</p>
-</body>
-</html>
-
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_files.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_files.html
deleted file mode 100755
index d9e165406..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_files.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE UI</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-
-<body>
-<h1>RSE Files</h1>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_filters.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_filters.html
deleted file mode 100755
index 4e6cb9094..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_filters.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Filters</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Filters</h1>
-</body>
-</html>
-
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_hosts.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_hosts.html
deleted file mode 100755
index 70940c1d2..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_hosts.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Hosts</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Hosts</h1>
-<p>
-Hosts, sometimes called "connections", are visible as the top level entities shown in the Remote Systems view.
-Hosts are always created referencing a system type.
-The system type determines the kinds of services that will be available to that host.
-System types are defined by the <code>org.eclipse.rse.core.systemTypes</code> extension point, which lists the <code>subsystemConfigurations</code>
-that are valid for type.
-</p><p>
-Once instantiated, hosts can be connected to their target systems.
-This causes the connector services associated with
-the subsystems belonging to that host to request connection. 
-Disconnect works similarly.
-</p>
-</body>
-</html>
-
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_overview.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_overview.html
deleted file mode 100755
index fbe1f348f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_overview.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Overview</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Overview</h1>
-<p>
-The perspective for managing connections is the <A href="rse.gif"><B>Remote
-System Explorer</B></A> (<b>RSE</b>), and the primary tree-view within it is the 
-<A href="view_RS.gif"><B>Remote Systems</B></A> view. We assume you are already familiar with the RSE perspective,
-or will familiarize yourself with it, and you are now interested in learning how to extend it. We also assume that you 
-already understand the concepts of plug-ins, extension points, and the workbench UI. You do not need 
-to be familiar with workspace resources, as the RSE does not use these to realize the artifacts it 
-shows to the user.
-</p>
-<p>A user can extend the Remote System Explorer by adding their own
-<A href="Artifacts.html#filters">filters</A>.
-<!-- 
-<A href="Artifacts.html#useractions">user actions</A>, and 
-<A href="Artifacts.html#compilecmds">compile commands</A>.
--->
-They may also customize the RSE by setting
-<A href="Artifacts.html#preferences">preferences</A>.</p>
-<p>
-As a programmer, you can extend the Remote System Explorer by using 
-<A href="../reference/extension-points/index.html">RSE-unique extension points</A> to 
-add actions to the pop-up menus for remote objects, create your own 
-system types or subsystems that appear when a connection is expanded,
-or even contribute new persistence schemes for storing RSE data. The full Eclipse application 
-programming interface (API) set is
-at your disposal for these, as well as the API set supplied by the Remote System Explorer. Furthermore,
-you can use 
-<a href="../guide/plugin/other.html">Eclipse Platform extension points</a>
-to add property pages, author menu items, tool bar actions, 
-pop-up menu actions, and more for objects in the Remote System Explorer. 
-</p>
-<p>
-This guide explains all underlying 
-artifacts and model of the Remote System Explorer, the RSE extension points, and highlights the 
-important APIs available for your use.
-</p>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_processes.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_processes.html
deleted file mode 100755
index d73ae1dbc..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_processes.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE UI</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-
-<body>
-<h1>RSE Processes</h1>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_services.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_services.html
deleted file mode 100755
index a92a0f6d2..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_services.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Services</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Services</h1>
-<p>
-RSE is built on top of a service layer that provides services that access the remote systems.
-These service implementations are typically protocol-specific but will obey an interface that defined for that paricular service.
-For example, a file service will obey the interface defined in the package
-<code>org.eclipse.rse.services.files</code>, but there
-exist implementations for the dstore, FTP, and SSH protocols.
-</p>
-<p>
-RSE supplies service definitions for a file service, a shell service for submitting remote commands, a search service, and a process service.
-Implementers that which to use different protocols than the ones supplied should use the existing service definitions to fit into the current 
-structure.
-</p>
-<p>
-It is not absolutely necessary to have a services layer.
-Implementers of subsystems that provide access to resources that in narrow domains
-could forgo the creation of explicit service classes and embed the 
-support directly in the subsystem.
-</p> 
-</body>
-</html>
-
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_shells.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_shells.html
deleted file mode 100755
index 774da36b1..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_shells.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE UI</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-
-<body>
-<h1>RSE Shells</h1>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_subsystems.html b/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_subsystems.html
deleted file mode 100755
index 1336d32a9..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/rse_int_subsystems.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Subsystems</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Subsystems</h1>
-<p>
-Subsystems provide a layer of abstraction on the set of services provided at lower layers.
-Subsystems make remote resources individually visible to their clients and expose the relationships among these resources - such as the parent-child
-relationship between directories and files on a remote file system.
-</p>
-<p>
-There should typically be only one subsystem implementation for each type of remote resource.
-Minor differences between remote systems or
-the protocols required to access them should be provided by different
-implementations of an underlying service.
-For example, RSE provides a single
-exemplary file subsystem, but that file subsystem uses different file services to use different remote file access protocols.
-The duty of tieing a subsystem to its underlying service goes to the subsystem configuration.
-</p>
-<p>
-A subsystem configuration creates subsystems of the kind it understands and, in addition, create them with the appropriate
-underlying service if there is one. These configuration classes are registered with RSE using the 
-<code>org.eclipse.rse.core.subsystemConfigurations</code> extension point.
-</p>
-<p>
-RSE supplies ready-made subsystems for files, command execution, and processes.
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperAdapterFactory.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperAdapterFactory.html
deleted file mode 100755
index ea0623e4c..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperAdapterFactory.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperAdapterFactory Class After Editing</title>
-</head>
-
-<body>
-<h1>DeveloperAdapterFactory Class After Editing</h1>
-<pre><samp>
-package samples.model;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.rse.ui.view.AbstractSystemRemoteAdapterFactory;
-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * This factory maps requests for an adapter object from a given remote object.
- */
-public class DeveloperAdapterFactory 
-	extends AbstractSystemRemoteAdapterFactory
-	implements IAdapterFactory
-{
-	<b>private TeamResourceAdapter teamAdapter = new TeamResourceAdapter();
-	private DeveloperResourceAdapter developerAdapter = new DeveloperResourceAdapter();</b>
-	
-	/**
-	 * Constructor for DeveloperAdapterFactory.
-	 */
-	public DeveloperAdapterFactory()
-	{
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(Object, Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType)
-	{
-		<b>ISystemViewElementAdapter adapter = null;
-		if (adaptableObject instanceof TeamResource)
-		  adapter = teamAdapter;
-		else if (adaptableObject instanceof DeveloperResource)
-		  adapter = developerAdapter;
-		// <i>these lines are very important! </i>
-		if ((adapter != null) &amp;&amp; (adapterType == IPropertySource.class))
-		  adapter.setPropertySourceInput(adaptableObject);
-		return adapter;</b>
-	}
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperConnectorService.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperConnectorService.html
deleted file mode 100755
index 5a2d8c891..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperConnectorService.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperConnectorService Class After Editing</title>
-</head>
-
-<body>
-<h1>DeveloperConnectorService Class After Editing</h1>
-<pre><samp>
-package samples.subsystems;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.subsystems.AbstractConnectorService;
-import org.eclipse.rse.core.model.IHost;
-
-import samples.RSESamplesPlugin;
-
-/**
- * Our system class that manages connecting to, and disconnecting from,
- * our remote server-side code.
- */
-public class DeveloperConnectorService extends AbstractConnectorService {
-
-	<strong>private boolean connected = false;</strong>
-
-	/**
-	 * Constructor for DeveloperConnectorService.
-	 * @param host
-	 */
-	public DeveloperConnectorService(IHost host)
-	{
-		super(
-			RSESamplesPlugin.getResourceString("connectorservice.devr.name"),
-			RSESamplesPlugin.getResourceString("connectorservice.devr.desc"),
-			host,
-			0
-		);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#isConnected()
-	 */
-	public boolean isConnected()
-	{
-		return connected;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#internalConnect(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void internalConnect(IProgressMonitor monitor) throws Exception
-	{
-		super.internalConnect(monitor);
-		// pretend. Normally, we'd connect to our remote server-side code here
-		connected=true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#internalDisconnect(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void internalDisconnect(IProgressMonitor monitor) throws Exception
-	{
-		super.internalDisconnect(monitor);
-		// pretend. Normally, we'd disconnect from our remote server-side code here
-		connected=false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#supportsRemoteServerLaunching()
-	 */
-	public boolean supportsRemoteServerLaunching()
-	{
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#hasRemoteServerLauncherProperties()
-	 */
-	public boolean hasRemoteServerLauncherProperties()
-	{
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#supportsServerLaunchProperties()
-	 */
-	public boolean supportsServerLaunchProperties()
-	{
-		return false;
-	}
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperConnectorServiceManager.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperConnectorServiceManager.html
deleted file mode 100755
index 476613d09..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperConnectorServiceManager.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperConnectorServiceManager Class After Editing</title>
-</head>
-
-<body>
-<h1>DeveloperConnectorServiceManager Class After Editing</h1>
-<pre><samp>
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.subsystems;
-
-import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.model.IHost;
-
-/**
- * This class manages our DeveloperConnectorService objects, so that if we 
- * ever have multiple subsystem configurations, different subsystems can share 
- * the same IConnectorService object if they share the communication layer.
- */
-public class DeveloperConnectorServiceManager extends
-		AbstractConnectorServiceManager {
-
-	<strong>private static DeveloperConnectorServiceManager inst;</strong>
-
-	/**
-	 * Constructor for DeveloperConnectorServiceManager.
-	 */
-	public DeveloperConnectorServiceManager()
-	{
-		super();
-	}
-
-	<strong>/**
-	 * Return singleton instance
-	 */
-	public static DeveloperConnectorServiceManager getInstance()
-	{
-		if (inst == null)
-		  inst = new DeveloperConnectorServiceManager();
-		return inst;
-	}</strong>
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.core.model.IHost)
-	 */
-	public IConnectorService createConnectorService(IHost host)
-	{
-		<strong>return new DeveloperConnectorService(host);</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#sharesSystem(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public boolean sharesSystem(ISubSystem otherSubSystem)
-	{
-		<strong>return (otherSubSystem instanceof IDeveloperSubSystem);</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#getSubSystemCommonInterface(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public Class getSubSystemCommonInterface(ISubSystem subsystem)
-	{
-		<strong>return IDeveloperSubSystem.class;</strong>
-	}
-
-}
-</samp></pre>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperFilterDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperFilterDialog.gif
deleted file mode 100755
index a281793fd..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperFilterDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperFilterStringEditPane.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperFilterStringEditPane.html
deleted file mode 100755
index af4f1a4ec..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperFilterStringEditPane.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperFilterStringEditPane Class After Editing</title>
-</head>
-
-<body>
-<h1>DeveloperFilterStringEditPane Class After Editing</h1>
-<pre><samp>
-package samples.subsystems;
-
-<strong>import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.SystemWidgetHelpers;</strong>
-import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;
-<strong>import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;</strong>
-
-<strong>import samples.RSESamplesPlugin;</strong>
-
-/**
- * Our specialized filter string edit pane for developer filters.
- */
-public class DeveloperFilterStringEditPane extends SystemFilterStringEditPane {
-
-	// gui widgets
-	<strong>private Text textTeam, textDevr;</strong>
-
-	/**
-	 * Constructor for DeveloperFilterStringEditPane.
-	 * @param shell - parent window
-	 */
-	public DeveloperFilterStringEditPane(Shell shell)
-	{
-		super(shell);
-	}
-
-	/**
-	 * Override of parent method.
-	 * This is where we populate the client area.
-	 * @param parent - the composite that will be the parent of the returned client area composite
-	 * @return Control - a client-area composite populated with widgets.
-	 * 
-	 * @see org.eclipse.rse.ui.SystemWidgetHelpers
-	 */
-	<strong>public Control createContents(Composite parent) 
-	{		
-		// Inner composite
-		int nbrColumns = 1;
-		Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns);	
-		((GridLayout)composite_prompts.getLayout()).marginWidth = 0;
-		
-		// CREATE TEAM-PARENT PROMPT
-		textTeam = SystemWidgetHelpers.createLabeledTextField(
-			composite_prompts,
-			null,
-			RSESamplesPlugin.getResourceString("filter.devr.teamprompt.label"), //$NON-NLS-1$
-			RSESamplesPlugin.getResourceString("filter.devr.teamprompt.tooltip") //$NON-NLS-1$
-		); 
-
-		// CREATE DEVELOPER PROMPT
-		textDevr = SystemWidgetHelpers.createLabeledTextField(
-			composite_prompts,
-			null,
-			RSESamplesPlugin.getResourceString("filter.devr.devrprompt.label"), //$NON-NLS-1$
-			RSESamplesPlugin.getResourceString("filter.devr.devrprompt.tooltip") //$NON-NLS-1$
-		); 
-		
-		resetFields();
-		doInitializeFields();
-		  		  
-		// add keystroke listeners...
-		textTeam.addModifyListener(
-			new ModifyListener() 
-			{
-				public void modifyText(ModifyEvent e) 
-				{
-					validateStringInput();
-				}
-			}
-		);		
-		textDevr.addModifyListener(
-			new ModifyListener() 
-			{
-				public void modifyText(ModifyEvent e) 
-				{
-					validateStringInput();
-				}
-			}
-		);		
-		return composite_prompts;
-	}</strong>
-
-	/**
-	 * Override of parent method.
-	 * Return the control to recieve initial focus. 
-	 */
-	<strong>public Control getInitialFocusControl()
-	{
-		return textTeam;
-	}</strong>	
-
-	/**
-	 * Override of parent method.
-	 * Initialize the input fields based on the inputFilterString, and perhaps refProvider.
-	 * This can be called before createContents, so test for null widgets first!
-	 * Prior to this being called, resetFields is called to set the initial default state prior to input
-	 */		
-	<strong>protected void doInitializeFields()
-	{
-		if (textTeam == null)
-		  return; // do nothing
-		if (inputFilterString != null)
-		{
-			int idx = inputFilterString.indexOf('/');
-			if (idx &lt; 0)
-		      textTeam.setText(inputFilterString);
-		    else
-		    {
-		    	textTeam.setText(inputFilterString.substring(0,idx));
-		    	textDevr.setText(inputFilterString.substring(idx+1));
-		    }
-		}
-	}</strong>	
-
-	/**
-	 * Override of parent method.
-	 * This is called in the change filter dialog when the user selects "new", or selects another string.
-	 */
-	<strong>protected void resetFields()
-	{
-	    textTeam.setText(""); //$NON-NLS-1$		
-	    textDevr.setText("*"); //$NON-NLS-1$
-	}</strong>
-
-	/**
-	 * Override of parent method.
-	 * Called by parent to decide if information is complete enough to enable finish. 
-	 */
-	<strong>protected boolean areFieldsComplete()
-	{
-		if ((textTeam == null) || (textDevr == null))
-		  return false;
-		else
-		  return (textTeam.getText().trim().length()&gt;0) &amp;&amp; (textDevr.getText().trim().length()&gt;0);
-	}</strong>
-	
-	/**
-	 * Override of parent method.
-	 * Get the filter string in its current form. 
-	 * Functional opposite of doInitializeFields, which tears apart the input string in update mode,
-	 *  to populate the GUIs. This method creates the filter string from the information in the GUI.
-	 */
-	<strong>public String getFilterString()
-	{
-		if ((textTeam == null) || (textDevr == null))
-		  return inputFilterString; // return what we were given.
-		else
-		{
-			String teamName = textTeam.getText().trim();
-			String devrName = textDevr.getText().trim();
-			return teamName + "/" + devrName; //$NON-NLS-1$
-		}
-	}</strong>	
-
-	/**
-	 * Override of parent method.
-	 * Does complete verification of input fields. If this 
-	 * method returns null, there are no errors and the dialog or wizard can close.
-	 *
-	 * @return error message if there is one, else null if ok
-	 */
-	<strong>public SystemMessage verify() 
-	{
-		errorMessage = null;
-		Control controlInError = null;
-		
-		/*
-		errorMessage = validateTeamInput(); // todo: implement if we want to syntax check input
-		if (errorMessage != null)
-		  controlInError = textTeam;
-		else
-		{
-		   errorMessage = validateDevrInput(); // todo: implement to syntax check input
-		   if (errorMessage != null)
-		     controlInError = textDevr;
-		}
-		*/
-		
-		if (errorMessage != null)
-		{
-			if (controlInError != null)
-		      controlInError.setFocus();
-		}
-		return errorMessage;		
-	}</strong>	
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperFilterWizard.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperFilterWizard.gif
deleted file mode 100755
index 9a0b9aed9..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperFilterWizard.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperResource.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperResource.html
deleted file mode 100755
index 4da58a080..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperResource.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperResource Class After Editing</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>DeveloperResource Class After Editing</h1>
-<p>
-<pre><samp>
-package samples.model;
-
-import org.eclipse.rse.core.subsystems.AbstractResource;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * This models a remote resource representing a developer defined on a particular system.
- */
-public class DeveloperResource extends AbstractResource {
-
-	<strong>private String name;</strong>
-	<strong>private String id;</strong>
-	<strong>private String deptNbr;</strong>	
-
-	/**
-	 * Default constructor for DeveloperResource.
-	 */
-	public DeveloperResource()
-	{
-		super();
-	}
-	
-	/**
-	 * Constructor for DeveloperResource when given parent subsystem.
-	 */
-	public DeveloperResource(ISubSystem parentSubSystem)
-	{
-		super(parentSubSystem);
-	}
-
-	/**
-	 * Returns the name.
-	 * @return String
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the name.
-	 * @param name The name to set
-	 */
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	
-	/**
-	 * Returns the id.
-	 * @return String
-	 */
-	public String getId()
-	{
-		return id;
-	}
-
-	/**
-	 * Sets the id.
-	 * @param id The id to set
-	 */
-	public void setId(String id)
-	{
-		this.id = id;
-	}
-
-	/**
-	 * Returns the deptNbr.
-	 * @return String
-	 */
-	public String getDeptNbr()
-	{
-		return deptNbr;
-	}
-
-	/**
-	 * Sets the deptNbr.
-	 * @param deptNbr The deptNbr to set
-	 */
-	public void setDeptNbr(String deptNbr)
-	{
-		this.deptNbr = deptNbr;
-	}
-
-}
-</samp></pre>
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperResourceAdapter.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperResourceAdapter.html
deleted file mode 100755
index a5a19592f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperResourceAdapter.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperResourceAdapter Class After Editing</title>
-</head>
-
-<body>
-<h1>DeveloperResourceAdapter Class After Editing</h1>
-<pre><samp>
-package samples.model;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.ui.SystemMenuManager;
-import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
-import org.eclipse.swt.widgets.Shell;
-<strong>import org.eclipse.ui.views.properties.IPropertyDescriptor;</strong>
-<strong>import org.eclipse.ui.views.properties.PropertyDescriptor;</strong>
-
-<strong>import samples.RSESamplesPlugin;</strong>
-
-/**
- * This is the adapter which enables us to work with our remote developer resources.
- */
-public class DeveloperResourceAdapter extends AbstractSystemViewAdapter
-		implements ISystemRemoteElementAdapter
-{
-
-	/**
-	 * Constructor
-	 */
-	public DeveloperResourceAdapter() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#addActions(org.eclipse.rse.ui.SystemMenuManager,
-	 * org.eclipse.jface.viewers.IStructuredSelection, org.eclipse.swt.widgets.Shell, java.lang.String)
-	 */
-	public void addActions(SystemMenuManager menu,
-			IStructuredSelection selection, Shell parent, String menuGroup)
-	{
-	}
-
-	/**
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(Object)
-	 */
-	public ImageDescriptor getImageDescriptor(Object object)
-	{
-		<strong>return RSESamplesPlugin.getDefault().getImageDescriptor("ICON_ID_DEVELOPER");</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getText(java.lang.Object)
-	 */
-	public String getText(Object element)
-	{
-		<strong>return ((DeveloperResource)element).getName();</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getAbsoluteName(java.lang.Object)
-	 */
-	public String getAbsoluteName(Object object)
-	{
-		<strong>DeveloperResource devr = (DeveloperResource)object;</strong>
-		r<strong>eturn "Devr_" + devr.getId();</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getType(java.lang.Object)
-	 */
-	public String getType(Object element)
-	{
-		<strong>return RSESamplesPlugin.getResourceString("property.devr_resource.type");</strong>
-	}
-
-	/**
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(Object)
-	 */
-	public Object getParent(Object o)
-	{
-		return null; // not really used, which is good because it is ambiguous
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element)
-	{
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(Object)
-	 */
-	public Object[] getChildren(Object o)
-	{
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#internalGetPropertyDescriptors()
-	 */
-	protected IPropertyDescriptor[] internalGetPropertyDescriptors()
-	{
-		// the following array should be made static to it isn't created every time		
-		<strong>PropertyDescriptor[] ourPDs = new PropertyDescriptor[2];</strong>
-		<strong>ourPDs[0] = new PropertyDescriptor("devr_id", RSESamplesPlugin.getResourceString("property.devr_id.name"));</strong>
-		<strong>ourPDs[0].setDescription(RSESamplesPlugin.getResourceString("property.devr_id.desc"));</strong>
-		<strong>ourPDs[1] = new PropertyDescriptor("devr_dept", RSESamplesPlugin.getResourceString("property.devr_dept.name"));</strong>
-		<strong>ourPDs[1].setDescription(RSESamplesPlugin.getResourceString("property.devr_dept.desc"));</strong>
-		<strong>return ourPDs;</strong>
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#internalGetPropertyValue(java.lang.Object)
-	 */
-	protected Object internalGetPropertyValue(Object key)
-	{
-		// propertySourceInput holds the currently selected object
-		<strong>DeveloperResource devr = (DeveloperResource)propertySourceInput;
-		if (key.equals("devr_id"))
-			return devr.getId();
-		else if (key.equals("devr_dept"))
-		  return devr.getDeptNbr();
-		return null;</strong>
-	}		
-	// --------------------------------------
-	// ISystemRemoteElementAdapter methods...
-	// --------------------------------------
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getAbsoluteParentName(java.lang.Object)
-	 */
-	public String getAbsoluteParentName(Object element)
-	{
-		<strong>return "root";</strong> // not really applicable as we have no unique hierarchy
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemConfigurationId(java.lang.Object)
-	 */
-	public String getSubSystemConfigurationId(Object element)
-	{
-		<strong>return "samples.subsystems.factory";</strong> // as declared in extension in plugin.xml
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteTypeCategory(java.lang.Object)
-	 */
-	public String getRemoteTypeCategory(Object element)
-	{
-		<strong>return "developers";</strong> // Course grained. Same for all our remote resources.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteType(java.lang.Object)
-	 */
-	public String getRemoteType(Object element)
-	{
-		<strong>return "developer";</strong> // Fine grained. Unique to this resource type.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteSubType(java.lang.Object)
-	 */
-	public String getRemoteSubType(Object element)
-	{
-		return null; // Very fine grained. We don't use it.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#refreshRemoteObject(java.lang.Object, java.lang.Object)
-	 */
-	public boolean refreshRemoteObject(Object oldElement, Object newElement)
-	{
-		<strong>DeveloperResource oldDevr= (DeveloperResource)oldElement;
-		DeveloperResource newDevr = (DeveloperResource)newElement;
-		newDevr.setName(oldDevr.getName());
-		return false;</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteParent(org.eclipse.swt.widgets.Shell, java.lang.Object)
-	 */
-	public Object getRemoteParent(Shell shell, Object element) throws Exception
-	{
-		return null; // maybe this would be a Department obj, if we fully fleshed out our model
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteParentNamesInUse(org.eclipse.swt.widgets.Shell, java.lang.Object)
-	 */
-	public String[] getRemoteParentNamesInUse(Shell shell, Object element)
-			throws Exception
-	{
-		// developers names do not have to be unique! So we don't need to implement this!
-		return null;
-
-	}
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystem.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystem.html
deleted file mode 100755
index a2215bd40..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystem.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperSubSystem Class After Editing</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>DeveloperSubSystem Class After Editing</h1>
-<pre><samp>
-package samples.subsystems;
-
-<strong>import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.subsystems.IConnectorService;</strong>
-import org.eclipse.rse.core.subsystems.SubSystem;
-<strong>import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.services.clientserver.NamePatternMatcher;
-
-import samples.model.DeveloperResource;
-import samples.model.TeamResource;</strong>
-
-<strong>/**
- * This is our subsystem, which manages the remote connection and resources for
- *  a particular system connection object.
- */</strong>
-public class DeveloperSubSystem extends SubSystem
-{
-	<strong>private TeamResource[] teams; // faked-out master list of teams</strong>
-	<strong>private Vector devVector = new Vector(); // faked-out master list of developers</strong>
-	<strong>private static int employeeId = 123456; // employee Id factory</strong>	
-
-	/**
-	 * @param host
-	 * @param connectorService
-	 */
-	public DeveloperSubSystem(IHost host, IConnectorService connectorService) {
-		super(host, connectorService);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystem#initializeSubSystem(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void initializeSubSystem(IProgressMonitor monitor) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystem#uninitializeSubSystem(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void uninitializeSubSystem(IProgressMonitor monitor) {
-	}
-
-	<strong>/**
-	 * For drag and drop, and clipboard support of remote objects.
-	 *   
-	 * Return the remote object within the subsystem that corresponds to
-	 * the specified unique ID.  Because each subsystem maintains it's own
-	 * objects, it's the responsability of the subsystem to determine
-	 * how an ID (or key) for a given object maps to the real object.
-	 * By default this returns null. 
-	 */
-	public Object getObjectWithAbsoluteName(String key)
-	{
-		//  Functional opposite of getAbsoluteName(Object) in our resource adapters
-		if (key.startsWith("Team_")) //$NON-NLS-1$
-		{
-			String teamName = key.substring(5);
-			TeamResource[] allTeams = getAllTeams();
-			for (int idx=0; idx &lt; allTeams.length; idx++)
-			   if (allTeams[idx].getName().equals(teamName))
-			     return allTeams[idx];
-		}
-		else if (key.startsWith("Devr_")) //$NON-NLS-1$
-		{
-			String devrId = key.substring(5);
-			DeveloperResource[] devrs = getAllDevelopers();
-			for (int idx=0; idx &lt; devrs.length; idx++)
-			  if (devrs[idx].getId().equals(devrId))
-			    return devrs[idx];            	
-		}
-		return null; 
-	}</strong>
-
-	<strong>/**
-	 * When a filter is expanded, this is called for each filter string in the filter.
-	 * Using the criteria of the filter string, it must return objects representing remote resources.
-	 * For us, this will be an array of TeamResource objects.
-	 * 
-	 * @param monitor - the progress monitor in effect while this operation performs
-	 * @param filterString - one of the filter strings from the expanded filter.
-	 */
-	protected Object[] internalResolveFilterString(String filterString, IProgressMonitor monitor)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException                
-	{
-			// Fake it out for now and return dummy list. 
-			// In reality, this would communicate with remote server-side code/data.
-			TeamResource[] allTeams = getAllTeams();
-			
-			// Now, subset master list, based on filter string...
-			NamePatternMatcher subsetter = new NamePatternMatcher(filterString);
-			Vector v = new Vector();
-			for (int idx = 0; idx &lt; allTeams.length; idx++)
-			{
-				if (subsetter.matches(allTeams[idx].getName()))
-				  v.addElement(allTeams[idx]);
-			}		
-			TeamResource[] teams = new TeamResource[v.size()];
-			for (int idx=0; idx &lt; v.size(); idx++)
-			   teams[idx] = (TeamResource)v.elementAt(idx);
-			return teams;
-	}</strong>
-
-	<strong>/**
-	 * When a remote resource is expanded, this is called to return the children of the resource, if
-	 * the resource's adapter states the resource object is expandable.
-	 * For us, it is a Team resource that was expanded, and an array of Developer resources will be returned.
-	 * 
-	 * @param monitor - the progress monitor in effect while this operation performs
-	 * @param parent - the parent resource object being expanded
-	 * @param filterString - typically defaults to "*". In future additional user-specific quick-filters may be supported.
-	 */
-	<a id="resolveFilterString"></a>protected Object[] internalResolveFilterString(Object parent, String filterString, IProgressMonitor monitor)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException
-	{
-		// typically we ignore the filter string as it is always "*" 
-		//  until support is added for "quick filters" the user can specify/select
-		//  at the time they expand a remote resource.
-		
-		TeamResource team = (TeamResource)parent;
-		return team.getDevelopers();
-	}</strong>
-
-	<strong>// ------------------	
-	// Our own methods...
-	// ------------------</strong>
-
-	<strong>/**
-	 * Get the list of all teams. Normally this would involve a trip the server, but we 
-	 *  fake it out and return a hard-coded local list. 
-	 */
-	public TeamResource[] getAllTeams()
-	{
-		if (teams == null) 
-		  teams = createTeams("Team ", 4);
-		return teams;		
-	}</strong>
-
-	<strong>/**
-	 * Get the list of all developers. Normally this would involve a trip the server, but we 
-	 *  fake it out and return a hard-coded local list. 
-	 */
-	public DeveloperResource[] getAllDevelopers()
-	{
-		DeveloperResource[] allDevrs = new DeveloperResource[devVector.size()];
-		for (int idx = 0; idx &lt; allDevrs.length; idx++)
-		  allDevrs[idx] = (DeveloperResource)devVector.elementAt(idx);
-		return allDevrs;		
-	}</strong>
-
-	<strong>/*
-	 * Create and return a dummy set of teams
-	 */
-	private TeamResource[] createTeams(String prefix, int howMany)
-	{
-		TeamResource[] teams = new TeamResource[howMany];
-		for (int idx = 0; idx &lt; teams.length; idx++)
-		{
-			teams[idx] = new TeamResource(this);
-			teams[idx].setName(prefix + (idx+1));
-			teams[idx].setDevelopers(createDevelopers(teams[idx].getName()+" developer",idx+1));
-		}
-		return teams;
-	}</strong>
-
-	<strong>/*
-	 * Create and return a dummy set of developers
-	 */
-	private DeveloperResource[] createDevelopers(String prefix, int nbr)
-	{
-		DeveloperResource[] devrs = new DeveloperResource[nbr];
-		for (int idx=0; idx &lt; devrs.length; idx++)
-		{
-			devrs[idx] = new DeveloperResource(this);
-			devrs[idx].setName(prefix + (idx+1));
-			devrs[idx].setId(Integer.toString(employeeId++));
-			devrs[idx].setDeptNbr(Integer.toString((idx+1)*100));
-			devVector.add(devrs[idx]); // update master list
-		}
-		return devrs;
-	}</strong>
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystem2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystem2.html
deleted file mode 100755
index 7cd52969e..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystem2.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperSubSystem Class After Editing Supporting Multiple Filter Types</title>
-</head>
-
-<body>
-<h1>DeveloperSubSystem Class After Editing Supporting Multiple Filter Types</h1>
-<pre><samp>
-package samples.subsystems;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.SubSystem;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.services.clientserver.NamePatternMatcher;
-
-import samples.model.DeveloperResource;
-import samples.model.TeamResource;
-
-/**
- * This is our subsystem, which manages the remote connection and resources for
- *  a particular system connection object.
- */
-public class DeveloperSubSystem extends SubSystem
-{
-	private TeamResource[] teams; // faked-out master list of teams
-	private Vector devVector = new Vector(); // faked-out master list of developers
-	private static int employeeId = 123456; // employee Id factory	
-
-	/**
-	 * @param host
-	 * @param connectorService
-	 */
-	public DeveloperSubSystem(IHost host, IConnectorService connectorService) {
-		super(host, connectorService);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystem#initializeSubSystem(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void initializeSubSystem(IProgressMonitor monitor) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystem#uninitializeSubSystem(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void uninitializeSubSystem(IProgressMonitor monitor) {
-	}
-
-	/**
-	 * For drag and drop, and clipboard support of remote objects.
-	 *   
-	 * Return the remote object within the subsystem that corresponds to
-	 * the specified unique ID.  Because each subsystem maintains it's own
-	 * objects, it's the responsability of the subsystem to determine
-	 * how an ID (or key) for a given object maps to the real object.
-	 * By default this returns null. 
-	 */
-	public Object getObjectWithAbsoluteName(String key)
-	{
-		//  Functional opposite of getAbsoluteName(Object) in our resource adapters
-		if (key.startsWith("Team_"))
-		{
-			String teamName = key.substring(5);
-			TeamResource[] allTeams = getAllTeams();
-			for (int idx = 0; idx &lt; allTeams.length; idx++)
-			   if (allTeams[idx].getName().equals(teamName))
-			     return allTeams[idx];
-		}
-		else if (key.startsWith("Devr_"))
-		{
-			String devrId = key.substring(5);
-			DeveloperResource[] devrs = getAllDevelopers();
-			for (int idx=0; idx &lt; devrs.length; idx++)
-			  if (devrs[idx].getId().equals(devrId))
-			    return devrs[idx];            	
-		}
-		return null; 
-	}
-
-	/**
-	 * When a filter is expanded, this is called for each filter string in the filter.
-	 * Using the criteria of the filter string, it must return objects representing remote resources.
-	 * For us, this will be an array of TeamResource objects.
-	 * 
-	 * @param monitor - the progress monitor in effect while this operation performs
-	 * @param filterString - one of the filter strings from the expanded filter.
-	 */
-	protected Object[] internalResolveFilterString(String filterString, IProgressMonitor monitor)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException                
-	{
-		<strong>int slashIdx = filterString.indexOf('/');
-		if (slashIdx &lt; 0)
-		{</strong>
-			// Fake it out for now and return dummy list. 
-			// In reality, this would communicate with remote server-side code/data.
-			TeamResource[] allTeams = getAllTeams();
-			
-			// Now, subset master list, based on filter string...
-			NamePatternMatcher subsetter = new NamePatternMatcher(filterString);
-			Vector v = new Vector();
-			for (int idx=0; idx &lt; allTeams.length; idx++)
-			{
-				if (subsetter.matches(allTeams[idx].getName()))
-				  v.addElement(allTeams[idx]);
-			}		
-			TeamResource[] teams = new TeamResource[v.size()];
-			for (int idx=0; idx &lt; v.size(); idx++)
-			   teams[idx] = (TeamResource)v.elementAt(idx);
-			return teams;
-		<strong>}
-		else
-		{
-			String teamName = filterString.substring(0, slashIdx);
-			String devrName = filterString.substring(slashIdx+1);
-			TeamResource[] allTeams = getAllTeams();
-			TeamResource match = null;
-			for (int idx=0; (match==null) &amp;&amp; (idx &lt; allTeams.length); idx++)
-			   if (allTeams[idx].getName().equals(teamName))
-			     match = allTeams[idx];
-			if (match != null)
-			{
-				DeveloperResource[] allDevrs = match.getDevelopers();
-				// Now, subset master list, based on filter string...
-				NamePatternMatcher subsetter = new NamePatternMatcher(devrName);
-				Vector v = new Vector();
-				for (int idx=0; idx &lt; allDevrs.length; idx++)
-			    {
-			    	if (subsetter.matches(allDevrs[idx].getName()))
-			    	  v.addElement(allDevrs[idx]);
-			   	}		
-			   	DeveloperResource[] devrs = new DeveloperResource[v.size()];
-			   	for (int idx=0; idx &lt; v.size(); idx++)
-			   	   devrs[idx] = (DeveloperResource)v.elementAt(idx);
-			   	return devrs;	
-			}
-		}
-		return null;</strong>
-	}
-
-	/**
-	 * When a remote resource is expanded, this is called to return the children of the resource, if
-	 * the resource's adapter states the resource object is expandable. <br>
-	 * For us, it is a Team resource that was expanded, and an array of Developer resources will be returned.
-	 * 
-	 * @param monitor - the progress monitor in effect while this operation performs
-	 * @param parent - the parent resource object being expanded
-	 * @param filterString - typically defaults to "*". In future additional user-specific quick-filters may be supported.
-	 */
-	protected Object[] internalResolveFilterString(Object parent, String filterString, IProgressMonitor monitor)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException
-	{
-		// typically we ignore the filter string as it is always "*" 
-		//  until support is added for "quick filters" the user can specify/select
-		//  at the time they expand a remote resource.
-		
-		TeamResource team = (TeamResource)parent;
-		return team.getDevelopers();
-	}
-
-	// ------------------	
-	// Our own methods...
-	// ------------------
-
-	/**
-	 * Get the list of all teams. Normally this would involve a trip the server, but we 
-	 *  fake it out and return a hard-coded local list. 
-	 */
-	public TeamResource[] getAllTeams()
-	{
-		if (teams == null) 
-		  teams = createTeams("Team ", 4);
-		return teams;		
-	}
-
-	/**
-	 * Get the list of all developers. Normally this would involve a trip the server, but we 
-	 *  fake it out and return a hard-coded local list. 
-	 */
-	public DeveloperResource[] getAllDevelopers()
-	{
-		DeveloperResource[] allDevrs = new DeveloperResource[devVector.size()];
-		for (int idx=0; idx &lt; allDevrs.length; idx++)
-		  allDevrs[idx] = (DeveloperResource)devVector.elementAt(idx);
-		return allDevrs;		
-	}
-
-	/*
-	 * Create and return a dummy set of teams
-	 */
-	private TeamResource[] createTeams(String prefix, int howMany)
-	{
-		TeamResource[] teams = new TeamResource[howMany];
-		for (int idx=0; idx &lt; teams.length; idx++)
-		{
-			teams[idx] = new TeamResource(this);
-			teams[idx].setName(prefix + (idx+1));
-			teams[idx].setDevelopers(createDevelopers(teams[idx].getName()+" developer",idx+1));
-		}
-		return teams;
-	}
-
-	/*
-	 * Create and return a dummy set of developers
-	 */
-	private DeveloperResource[] createDevelopers(String prefix, int nbr)
-	{
-		DeveloperResource[] devrs = new DeveloperResource[nbr];
-		for (int idx=0; idx &lt; devrs.length; idx++)
-		{
-			devrs[idx] = new DeveloperResource(this);
-			devrs[idx].setName(prefix + (idx+1));
-			devrs[idx].setId(Integer.toString(employeeId++));
-			devrs[idx].setDeptNbr(Integer.toString((idx+1)*100));
-			devVector.add(devrs[idx]); // update master list
-		}
-		return devrs;
-	}
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html
deleted file mode 100755
index 43f7c91e3..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperSubSystemConfiguration Class After Editing</title>
-</head>
-
-<body>
-<h1>DeveloperSubSystemConfiguration Class After Editing</h1>
-<pre><samp>
-package samples.subsystems;
-
-<strong>import java.util.Vector;</strong>
-
-<strong>import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;</strong>
-import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
-<strong>import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.model.IHost;</strong>
-
-<strong>import samples.RSESamplesPlugin;</strong>
-
-/**
- * This is our subsystem factory, which creates instances of our subsystems,
- *  and supplies the subsystem and filter actions to their popup menus.
- */
-public class DeveloperSubSystemConfiguration extends SubSystemConfiguration {
-
-	/**
-	 * Constructor for DeveloperSubSystemConfiguration.
-	 */
-	public DeveloperSubSystemConfiguration() {
-		super();
-	}
-
-	/**
-	 * Create an instance of our subsystem.
-	 */
-	<strong>public ISubSystem createSubSystemInternal(IHost conn) {
-	   	return new DeveloperSubSystem(conn, getConnectorService(conn));
-	}</strong>
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.core.model.IHost)
-	 */
-	public IConnectorService getConnectorService(IHost host) {
-		<strong>return DeveloperConnectorServiceManager.getInstance()
-			.getConnectorService(host, IDeveloperSubSystem.class);</strong>
-	}
-
-	/**
-	 * Intercept of parent method that creates an initial default filter pool.
-	 * We intercept so that we can create an initial filter in that pool, which will
-	 *  list all teams.
-	 */
-	<a id="createDefaultFilterPool"></a><strong>protected ISystemFilterPool createDefaultFilterPool(ISystemFilterPoolManager mgr)
-	{
-		ISystemFilterPool defaultPool = null;
-		try {
-			defaultPool = mgr.createSystemFilterPool(getDefaultFilterPoolName(mgr.getName(), getId()), true); // true=>is deletable by user
-			Vector strings = new Vector();
-			strings.add("*");
-			mgr.createSystemFilter(defaultPool, "All teams", strings);
-		} catch (Exception exc) {}
-		return defaultPool;
-	}</strong>
-	
-	/**
-	 * Intercept of parent method so we can supply our own value shown in the property
-	 *  sheet for the "type" property when a filter is selected within our subsystem.
-	 *
-	 * Requires this line in rseSamplesResources.properties: property.type.teamfilter=Team filter
-	 */
-	<strong>public String getTranslatedFilterTypeProperty(ISystemFilter selectedFilter)
-	{
-	   	return RSESamplesPlugin.getResourceString("property.type.teamfilter");
-	}</strong>
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsUserId()
-	 */
-	<strong>public boolean supportsUserId() {
-		return false;
-	}</strong>
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.core.model.IHost)
-	 */
-	<strong>public boolean supportsServerLaunchProperties(IHost host) {
-		return false;
-	}</strong>
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html
deleted file mode 100755
index ee93878b6..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperSubSystemFactory Class After Editing For Filter Support</title>
-</head>
-
-<body>
-<h1>DeveloperSubSystemFactory Class After Editing For Filter Support</h1>
-<pre><samp>
-package samples.subsystems;
-
-import java.util.Vector;
-
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.model.IHost;
-
-import samples.RSESamplesPlugin;
-
-/**
- * This is our subsystem factory, which creates instances of our subsystems,
- *  and supplies the subsystem and filter actions to their popup menus.
- */
-public class DeveloperSubSystemConfiguration extends SubSystemConfiguration {
-
-	/**
-	 * Constructor for DeveloperSubSystemConfiguration.
-	 */
-	public DeveloperSubSystemConfiguration() {
-		super();
-	}
-
-	/**
-	 * Create an instance of our subsystem.
-	 */
-	public ISubSystem createSubSystemInternal(IHost conn) {
-	   	return new DeveloperSubSystem(conn, getConnectorService(conn));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.core.model.IHost)
-	 */
-	public IConnectorService getConnectorService(IHost host) {
-		return DeveloperConnectorServiceManager.getInstance()
-			.getConnectorService(host, IDeveloperSubSystem.class);
-	}
-
-	/**
-	 * Intercept of parent method that creates an initial default filter pool.
-	 * We intercept so that we can create an initial filter in that pool, which will
-	 *  list all teams.
-	 */
-	protected ISystemFilterPool createDefaultFilterPool(ISystemFilterPoolManager mgr)
-	{
-		ISystemFilterPool defaultPool = null;
-		try {
-			defaultPool = mgr.createSystemFilterPool(getDefaultFilterPoolName(mgr.getName(), getId()), true); // true=>is deletable by user
-			Vector strings = new Vector();
-			strings.add("*");
-			I<strong>SystemFilter filter = mgr.createSystemFilter(defaultPool, 
-					RSESamplesPlugin.getResourceString("filter.default.name"),
-					strings);
-			filter.setType("team");</strong>
-		} catch (Exception exc) {}
-		return defaultPool;
-	}
-	
-	/**
-	 * Intercept of parent method so we can supply our own value shown in the property
-	 *  sheet for the "type" property when a filter is selected within our subsystem.
-	 *
-	 * Requires this line in rseSamplesResources.properties: property.type.teamfilter=Team filter
-	 */
-	public String getTranslatedFilterTypeProperty(ISystemFilter selectedFilter)
-	{
-	   	<strong>String type = selectedFilter.getType();
-	   	if (type == null)
-	   	  type = "team";
-	   	if (type.equals("team"))
-	   	  return RSESamplesPlugin.getResourceString("property.type.teamfilter");
-	   	else
-	   	  return RSESamplesPlugin.getResourceString("property.type.devrfilter");</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsUserId()
-	 */
-	public boolean supportsUserId() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.core.model.IHost)
-	 */
-	public boolean supportsServerLaunchProperties(IHost host) {
-		return false;
-	}
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/FolderInfoPropertyPage1.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/FolderInfoPropertyPage1.html
deleted file mode 100755
index 61fb592d5..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/FolderInfoPropertyPage1.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>FolderInfoPropertyPage Class After Creation</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>FolderInfoPropertyPage Class After Creation</h1>
-<p>
-<pre><samp>
-package samples.ui.propertypages;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.rse.files.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction;
-
-public class <b>FolderInfoPropertyPage</b>
-	extends SystemAbstractRemoteFilePropertyPageExtensionAction
-{
-
-	/**
-	 * Constructor for FolderInfoPropertyPage.
-	 */
-	public <b>FolderInfoPropertyPage</b>()
-	{
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.rse.ui.propertypages.SystemBasePropertyPage#createContentArea(Composite)
-	 */
-	protected Control <b>createContentArea</b>(Composite parent)
-	{
-		return null;
-	}
-
-}
-</samp></pre>
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/FolderInfoPropertyPage2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/FolderInfoPropertyPage2.html
deleted file mode 100755
index 1dc8da395..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/FolderInfoPropertyPage2.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>FolderInfoPropertyPage Class After Editing</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>FolderInfoPropertyPage Class After Editing</h1>
-<p>
-<pre><samp>
-package samples.ui.propertypages;
-
-import org.eclipse.rse.files.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-
-import samples.RSESamplesPlugin;
-
-/**
- * A sample property page for a remote object, which in this case is scoped via the
- *  extension point xml to only apply to folder objects.
- */
-public class FolderInfoPropertyPage
-	extends SystemAbstractRemoteFilePropertyPageExtensionAction
-	implements SelectionListener
-{
-	// gui widgets...
-	private Label sizeLabel, filesLabel, foldersLabel;
-	private Button stopButton;
-	// state...
-	private int totalSize = 0;
-	private int totalFolders = 0;
-	private int totalFiles = 0;
-	private boolean stopped = false;
-	private Thread workerThread;
-	private Runnable guiUpdater;
-
-	/**
-	 * Constructor for FolderInfoPropertyPage.
-	 */
-	public FolderInfoPropertyPage()
-	{
-		super();
-	}
-
-	// --------------------------
-	// Parent method overrides...
-	// --------------------------
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.files.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction#createContentArea(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContentArea(Composite parent)
-	{
-		Composite composite = SystemWidgetHelpers.createComposite(parent, 2);
-		// draw the gui		
-		sizeLabel = SystemWidgetHelpers.createLabeledLabel(composite, 
-				RSESamplesPlugin.getResourceString("pp.size.label"), //$NON-NLS-1$
-				RSESamplesPlugin.getResourceString("pp.size.tooltip"), //$NON-NLS-1$
-				false);
-		filesLabel = SystemWidgetHelpers.createLabeledLabel(composite, 
-				RSESamplesPlugin.getResourceString("pp.files.label"), //$NON-NLS-1$
-				RSESamplesPlugin.getResourceString("pp.files.tooltip"), //$NON-NLS-1$
-				false);
-		foldersLabel = SystemWidgetHelpers.createLabeledLabel(composite, 
-				RSESamplesPlugin.getResourceString("pp.folders.label"), //$NON-NLS-1$
-				RSESamplesPlugin.getResourceString("pp.folders.tooltip"), //$NON-NLS-1$
-				false);
-		stopButton = SystemWidgetHelpers.createPushButton(composite, null, 
-				RSESamplesPlugin.getResourceString("pp.stopButton.label"), //$NON-NLS-1$
-				RSESamplesPlugin.getResourceString("pp.stopButton.tooltip") //$NON-NLS-1$
-				);
-		stopButton.addSelectionListener(this);
-		
-		setValid(false); // Disable OK button until thread is done
-		
-		// show "Processing..." message
-		setMessage(RSESamplesPlugin.getPluginMessage("RSSG1002")); //$NON-NLS-1$
-		
-		// create instance of Runnable to allow asynchronous GUI updates from background thread	   
-		guiUpdater = new RunnableGUIClass();
-		// spawn a thread to calculate the information
-		workerThread = new RunnableClass(getRemoteFile());
-		workerThread.start();
-		
-		return composite;
-	}
-	
-	/**
-	 * Intercept from PreferencePage. Called when user presses Cancel button.
-	 * We stop the background thread.
-	 * @see org.eclipse.jface.preference.PreferencePage#performCancel()
-	 */
-	public boolean performCancel() 
-	{
-		killThread();
-		return true;
-	}			
-	
-	/**
-	 * Intercept from DialogPage. Called when dialog going away.
-	 * If the user presses the X to close this dialog, we 
-	 *  need to stop that background thread.
-	 */
-	public void dispose()
-	{
-		killThread();
-		super.dispose();
-	}
-	
-	/**
-	 * Private method to kill our background thread.
-	 * Control doesn't return until it ends.
-	 */
-	private void killThread()
-	{
-		if (!stopped &amp;&amp; workerThread.isAlive())
-		{
-		    stopped = true;
-		    try {
-		      workerThread.join(); // wait for thread to end
-		    } catch (InterruptedException exc) {}
-		}		
-	}
-
-	// -------------------------------------------
-	// Methods from SelectionListener interface...
-	// -------------------------------------------
-	
-	/**
-	 * From SelectionListener
-	 * @see SelectionListener#widgetSelected(SelectionEvent)
-	 */
-	public void widgetSelected(SelectionEvent event) 
-	{
-		if (event.getSource() == stopButton)
-		{
-			stopped = true;
-			stopButton.setEnabled(false);
-		}
-	}
-	/**
-	 * From SelectionListener
-	 * @see SelectionListener#widgetDefaultSelected(SelectionEvent)
-	 */
-	public void widgetDefaultSelected(SelectionEvent event)
-	{
-	}
-
-	// ----------------
-	// Inner classes...
-	// ----------------
-	/**
-	 * Inner class encapsulating the background work to be done, so it may be executed
-	 *  in background thread.
-	 */
-	private class RunnableClass extends Thread
-	{
-		IRemoteFile inputFolder;
-		
-		RunnableClass(IRemoteFile inputFolder)
-		{
-			this.inputFolder = inputFolder;
-		}
-		
-		public void run()
-		{
-			if (stopped)
-			  return;
-			walkFolder(inputFolder);						
-			updateGUI();
-			if (!stopped)
-			{
-				stopped = true;
-				updateGUI();
-			}
-		}
-		
-		/**
-		 * Recursively walk a folder, updating the running tallies. 
-		 * Update the GUI after processing each subfolder.
-		 */
-		private void walkFolder(IRemoteFile currFolder)
-		{
-			try
-			{
-			IRemoteFile[] folders = currFolder.getParentRemoteFileSubSystem().listFoldersAndFiles( currFolder, null);
-			if ((folders != null) &amp;&amp; (folders.length&gt;0))
-			{
-				for (int idx=0; !stopped &amp;&amp; (idx&lt;folders.length); idx++)
-				{
-					// is this a folder? 
-					if (folders[idx].isDirectory())
-					{
-						++totalFolders;
-						walkFolder(folders[idx]);
-						updateGUI();
-					}
-					// is this a file?
-					else
-					{
-						++totalFiles;
-						totalSize += folders[idx].getLength();
-					}
-				}
-			}
-			}
-			catch (SystemMessageException e)
-			{
-				
-			}
-		} // end of walkFolder method
-
-	} // end of inner class
-	
-	/**
-	 * Inner class encapsulating the GUI work to be done from the
-	 *  background thread.
-	 */
-	private class RunnableGUIClass implements Runnable
-	{
-		public void run()
-		{
-			if (stopButton.isDisposed())
-			  return; 
-			if (!stopped)
-			{
-				sizeLabel.setText(Integer.toString(totalSize));		
-				filesLabel.setText(Integer.toString(totalFiles));
-				foldersLabel.setText(Integer.toString(totalFolders));
-			}
-			else if (stopped)
-			{				
-				setValid(true); // re-enable OK button								
-				stopButton.setEnabled(false); // disable Stop button				
-				clearMessage(); // clear "Processing..." message
-			}			  
-		}
-	}	
-
-	
-	/**
-	 * Update the GUI with the current status
-	 */
-	private void updateGUI()
-	{
-		Display.getDefault().asyncExec(guiUpdater);
-	}
-
-
-}
-</samp></pre>
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/IDeveloperSubSystem.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/IDeveloperSubSystem.html
deleted file mode 100755
index cf13a5a2d..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/IDeveloperSubSystem.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>IDeveloperSubSystem Interface After Creation</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>IDeveloperSubSystem Interface After Creation</h1>
-<p>
-<pre><samp>
-package samples.subsystems;
-
-/**
- * Interface identifying our unique subsystems
- */
-public interface <b>IDeveloperSubSystem</b> 
-{
-
-}
-
-</samp></pre>
-</p>
-</body>
-</html>
-
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/InitializeImageRegistry.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/InitializeImageRegistry.html
deleted file mode 100755
index 2d618b753..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/InitializeImageRegistry.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>InitializeImageRegistry Method</title>
-</head>
-
-<body>
-<h1>InitializeImageRegistry Method</h1>
-<pre><samp>
-	/**
-	 * <i>Initialize the image registry by declaring all of the required graphics.</i>
-	 */
-	protected void initializeImageRegistry()
-	{
-		String path = getIconPath();
-		<b>putImageInRegistry("ICON_ID_TEAM", path + "team.gif");</b>
-		<b>putImageInRegistry("ICON_ID_DEVELOPER", path + "developer.gif");</b>
-	}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/InitializeImageRegistry2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/InitializeImageRegistry2.html
deleted file mode 100755
index b62de4e67..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/InitializeImageRegistry2.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>InitializeImageRegistry Method</title>
-</head>
-
-<body>
-<h1>InitializeImageRegistry Method</h1>
-<pre><samp>
-	/**
-	 * <i>Initialize the image registry by declaring all of the required graphics.</i>
-	 */
-	protected void initializeImageRegistry()
-	{
-		String path = getIconPath();
-		putImageInRegistry("ICON_ID_TEAM", path + "team.gif");
-		putImageInRegistry("ICON_ID_DEVELOPER", path + "developer.gif");
-		<b>putImageInRegistry("ICON_ID_TEAMFILTER", path + "teamFilter.gif");</b>
-		<b>putImageInRegistry("ICON_ID_DEVELOPERFILTER", path + "developerFilter.gif");</b>
-	}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/NewFilterActions.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/NewFilterActions.gif
deleted file mode 100755
index 473b3fa4d..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/NewFilterActions.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/NewFilterIcons.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/NewFilterIcons.gif
deleted file mode 100755
index 4889771e5..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/NewFilterIcons.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/NewFilterWizard.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/NewFilterWizard.gif
deleted file mode 100755
index 692fbb263..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/NewFilterWizard.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/RSESamplesPlugin.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/RSESamplesPlugin.html
deleted file mode 100755
index 9e450f86c..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/RSESamplesPlugin.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSESamplesPlugin Class</title>
-</head>
-
-<body>
-<h1>RSESamplesPlugin Class</h1>
-<pre><code>
-package rsesamples;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class RSESamplesPlugin extends SystemBasePlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "RSESamples";
-
-	// The shared instance
-	private static RSESamplesPlugin plugin;
-	
-	// ResourceBundle
-	private ResourceBundle resourceBundle = null;
-	
-	// Message file
-	private SystemMessageFile messageFile = null;
-	
-	/**
-	 * The constructor
-	 */
-	public RSESamplesPlugin() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.SystemBasePlugin#initializeImageRegistry()
-	 */
-	protected void initializeImageRegistry() {
-	}
-	
-	/**
-	 * Retrieves the string resource bundle associated with this plugin.
-	 * @return the ResourceBundle or null if the bundle could not be loaded.
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null) {
-				resourceBundle = ResourceBundle.getBundle("rseSamplesResources.properties");
-			}
-		} catch (MissingResourceException e) {
-			SystemBasePlugin.logError("Missing rseSamplesResources.properties", e);
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * Retrieves the SystemMessageFile associated with this plugin.
-	 * @return the SystemMessageFile or null if the message file 
-	 * could not be loaded.
-	 */
-	public SystemMessageFile getMessageFile() {
-		if (messageFile == null) {
-			messageFile = loadMessageFile(this.getBundle(), "rseSamplesMessages.xml"); //$NON-NLS-1$
-		}
-		return messageFile;
-	}
-
-	/**
-	 * Retrieves the singleton workspace for this workbench.
-	 * This is a convenience method, fully equivalent to 
-	 * ResourcesPlugin.getWorkspace().
-	 * @return the singleton workspace
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	/**
-	 * Retrieve a string from the plugin's resource bundle.
-	 * @param key the key to the string
-	 * @return the retrieved string or the key if the string could not be
-	 * found or the bundle could not be loaded.
-	 */
-	public static String getResourceString(String key) {
-		String result = null;
-		ResourceBundle bundle = RSESamplesPlugin.getDefault().getResourceBundle();
-		if (bundle != null) {
-			try {
-				result = bundle.getString(key);
-			} catch (MissingResourceException e) {
-				SystemBasePlugin.logError("Missing key in bundle", e);
-			}
-		}
-		if (result == null) {
-			result = key;
-		}
-		return result;
-	}
-	
-	/**
-	 * Retrieve the SystemMessageFile for this plugin.
-	 * @return the SystemMessageFile or null if the message file
-	 * could not be loaded.
-	 */
-	public static SystemMessageFile getPluginMessageFile() {
-		return RSESamplesPlugin.getDefault().getMessageFile();
-	}
-	
-	/**
-	 * Retrieve a SystemMessage from the message file for this 
-	 * plugin given its message id.
-	 * @param messageId the message id to retrieve
-	 * @return the retrieved SystemMessage or null if the message
-	 * was not found in the message file or the message file
-	 * could not be loaded.
-	 */
-	public static SystemMessage getPluginMessage(String messageId) {
-		SystemMessage message = null;
-		SystemMessageFile messageFile = getPluginMessageFile();
-		if (messageFile != null) {
-			message = messageFile.getMessage(messageId); 
-		}
-		return message;
-	}
-	
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static RSESamplesPlugin getDefault() {
-		return plugin;
-	}
-
-}
-</code></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/RSESamplesPlugin2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/RSESamplesPlugin2.html
deleted file mode 100755
index 0d8c9a4b3..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/RSESamplesPlugin2.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSESamplesPlugin Class</title>
-</head>
-
-<body>
-<h1>RSESamplesPlugin Class</h1>
-<pre><samp>
-package samples;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.osgi.framework.BundleContext;
-
-import samples.subsystems.DeveloperSubSystemConfigurationAdapterFactory;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class RSESamplesPlugin extends SystemBasePlugin  {
-
-	//The shared instance.
-	private static RSESamplesPlugin plugin;
-
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	private static SystemMessageFile messageFile = null;
-	
-	/**
-	 * The constructor.
-	 */
-	public RSESamplesPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		messageFile = getMessageFile("rseSamplesMessages.xml"); //$NON-NLS-1$
-
-		IAdapterManager manager = Platform.getAdapterManager();
-		samples.model.DeveloperAdapterFactory factory = new samples.model.DeveloperAdapterFactory();
-		manager.registerAdapters(factory, samples.model.TeamResource.class);
-		manager.registerAdapters(factory, samples.model.DeveloperResource.class);
-
-	    DeveloperSubSystemConfigurationAdapterFactory sscaf = new DeveloperSubSystemConfigurationAdapterFactory();
-	    sscaf.registerWithManager(manager);
-
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static RSESamplesPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle= RSESamplesPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("samples.rseSamplesResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * @see AbstractUIPlugin#initializeDefaultPreferences
-	 */
-	//protected void initializeDefaultPreferences(IPreferenceStore store) 
-	//{
-	//	super.initializeDefaultPreferences(store);
-	//	//RSESamplesPreferencePage.initDefaults(store);
-	//}
-	
-	/**
-	 * Initialize the image registry by declaring all of the required graphics.
-	 */
-	protected void initializeImageRegistry()
-	{
-		String path = getIconPath();
-		putImageInRegistry("ICON_ID_TEAM", path + "team.gif");
-		putImageInRegistry("ICON_ID_DEVELOPER", path + "developer.gif");
-		putImageInRegistry("ICON_ID_TEAMFILTER", path + "teamFilter.gif");
-		putImageInRegistry("ICON_ID_DEVELOPERFILTER", path + "developerFilter.gif");
-	}
-
-	/**
-	 * Load a message file for this plugin.
-	 * @param messageFileName - the name of the message xml file. Will look for it in this plugin's install folder.
-	 * @return a message file object containing the parsed contents of the message file, or null if not found.
-	 */
-    public SystemMessageFile getMessageFile(String messageFileName)
-    {
-       return loadMessageFile(getBundle(), messageFileName);  	
-    }	
-
-	/**
-	 * Return our message file
-	 */
-	public static SystemMessageFile getPluginMessageFile()
-	{
-		return messageFile;
-	}  
-
-	/**
-	 * Retrieve a message from this plugin's message file
-	 */
-	public static SystemMessage getPluginMessage(String msgId)
-	{
-		return getMessage(messageFile, msgId);
-	}
-}
-</samp></pre>
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/ShowJarContents1.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/ShowJarContents1.html
deleted file mode 100755
index e49235490..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/ShowJarContents1.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>ShowJarContents Class After Creation</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>ShowJarContents Class After Creation</h1>
-<pre><samp>
-package samples.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class ShowJarContents implements IObjectActionDelegate {
-
-	public ShowJarContents() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void run(IAction action) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/ShowJarContents2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/ShowJarContents2.html
deleted file mode 100755
index 8e9e0fe7b..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/ShowJarContents2.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>ShowJarContents Class After Editing</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>ShowJarContents Class After Editing</h1>
-<pre><samp>
-package samples.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.shells.ui.RemoteCommandHelpers;
-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
-import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * An action that runs a command to display the contents of a Jar file.
- * The plugin.xml file restricts this action so it only appears for .jar files.
- */
-public class ShowJarContents implements IObjectActionDelegate {
-	private List _selectedFiles;
-
-	/**
-	 * Constructor for ShowJarContents.
-	 */
-	public ShowJarContents() {
-		_selectedFiles = new ArrayList();
-	}
-
-	protected Shell getShell() {
-		return SystemBasePlugin.getActiveWorkbenchShell();
-	}
-
-	protected IRemoteFile getFirstSelectedRemoteFile() {
-		if (_selectedFiles.size() > 0) {
-			return (IRemoteFile) _selectedFiles.get(0);
-		}
-		return null;
-	}
-
-	protected ISubSystem getSubSystem() {
-		return getFirstSelectedRemoteFile().getParentRemoteFileSubSystem();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		IRemoteFile selectedFile = getFirstSelectedRemoteFile();
-		String cmdToRun = "jar -tvf " + selectedFile.getAbsolutePath(); //$NON-NLS-1$
-		try {
-			runCommand(cmdToRun);
-		} catch (Exception e) {
-			String excType = e.getClass().getName();
-			MessageDialog.openError(getShell(), excType, excType + ": " + e.getLocalizedMessage()); //$NON-NLS-1$
-			e.printStackTrace();
-		}
-	}
-
-	public IRemoteCmdSubSystem getRemoteCmdSubSystem() {
-		//get the Command subsystem associated with the current host
-		IHost myHost = getSubSystem().getHost();
-		IRemoteCmdSubSystem[] subsys = RemoteCommandHelpers.getCmdSubSystems(myHost);
-		for (int i = 0; i &lt; subsys.length; i++) {
-			if (subsys[i].getSubSystemConfiguration().supportsCommands()) {
-				return subsys[i];
-			}
-		}
-		return null;
-	}
-
-	public void runCommand(String command) throws Exception {
-		IRemoteCmdSubSystem cmdss = getRemoteCmdSubSystem();
-		if (cmdss != null &amp;&amp; cmdss.isConnected()) {
-			// Run the command in a visible shell
-			RemoteCommandHelpers.runUniversalCommand(getShell(), command, ".", cmdss); //$NON-NLS-1$
-		} else {
-			MessageDialog.openError(getShell(), "No command subsystem", "Found no command subsystem");
-		}
-	}
-
-	public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection selection) {
-		_selectedFiles.clear();
-		// store the selected jars to be used when running
-		Iterator theSet = ((IStructuredSelection) selection).iterator();
-		while (theSet.hasNext()) {
-			Object obj = theSet.next();
-			if (obj instanceof IRemoteFile) {
-				_selectedFiles.add(obj);
-			}
-		}
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamFilterDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamFilterDialog.gif
deleted file mode 100755
index 4d2ae4028..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamFilterDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamFilterWizard.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamFilterWizard.gif
deleted file mode 100755
index 1590342e3..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamFilterWizard.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamResource.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamResource.html
deleted file mode 100755
index 9fbe890f1..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamResource.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>TeamResource Class After Editing</title>
-</head>
-
-<body>
-<h1>TeamResource Class After Editing</h1>
-<pre><samp>
-package samples.model;
-
-import org.eclipse.rse.core.subsystems.AbstractResource;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * This models a remote resource representing a team defined on a particular system.
- */
-public class TeamResource extends AbstractResource {
-
-	private String name;
-	private DeveloperResource[] developers;
-	
-	/**
-	 * Default constructor
-	 */
-	public TeamResource()
-	{
-		super();
-	}
-	/**
-	 * Constructor for TeamResource when given a parent subsystem.
-	 */
-	public TeamResource(ISubSystem parentSubSystem)
-	{
-		super(parentSubSystem);
-	}
-	
-	/**
-	 * Returns the name.
-	 * @return String
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Sets the name.
-	 * @param name The name to set
-	 */
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-
-	/**
-	 * Returns the developers.
-	 * @return DeveloperResource[]
-	 */
-	public DeveloperResource[] getDevelopers()
-	{
-		return developers;
-	}
-
-	/**
-	 * Sets the developers.
-	 * @param developers The developers to set
-	 */
-	public void setDevelopers(DeveloperResource[] developers)
-	{
-		this.developers = developers;
-	}
-
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamResourceAdapter.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamResourceAdapter.html
deleted file mode 100755
index 1348c1356..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/TeamResourceAdapter.html
+++ /dev/null
@@ -1,220 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>TeamResourceAdapter Class After Editing</title>
-</head>
-
-<body>
-<h1>TeamResourceAdapter Class After Editing</h1>
-<pre><samp>
-package samples.model;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.rse.ui.SystemMenuManager;
-import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;
-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-
-<strong>import samples.RSESamplesPlugin;</strong>
-<strong>import samples.subsystems.DeveloperSubSystem;</strong>
-
-/**
- * This is the adapter which enables us to work with our remote team resources.
- */
-public class TeamResourceAdapter extends AbstractSystemViewAdapter implements
-		ISystemRemoteElementAdapter {
-
-	/**
-	 * Constructor.
-	 */
-	public TeamResourceAdapter() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#addActions(org.eclipse.rse.ui.SystemMenuManager,
-	 * org.eclipse.jface.viewers.IStructuredSelection, org.eclipse.swt.widgets.Shell, java.lang.String)
-	 */
-	public void addActions(SystemMenuManager menu,
-			IStructuredSelection selection, Shell parent, String menuGroup)
-	{
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	public ImageDescriptor getImageDescriptor(Object element)
-	{
-		<strong>return RSESamplesPlugin.getDefault().getImageDescriptor("ICON_ID_TEAM");</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getText(java.lang.Object)
-	 */
-	public String getText(Object element)
-	{
-		<strong>return ((TeamResource)element).getName();</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getAbsoluteName(java.lang.Object)
-	 */
-	<a id="getAbsoluteName"></a>public String getAbsoluteName(Object object)
-	{
-		<strong>TeamResource team = (TeamResource)object;
-		return "Team_"+team.getName();</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getType(java.lang.Object)
-	 */
-	public String getType(Object element)
-	{
-		<strong>return RSESamplesPlugin.getResourceString("property.team_resource.type");</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element)
-	{
-		return null; // not really used, which is good because it is ambiguous
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element)
-	{
-		<strong>return true;</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object element)
-	{
-		<strong>return ((TeamResource)element).getDevelopers();</strong>
-	}
-
-	/**
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#internalGetPropertyDescriptors()
-	 */
-	protected IPropertyDescriptor[] internalGetPropertyDescriptors()
-	{
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#internalGetPropertyValue(java.lang.Object)
-	 */
-	protected Object internalGetPropertyValue(Object key)
-	{
-		return null;
-	}
-
-	/**
-	 * Intercept of parent method to indicate these objects can be renamed using the RSE-supplied
-	 *  rename action.
-	 */
-	<a id="canRename"></a>public boolean canRename(Object element)
-	{
-		<strong>return true;</strong>
-	}
-	
-	/**
-	 * Intercept of parent method to actually do the rename. RSE supplies the rename GUI, but
-	 *  defers the action work of renaming to this adapter method.
-	 */
-	<a id="doRename"></a>public boolean doRename(Shell shell, Object element, String newName)
-	{
-		<strong>((TeamResource)element).setName(newName);
-		return true;</strong>
-	}
-	// --------------------------------------
-	// ISystemRemoteElementAdapter methods...
-	// --------------------------------------
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getAbsoluteParentName(java.lang.Object)
-	 */
-	public String getAbsoluteParentName(Object element)
-	{
-		<strong>return "root";</strong> // not really applicable as we have no unique hierarchy
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemConfigurationId(java.lang.Object)
-	 */
-	public String getSubSystemConfigurationId(Object element)
-	{
-		<strong>return "samples.subsystems.factory";</strong> // as declared in extension in plugin.xml
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteTypeCategory(java.lang.Object)
-	 */
-	public String getRemoteTypeCategory(Object element)
-	{
-		<strong>return "developers";</strong> // Course grained. Same for all our remote resources.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteType(java.lang.Object)
-	 */
-	public String getRemoteType(Object element)
-	{
-		<strong>return "team";</strong> // Fine grained. Unique to this resource type.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteSubType(java.lang.Object)
-	 */
-	public String getRemoteSubType(Object element)
-	{
-		return null; // Very fine grained. We don't use it.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#refreshRemoteObject(java.lang.Object, java.lang.Object)
-	 */
-	<a id="refreshRemoteObject"></a>public boolean refreshRemoteObject(Object oldElement, Object newElement)
-	{
-		<strong>TeamResource oldTeam = (TeamResource)oldElement;
-		TeamResource newTeam = (TeamResource)newElement;
-		newTeam.setName(oldTeam.getName());
-		return false;</strong> // If developer objects held references to their team names, we'd have to return true
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteParent(org.eclipse.swt.widgets.Shell, java.lang.Object)
-	 */
-	public Object getRemoteParent(Shell shell, Object element) throws Exception
-	{
-		return null; // maybe this would be a Project or Roster object, or leave as null if this is the root
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteParentNamesInUse(org.eclipse.swt.widgets.Shell, java.lang.Object)
-	 */
-	<a id="getNames"></a>public String[] getRemoteParentNamesInUse(Shell shell, Object element)
-			throws Exception
-	{
-		<strong>DeveloperSubSystem ourSS = (DeveloperSubSystem)getSubSystem(element);
-		TeamResource[] allTeams = ourSS.getAllTeams();
-		String[] allNames = new String[allTeams.length];
-		for (int idx = 0; idx &lt; allTeams.length; idx++)
-		  allNames[idx] = allTeams[idx].getName();
-		return allNames;</strong> // Return list of all team names 	
-	}
-}
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/index.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/index.html
deleted file mode 100755
index d96ab0117..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html;charset=utf-8">
-		<meta name="generator" content="Adobe GoLive">
-		<title>RSE Tutorials</title>
-	</head>
-	<body>
-		<p>Note: This page exists only to provide a root page for debugging the 
-		tutorial and should not 
-		be accessible from any page or the table of contents.</p>
-		<p><a href="pdeProject.html">Getting Started</a></p>
-		<p><a href="propertypage.html">Property Page Tutorial</a></p>
-		<p><a href="subsystem.html">Subsystem Tutorial</a></p>
-		<p><a href="popup.html">Popup Menu Tutorial</a></p>
-	</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/newFilterAction.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/newFilterAction.gif
deleted file mode 100755
index 0883a8979..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/newFilterAction.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_1.png b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_1.png
deleted file mode 100755
index 8831ebad9..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_1.png
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props1.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props1.gif
deleted file mode 100755
index 21548f3db..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props1.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props2.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props2.gif
deleted file mode 100755
index 1d3b9ace0..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props2.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props2_addvar1.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props2_addvar1.gif
deleted file mode 100755
index 0f2464574..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props2_addvar1.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props2_addvar2.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props2_addvar2.gif
deleted file mode 100755
index a417d2b85..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props2_addvar2.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props3.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props3.gif
deleted file mode 100755
index 3f985d848..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props3.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props3_addvar1.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props3_addvar1.gif
deleted file mode 100755
index add8e33a8..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props3_addvar1.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props3_addvar2.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props3_addvar2.gif
deleted file mode 100755
index 6ab3d1209..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props3_addvar2.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props4.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props4.gif
deleted file mode 100755
index 78683a717..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props4.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar1.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar1.gif
deleted file mode 100755
index 0106bbd81..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar1.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar1_selectFolder.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar1_selectFolder.gif
deleted file mode 100755
index bf4d7431f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar1_selectFolder.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar2.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar2.gif
deleted file mode 100755
index bad6554da..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar2.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar3.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar3.gif
deleted file mode 100755
index 134eccad8..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar3.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar4.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar4.gif
deleted file mode 100755
index 493a7c8dd..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar4.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar5.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar5.gif
deleted file mode 100755
index 8ec5cb2ff..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_addvar5.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_newVar_msg.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_newVar_msg.gif
deleted file mode 100755
index 8ec5cb2ff..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_props_newVar_msg.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_after.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_after.gif
deleted file mode 100755
index 53fa300b6..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_after.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page1.png b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page1.png
deleted file mode 100755
index 0e6f3fe93..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page1.png
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page2.png b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page2.png
deleted file mode 100755
index 2f7fa7537..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page2.png
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page3.png b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page3.png
deleted file mode 100755
index 1ea6e43f2..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProj_wiz_page3.png
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProject.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProject.html
deleted file mode 100755
index 05a249fed..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/pdeProject.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Creating a Plug-in Project</title>
-</head>
-
-<body>
-<h1>Creating a Plug-in Project</h1>
-<p>To use any Eclipse extension point, including those defined by the Remote System Explorer, you must first create a plug-in project using the plug-in development environment (PDE), which you will do shortly. At its simplest, a plug-in project requires a <tt>MANIFEST.MF</tt> file describing the plugin and its dependencies and, if extending the workbench a <samp>plugin.xml</samp> file identifying the extension points being implemented, and a set of Java classes implementing those extension points. There is usually also a plug-in class file that is used as the overall manager of the project, and point of integration that other classes can rely on.</p>
-<p><i>If you already have a plugin project, you will need to update it slightly to make it extend SystemBasePlugin and add the few methods it requires. You may wish to examine these steps to see what methods to add. The Eclipse environment will keep your classpaths and plugin dependecies in sync for you.</i></p>
-<p>Eclipse supplies a number of plug-in project templates, which generate a number of project files that illustrate examples of various Eclipse extension points. While you are free to pick one of these, or indeed start with any existing plug-in project if you have one, in the RSE tutorials everything is created by hand so as to keep focused on the RSE-required classes and files.</p>
-<p>The following tutorial uses numbered steps to indicate where you are required to do something as you follow along.</p>
-<h2>Step By Step: Creating an RSE Plug-in Project</h2>
-<ol>
-<li>Select <b>File-&gt;New-&gt;Project.</b></li>
-<li>In the dialog box select the <b>Plug-in Project</b> wizard. Click <b>Next &gt;</b>.
-<br><img src="pdeProj_1.png">
-</li>
-<li>In the first page of the wizard enter <b>&quot;RSESamples&quot;</b> for the project name (without the quotes). Click <b>Next &gt;</b>.
-<br><img src="pdeProj_wiz_page1.png">
-</li>
-<li>In the second page of the wizard enter your company for the <b>Plug-in Provider</b>, change the <b>Activator</b> to be "rsesamples.RSESamplesPlugin", and click <b>Next &gt;</b>.
-<br><img src="pdeProj_wiz_page2.png">
-</li>
-<li>In the third page of the wizard uncheck the "Create a plug-in using one of the templates" checkbox and click <b>Finish</b>.
-<br><img src="pdeProj_wiz_page3.png">
-</li>
-<li>Your new plugin project is created and visible in the Package Explorer of the Plug-in Development perspective. Your new plugin properties are also open in the plug-in editor.</li>
-<li>Go to the dependencies tab of the plug-in editor and add the following plugins to the list:
-<ul>
-<li>org.eclipse.core.resources</li>
-<li>org.eclipse.rse.ui</li>
-<li>org.eclipse.rse.services</li>
-<li>org.eclipse.rse.files.ui</li>
-<li>org.eclipse.rse.shells.ui</li>
-<li>org.eclipse.rse.subsystems.files.core</li>
-<li>org.eclipse.rse.subsystems.shells.core</li>
-</ul>
-</li>
-<li>Now go to the MANIFEST.MF tab of the plugin properties.
-This shows the source for the MANIFEST.MF file associated with this plugin.
-Change the Bundle-SymbolicName line adding a singleton:=true directive.
-<pre><code>
-Bundle-SymbolicName:RSESamples;singleton:=true
-</code></pre>
-This allows us to add extensions to the plugin at a later point.
-Save the plugin properties and close the editor.
-</li>
-<li>
-Right-click on the RSESamples project and create a plugin.xml file.
-Normally this would be created if you used a template to create your plugin.
-We will use this file to add extensions to RSE but for now it will just be a skeleton with the following contents:
-<pre><code>
-&lt;plugin&gt;
-&lt;/plugin&gt;
-</code></pre>
-Add the lines above to the empty plugin.xml file and save it.
-</li>
-<li>Expand the <b>src</b> folder, then the <b>rsesamples</b> package folder, and double-click on <samp><b>RSESamplesPlugin.java</b></samp> to edit this class.
-Change it as described below. Reference the source <a href="RSESamplesPlugin.html">here</a> for the details.
-<ul>
-<li>Extend SystemBasePlugin instead of AbstractUIPlugin</li>
-<li>Add the declaration for resourceBundle</li>
-<li>Add the declaration for messageFile</li>
-<li>Invoke the superclass constructor from this constructor</li>
-<li>Add the initializeImageRegistry() method</li>
-<li>Add the getMessageFile() method</li>
-<li>Add the getResourceBundle() method</li>
-<li>Add the static getWorkspace() method</li>
-<li>Add the static getResourceString(String) method</li>
-<li>Add the static getPluginMessageFile() method</li>
-<li>Add the static getPluginMessage(String) method</li>
-</ul>
-</li>
-<li>Create the project's resources file for translatable strings: right-click on the <b>RSESamples</b> project and select <b>New-&gt;File</b> to open the <b>New File</b> wizard. Enter <samp><b>rseSamplesResources.properties</b></samp> for the file name, as was specified in the call to <samp>loadResourceBundle</samp> in the plug-in class's constructor. Press <b>Finish</b> to create the file. You will populate as you go through the tutorials, so for now just <i>close</i> the editor opened for the file.</li>
-<li>Create the project's RSE-style messages file for translatable messages: right-click on the <b>RSESamples</b> project and select <b>New-&gt;File</b> to get the <b>New File</b> wizard. Enter <samp><b>rseSamplesMessages.xml</b></samp> for the file name, as was specified in the call to <samp>loadMessageFile</samp> in the plug-in class's constructor. Press <b>Finish</b> to create the file. You will see the XML editor open for the new file. Press the <b>Source</b> tab at the bottom of the editor, and enter the following lines (so that you can add messages to the file later on):
-<pre><code>
-&lt;?xml version=&quot;1.0&quot; encoding='UTF-8'?&gt;
-&lt;!DOCTYPE MessageFile SYSTEM &quot;../org.eclipse.rse.ui/messageFile.dtd&quot;&gt;
-&lt;!-- This is a message file used by SystemMessage and SystemMessageDialog --&gt;
-&lt;<b>MessageFile</b> Version=&quot;1.0&quot;&gt;
-     &lt;<b>Component</b> Name=&quot;RSE Samples&quot; Abbr=&quot;RSS&quot;&gt;
-          &lt;<b>Subcomponent</b> Name=&quot;General&quot; Abbr=&quot;G&quot;&gt;
-                &lt;<b>MessageList</b>&gt;
-                    &lt;<b>Message</b> ID=&quot;1001&quot; Indicator=&quot;E&quot;&gt;
-                          &lt;<b>LevelOne</b>&gt;Sample message&lt;/<b>LevelOne</b>&gt;		
-                          &lt;<b>LevelTwo</b>&gt;This is a sample with one substitution variable: %1&lt;/<b>LevelTwo</b>&gt;
-                    &lt;/<b>Message</b>&gt;
-                &lt;/<b>MessageList</b>&gt;
-          &lt;/<b>Subcomponent</b>&gt;
-     &lt;/<b>Component</b>&gt;
-&lt;/<b>MessageFile</b>&gt;
-</code></pre>
-Save and close the file.
-</li>
-<li>Your plugin is created and you are ready to go. Now you only need to add the code to implement the extension points.
-</li>
-</ol>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup.html
deleted file mode 100755
index 974f176ff..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Creating a Remote Resource Popup Menu Action</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Creating a Remote Resource pop-up Menu Action</h1>
-<p>In this tutorial, you will use the 
-<samp><A href="../plugin/popup.html">org.eclipse.ui.popupMenus</a></samp> extension point to
-create a pop-up menu action that will appear
-in the context menu for any <samp>.jar</samp> file, for any connection to 
-any system type. The action will be labeled "Show contents" and will simply
-run the <samp>jar -tvf</samp> JDK command when selected, displaying the results
-in the command console. You could expand this example to  copy the file 
-to a local temporary folder, extract the list of file names within the jar, and 
-display those names in an Eclipse table view. 
-</p>
-
-<h2>Step-by-Step: Creating an RSE Remote Resource Pop-up Menu Action</h2>
-
-<ol>
-<li>If you have not already, first <a href="pdeProject.html">create or prepare a plugin project</a>. 
-</li>
-<li>Open the <b>plugin.xml</b> file for editing by right-clicking on it and selecting
-<b>Open With-&gt;Text Editor</b>. Before the ending &lt;/plugin&gt; statement, add the following lines:
-<pre><code>
-   &lt;!-- ======================================= --&gt;
-   &lt;!-- Remote Object Popup Menu Actions        --&gt;
-   &lt;!-- ======================================= --&gt;
-   &lt;extension point=&quot;org.eclipse.ui.popupMenus&quot;&gt;
-      &lt;objectContribution
-               objectClass=&quot;org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile&quot;
-               nameFilter=&quot;*.jar&quot;
-               id=&quot;actions.jar&quot;&gt;
-           &lt;action
-                   label=&quot;Show contents&quot;
-                   tooltip=&quot;List contents of this file&quot;
-                   class=&quot;samples.ui.actions.ShowJarContents&quot;
-                   menubarPath=&quot;additions&quot;
-                   enablesFor=&quot;1&quot;
-                   id=&quot;actions.jar.show&quot;&gt;
-           &lt;/action&gt;
-       &lt;/objectContribution&gt;
-    &lt;/extension&gt;
-</code></pre>
-Save and close the file.
-</li>
-<li>
-Right-click on the project and use the <b>New...</b> action to create a new package in this project named <b>samples.ui.actions</b>.
-</li>
-<li>
-Create the Java class: right-click on the new <B>samples.ui.actions</B> package folder and select <B>New-&gt;Class</B>  to open the <B>New
-Java Class</B> wizard.
-Enter <B>&quot;ShowJarContents&quot;</B> for the <b>Name</b>, add <b>IObjectActionDelegate</b> 
-to the <b>Interfaces</b> that are implemented, and check the <b>constructors from superclass</b> checkbox as shown 
-<A href="popup_newClass.gif">here</A>.
-Click <b>Finish</b> to create the <samp><a href="ShowJarContents1.html">ShowJarContents</a></samp> class.
-</li>
-<li>Edit the generated <samp>ShowJarContents.java</samp> file as follows.
-Use the "Source -&gt; Organize Imports" context menu item to add the appropriate import statements as you edit.
-<ol>
-<li type="i">Add an instance variable to hold a list of remote files and initialize it in the constructor.</li>
-<pre><code>
-	private List _selectedFiles;
-
-	/**
-	 * Constructor for ShowJarContents.
-	 */
-	public ShowJarContents() {
-		_selectedFiles = new ArrayList();
-	}	  
-</code></pre>
-<li type="i">Add the following three utility methods</li>
-<pre><code>
-	protected Shell getShell() {
-		return SystemBasePlugin.getActiveWorkbenchShell();
-	}
-
-	protected IRemoteFile getFirstSelectedRemoteFile() {
-		if (_selectedFiles.size() > 0) {
-			return (IRemoteFile)_selectedFiles.get(0);
-		}
-		return null;
-	}
-
-	protected ISubSystem getSubSystem() {
-		return getFirstSelectedRemoteFile().getParentRemoteFileSubSystem();
-	}
-</code></pre>
-<li type="i">Add the following methods to find the subsystem and run the command:</li>
-<pre><code>
-	public void runCommand(String command) {
-		IRemoteCmdSubSystem cmdss = getRemoteCmdSubSystem();
-		if (cmdss != null &amp;&amp; cmdss.isConnected()) {
-			// Run the command in a visible shell
-			RemoteCommandHelpers.runUniversalCommand(getShell(), command, ".", cmdss); //$NON-NLS-1$
-		} else {
-			MessageDialog.openError(getShell(), "No command subsystem", "Found no command subsystem");
-		}
-	}
-
-	/**
-	 * Gets the Command subsystem associated with the current host
-	 */
-	public IRemoteCmdSubSystem getRemoteCmdSubSystem() {
-		IHost myHost = getSubSystem().getHost();
-		IRemoteCmdSubSystem[] subsys = RemoteCommandHelpers.getCmdSubSystems(myHost);
-		for (int i = 0; i &lt; subsys.length; i++) {
-			if (subsys[i].getSubSystemConfiguration().supportsCommands()) {
-				return subsys[i];
-			}
-		}
-		return null;
-	}
-</code></pre>
-<li type="i">Finally, flesh out the methods that were created as stubs</li>
-<pre><code>
-	public void run(IAction action) {
-		IRemoteFile selectedFile = getFirstSelectedRemoteFile();
-		String cmdToRun = "jar -tvf " + selectedFile.getAbsolutePath(); //$NON-NLS-1$
-		try {
-			runCommand(cmdToRun);
-		} catch (Exception e) {
-			String excType = e.getClass().getName();
-			MessageDialog.openError(getShell(), excType, excType + ": " + e.getLocalizedMessage()); //$NON-NLS-1$
-			e.printStackTrace();
-		}
-	}
-
-	public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection selection) {
-		_selectedFiles.clear();
-		// store the selected jars to be used when running
-		Iterator theSet = ((IStructuredSelection) selection).iterator();
-		while (theSet.hasNext()) {
-			Object obj = theSet.next();
-			if (obj instanceof IRemoteFile) {
-				_selectedFiles.add(obj);
-			}
-		}
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-	}
-</code></pre>
-</ol>
-The final result after editing is shown <a href="ShowJarContents2.html">here</a>.
-</li>
-</ol>
-
-<p>
-Now, you can try your new action. Use <b>Run-&gt;Run As-&gt;Eclipse Application</b>.
- Drill
-down in the RSE to a Jar file in a local or remote connection and right-click to <a href="popup_see.gif">see</a> and <a href="popup_run.gif">run</a> your new action. Notice
-how it does not appear for files that do not end with the ".jar" extension. This is because of  the "nameFilter" attribute
-in our extension point .xml file.
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup_newClass.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup_newClass.gif
deleted file mode 100755
index dc00bb12c..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup_newClass.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup_run.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup_run.gif
deleted file mode 100755
index e6646d36a..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup_run.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup_see.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup_see.gif
deleted file mode 100755
index 5a1734fe8..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/popup_see.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/preferences_JavaFormatting.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/preferences_JavaFormatting.gif
deleted file mode 100755
index 80b15a21d..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/preferences_JavaFormatting.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage.html
deleted file mode 100755
index a45195e00..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Creating a Remote Resource Property Page</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Creating a Remote Resource Property Page</h1>
-<p>In this tutorial, you will use the 
-<samp><A href="../plugin/propertypage.html">org.eclipse.ui.propertyPages</a></samp>
-extension point to
-create a <a href="propertypage_run_done.gif">property page</a> that will appear
-in the Properties dialog for any folder, for any connection to 
-any system type. The page will be labeled "Folder Contents" and will show the
-cumulative size of the contents of the folder, and the number of folders and files within it. 
-This will show the extension point, plus how to use some of the RSE user interface helpers, as well
-as the remote file API for querying information about remote folders and files.
-</p>
-
-<p><b>Tip:</b> If you prefer your Java code to use lined-up braces, select the
-first two options in the <b><A href="preferences_JavaFormatting.gif">Code
-Formatter</A></b> preferences page for <b>Java</b>, via <b>Windows-&gt;Preferences</b>.
-
-This will affect code generated by wizards. The source code shown assumes this option has been set, but this is not required.
-
-
-
-
-<h2>Step-by-Step: Creating a Remote Resource Property Page</h2>
-<ol>
-<li>If you have not already, first <a href="pdeProject.html">create or prepare a plugin project</a>. 
-
-Open the <b>plugin.xml</b> file for editing by right-clicking on it, and selecting
-<b>Open With-&gt;Text Editor</b>. Before the ending &lt;/plugin&gt; statement, add the following lines:
-<pre><code>
-   &lt;!-- ======================================= --&gt;
-   &lt;!-- Remote Object Property Pages            --&gt;
-   &lt;!-- ======================================= --&gt;
-   &lt;extension point=&quot;org.eclipse.ui.propertyPages&quot;&gt;
-       &lt;page name=&quot;Folder Contents&quot;
-               class=&quot;samples.ui.propertypages.FolderInfoPropertyPage&quot;
-               id=&quot;samples.ui.PropertyPage1&quot;&gt;
-           &lt;enabledWhen&gt;
-               &lt;instanceof value=&quot;org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile&quot;/&gt;                        
-           &lt;/enabledWhen&gt;
-           &lt;filter name=&quot;isDirectory&quot; value=&quot;true&quot;/&gt;  
-        &lt;/page&gt;
-   &lt;/extension&gt;    
-</code></pre></li>
-<li>Save and close the file.</li>
-<li>
-Create the Java package: right-click on the <B>src</B> source folder and select <B>New-&gt;Package</B> to get the <B>New
-	Java Package</B> wizard. Enter <B>&quot;samples.ui.propertypages&quot;</B> for the name of the package and press <B>Finish</B>.</li>
-<li>
-Create the Java class: right-click on the new <B>&quot;samples.ui.propertypages&quot;</B> package folder and select <B>New-&gt;Class</B>  to open the <B>New
-Java Class</B> wizard. Enter <B>&quot;FolderInfoPropertyPage&quot;</B> for the <b>Name</b>  
-and <b>&quot;org.eclipse.rse.files.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction&quot;</b> 
-for the <b>Superclass</b>. Select the <b>Constructors from superclass</b> check box, as shown 
-<A href="propertypage_newClass.gif">here</A>. 
-Press <b>Finish</b> to create the <samp><a href="FolderInfoPropertyPage1.html">FolderInfoPropertyPage</a></samp> class.
-</li>
-<li>Edit the <samp>FolderInfoPropertyPage</samp> class to look like <A href="FolderInfoPropertyPage2.html">this</A>. There are many changes, so you should use
-the clipboard to copy and paste.
-</li>
-<li>Edit the <samp>rseSamplesMesssage.xml</samp> file to look like <A href="rseSamplesMessages2.html">this</A>, where the changes are highlighted.
-</li>
-<li>Edit the <samp>rseSamplesResources.properties</samp> file to look like <A href="rseSamplesResources2.html">this</A>.
-</li>
-</ol>
-
-<p>Thats it! Now, you can try out your new property page. Use <b>Run-&gt;Run As-&gt;Run-time Workbench</b>. Drill
-down in the RSE to a folder in a local or remote connection and right-click to <a href="propertypage_see.gif">see</a> 
-and <a href="propertypage_run_during.gif">run</a> your new property page. This sample is a unique case, in that this operation could potentially run for a long time, as you are recursively walking all
-the sub-folders and files to accumulate the size and count information. Because of this, we put this work
-in a background thread, and update the GUI as each sub-folder is processed. We also supply a stop button
-to the user and watch for them pressing Cancel or closing the dialog. When the thread ends, the
-result looks like <a href="propertypage_run_done.gif">this</a>.
-<p>Notice how this property page only appears for folders, due to the <b><samp>&lt;filter name="isDirectory&gt;</samp></b> markup
-in our extension point xml.
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_newClass.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_newClass.gif
deleted file mode 100755
index 32531d37c..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_newClass.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_run_done.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_run_done.gif
deleted file mode 100755
index 084a08ecf..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_run_done.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_run_during.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_run_during.gif
deleted file mode 100755
index b14fcf530..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_run_during.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_see.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_see.gif
deleted file mode 100755
index 9f5d4882d..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/propertypage_see.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/renameAction.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/renameAction.gif
deleted file mode 100755
index 481259872..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/renameAction.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/renameDialog.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/renameDialog.gif
deleted file mode 100755
index c04042cfe..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/renameDialog.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesMessages2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesMessages2.html
deleted file mode 100755
index ea240dd19..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesMessages2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>rseSamplesMessages Message File After Editing</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>rseSamplesMessages Message File After Editing</h1>
-<p>
-<pre><samp>
-&lt;?xml version=&quot;1.0&quot; encoding='UTF-8'?&gt;
-&lt;!DOCTYPE MessageFile SYSTEM &quot;../org.eclipse.rse.ui/messageFile.dtd&quot;&gt;
-&lt;!-- This is a message file used by SystemMessage and SystemMessageDialog --&gt;
-&lt;MessageFile Version=&quot;1.0&quot;&gt;
-     &lt;Component Name=&quot;RSE Samples&quot; Abbr=&quot;RSS&quot;&gt;
-          &lt;Subcomponent Name=&quot;General&quot; Abbr=&quot;G&quot;&gt;
-                &lt;MessageList&gt;
-                    &lt;Message ID=&quot;1001&quot; Indicator=&quot;E&quot;&gt;
-                          &lt;LevelOne&gt;Sample message&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;This is a sample with one substution variable: %1&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-                    <b>&lt;Message ID=&quot;1002&quot; Indicator=&quot;I&quot;&gt;</b>
-                          <b>&lt;LevelOne&gt;Processing...&lt;/LevelOne&gt;</b>
-                          <b>&lt;LevelTwo&gt;&lt;/LevelTwo&gt;</b>
-                    <b>&lt;/Message&gt;</b>
-                &lt;/MessageList&gt;
-          &lt;/Subcomponent&gt;
-     &lt;/Component&gt;
-&lt;/MessageFile&gt;
-</samp></pre>
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesResources2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesResources2.html
deleted file mode 100755
index dae089a03..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesResources2.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>rseSamplesResources Properties File After Editing</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>rseSamplesResources Properties File After Editing</h1>
-<p>
-<pre><samp>
-pp.size.label=Size
-pp.size.tooltip=Cumulative size, in bytes
-pp.files.label=Files
-pp.files.tooltip=Cumulative number of files
-pp.folders.label=Folders
-pp.folders.tooltip=Cumulative number of folders
-pp.stopButton.label=Stop
-pp.stopButton.tooltip=Cancel the thread
-</samp></pre>
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesResources3.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesResources3.html
deleted file mode 100755
index 93b3df7cb..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesResources3.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>rseSamplesResources Properties File After Editing</title>
-</head>
-
-<body>
-<h1>rseSamplesResources Properties File After Editing</h1>
-<pre><samp>
-pp.size.label=Size
-pp.size.tooltip=Cumulative size, in bytes
-pp.files.label=Files
-pp.files.tooltip=Cumulative number of files
-pp.folders.label=Folders
-pp.folders.tooltip=Cumulative number of folders
-pp.stopButton.label=Stop
-pp.stopButton.tooltip=Cancel the thread
-
-<b>property.type.teamfilter=Team filter</b>
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesResources4.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesResources4.html
deleted file mode 100755
index 6b91d8a1e..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/rseSamplesResources4.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>rseSamplesResources Properties File After Editing</title>
-</head>
-
-<body>
-<h1>rseSamplesResources Properties File After Editing</h1>
-<pre><samp>
-pp.size.label=Size
-pp.size.tooltip=Cumulative size, in bytes
-pp.files.label=Files
-pp.files.tooltip=Cumulative number of files
-pp.folders.label=Folders
-pp.folders.tooltip=Cumulative number of folders
-pp.stopButton.label=Stop
-pp.stopButton.tooltip=Cancel the thread
-
-property.type.teamfilter=Team filter
-<b>property.type.devrfilter=Developer filter
-
-filter.team.dlgtitle=Change Team Filter
-filter.team.pagetitle=Team Filter
-filter.team.pagetext=Create a new filter to list teams
-
-filter.devr.dlgtitle=Change Developer Filter
-filter.devr.pagetitle=Developer Filter
-filter.devr.pagetext=Create a new filter to list developers
-filter.devr.teamprompt.label=Parent team
-filter.devr.teamprompt.tooltip=Specify the team within which to list developers
-filter.devr.devrprompt.label=Developers
-filter.devr.devrprompt.tooltip=Specify a simple or generic developer name pattern
-</b>
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/runIt1.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/runIt1.gif
deleted file mode 100755
index 57af6bf40..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/runIt1.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/runIt2.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/runIt2.gif
deleted file mode 100755
index 41b63a448..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/runIt2.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/startup.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/startup.html
deleted file mode 100755
index 7e715b6bc..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/startup.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Startup Method in RSESamplesPlugin</title>
-</head>
-
-<body>
-<h1>Startup Method in RSESamplesPlugin</h1>
-<pre><samp>
-	public void startup() throws CoreException 
-	{
-		super.startup();
-		<b>IAdapterManager manager = Platform.getAdapterManager();
-		samples.model.DeveloperAdapterFactory factory = new samples.model.DeveloperAdapterFactory();
-		manager.registerAdapters(factory, samples.model.TeamResource.class);
-		manager.registerAdapters(factory, samples.model.DeveloperResource.class);</b>
-	}    
-</samp></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/subsystem.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/subsystem.html
deleted file mode 100755
index 6a3af939b..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/subsystem.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Creating a Subsystem Configuration</title>
-</head>
-
-<body>
-<h1>Creating a Subsystem Configuration</h1>
-<p>In this tutorial you will use the RSE <A href="../../reference/extension-points/org_eclipse_rse_core_subsystemConfigurations.html">subsystemConfigurations</A> extension point to show new subsystems within connections, which will then appear when those connections are expanded. Effectively, you will add a new <i>remote-accessing tool</i> to the Remote System Explorer.</p>
-<p>
-A full-blown tutorial to illustrate this extension point is a bit difficult without inventing
-server-side code and a communication layer for that server-side code to communication with the
-client-side subsystem. Rather than becoming bogged down in these details, this tutorial will not
-write server-side code or a communications-layer, but instead will hard-code the remote resources
-on the client-side so as to focus discussion on the client-side code. The extension point assumes
-you already have server-side code and a communication layer you now want to exploit within
-Eclipse.
-</p>
-		<p>When you are finished you should have a working subsystem similar to the one found in the org.eclipse.rse.examples.tutorial plugin.</p>
-		<h2>Scenario</h2>
-		<p>This tutorial pretends that you have server-side code which manages user profiles for developers and teams of developers. We assume there is a master list of developers identified for development access to this server, and there is a grouping mechanism that allows developers to be assigned to named teams. A developer may exist on multiple teams. Each developer can have one or more <i>roles</i> which may affect what they are allowed to access.</p>
-<p>In this tutorial you will define a subsystem for working with these resources in the remote system identified by the connection. This will first list teams and then developers within teams. Roles will be accessible via an action.</p>
-<p><i>Do not worry about how useful or realistic the example is. The point of the exercise is
-show the code necessary to fully enable new subsystems. It is up to the subsystem developer to
-decide what resources to expose and what actions on those resources.</i></p>
-
-<br>
-<hr>
-
-
-<h2>Step By Step: Creating a Subsystem Configuration</h2>
-		<p>If you have not already, first <a href="pdeProject.html">create or prepare a plugin project</a>
-We will follow the steps listed in the <A href="../plugin/subsystem.html#steps">Overview of Steps</A> section in the description of the plugin.</p>
-		<ol>
-<li>Create a package named <samp><b>samples.subsystems</b></samp>, by right-clicking on the <samp>src</samp> folder 
-and using the <b>New-&gt;Package</b> wizard. In the new package, create an empty interface named <A href="IDeveloperSubSystem.html"><samp>IDeveloperSubSystem</samp></A>, by right-clicking on the package and selecting <b>New-&gt;Interface</b>. 
-</li>
-<li>Also in package <samp>samples.subsystems</samp>, use <b>New-&gt;Class</b> to
-create a class named <samp><b>DeveloperConnectorService</b></samp> that extends <b>superclass</b> 
-<samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html">AbstractConnectorService</A></samp>,
-selecting the option to include <b>Constructors from superclass</b>. Edit the result to add
-a <samp>connected</samp> instance variable that is used in the methods, as shown in bold <a href="DeveloperConnectorService.html">here</a>.
-</li>
-<li>Again in package <samp>samples.subsystems</samp>, use <b>New-&gt;Class</b> to
-create a class named <samp><b>DeveloperConnectorServiceManager</b></samp> that extends <b>superclass</b> 
-<samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">AbstractConnectorServiceManager</A></samp>,
-selecting the option to include <b>Constructors from superclass</b>. Edit the result to add
-a factory method, and flesh out the methods, as highlighted <a href="DeveloperConnectorServiceManager.html">here</a>.
-</li>
-<li>Create a package named <samp><b>samples.model</b></samp>. Create two classes in it: 
-<b><samp>TeamResource</samp></b> and <b><samp>DeveloperResource</samp></b>, each of which extend
-<A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractResource.html"><samp>AbstractResource</samp></A>.
-  <ol>
-    <li type="i">Edit <samp>DeveloperResource</samp> to add <samp>name</samp>, <samp>id</samp>, and <samp>deptNbr</samp> properties, as shown in bold <a href="DeveloperResource.html">here</a>. You can use the refactoring support in eclipse to generate the getters and setters for these properties.<li type="i">Edit <samp>TeamResource</samp> to add <samp>name</samp> and <samp>developers</samp> (array) properties, 
-    as shown in bold <a href="TeamResource.html">here</a>.
-  </ol>
-<li>You need to think about  filter support. For now, you can keep it simple: users can only create filters that list teams,
-by specifying a single string that is either a scalar or a generic team name. If scalar, one team will be shown when the filter is expanded.
-If generic, all teams matching the generic pattern will be listed. Given the simplicity, you will not need to create a filter string class to perform 
-parsing. As a result, you have nothing to do for this step.</li>
-<li>Return to package <samp>samples.subsystems</samp>, and create class <b><samp>DeveloperSubSystem</samp></b>
-that extends <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html">SubSystem</A></samp>.
-Edit the generated class to add code highlighted <a href="DeveloperSubSystem.html">here</a>.</li>
-<li>Again in package <samp>samples.subsystems</samp>, create class <b><samp>DeveloperSubSystemConfiguration</samp></b>
-that extends <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystemConfiguration.html">SubSystemConfiguration</A></samp>.
-Edit the generated class to add code highlighted <a href="DeveloperSubSystemConfiguration.html">here</a>.
-</li>
-<li>In the project's root folder, find and edit file <samp>rseSamplesResources.properties</samp> and 
-add the line highlighted <a href="rseSamplesResources3.html">here</a>.
-</li>
-<li>Update your <samp>plugin.xml</samp> file to include the following lines:
-<pre><samp>
-   &lt;!-- ======================================= --&gt;
-   &lt;!-- SubSystem Configuration                 --&gt;
-   &lt;!-- ======================================= --&gt;
-   &lt;extension point=&quot;org.eclipse.rse.core.subsystemConfigurations&quot;&gt;
-        &lt;configuration
-             id=&quot;samples.subsystems.factory&quot;
-             systemTypeIds=&quot;org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.windows&quot;
-             name=&quot;Teams&quot;
-             class=&quot;samples.subsystems.DeveloperSubSystemConfiguration&quot;
-             category=&quot;users&quot;
-             vendor=&quot;ACME&quot;
-        &gt;
-        &lt;/configuration&gt;
-   &lt;/extension&gt;            
-</samp></pre>
-<b>Note:</b> You would normal use the <samp>icon</samp> and <samp>iconlive</samp> attributes to specify 
-a unique icon for your subsystem, but to keep it simple here, just use the default icon. Also, the
-<samp>priority</samp> attribute has been left out for simplicity.
-</li>
-</ol>
-		<p>Now you are far enough along that you can try our what you have, before proceeding. Select
-<b>Run-&gt;Run As-&gt;Run-time workbench</b>. Create a new Linux connection in the RSE, and 
-expand it. You'll now see your <A href="runIt1.gif">new subsystem</A>, which you can expand
-to see its default filter, which in turn you can expand to see your hardcoded list of teams:<br>
-<IMG border="0" src="runIt1.gif" width="800" height="514">
-<br>
-You will be prompted for a user ID and password, but since the system class does not really 
-connect, enter anything you like!
-<p>Eventually, you will be able to expand a team to see its developers.</p>
-<p>Now it is time to work on the appearance and functions of those remote resources. You will do this
-by creating adapters for the resources:</p>
-<ol start="10">
- <li>Select the <samp>samples.model</samp> package, and:
-   <ol>
-   <li type="i">Create a new class named <samp>TeamResourceAdapter</samp> that extends <a href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html"><samp>AbstractSystemViewAdapter</samp></A> and implements
-       <a href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html"><samp>ISystemRemoteElementAdapter</samp></A>. 
-       Edit the generated class and add the code highlighted <a href="TeamResourceAdapter.html"><b>here</b></a>.
-   </li>
-   <li type="i">Create a new class named <b><samp>DeveloperResourceAdapter</samp></b>
-       that extends <a href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html"><samp>AbstractSystemViewAdapter</samp></a> and implements
-       <a href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html"><samp>ISystemRemoteElementAdapter</samp></A>. 
-       Edit the generated class and add the code highlighted <a href="DeveloperResourceAdapter.html"><b>here</b></a>.
-   </li>
-   <li type="i">Next, you need the icons for your remote resources, which you referred to in your adapters. Edit the <samp>RSESamplesPlugin</samp> file and edit the <samp>initializeImageRegistry</samp>
-       to add the lines of code highlighted <a href="InitializeImageRegistry.html"><b>here</b></a>. Now, you need the icons. Select the <samp>RSESamplesPlugin</samp> project, right-click and select <b>New-&gt;Folder</b> and create a folder named <b>icons</b>. Select the new folder, and use <b>File-&gt;Import</b> to 
-       import the <samp>team.gif</samp> and <samp>developer.gif</samp> files from the <samp>org.eclipse.rse.examples.tutorial/icons</samp> folder.</li>
-   </ol>
- </li>
- <li>Creating the adapters does nothing until you register them with the platform. To do that, you need
- an adapter factory class and you need to register it with the platform:
-   <ol>
-     <li type="i">Select the <samp>samples.model</samp> package and in it create a class named
-     <b>DeveloperAdapterFactory</b> that extends <samp><a href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemRemoteAdapterFactory.html">AbstractSystemRemoteAdapterFactory</a></samp> 
-     and implements interface <samp><b>org.eclipse.core.runtime.IAdapterFactory</b></samp>.
-     Edit the generate class as per the highlighted code <a href="DeveloperAdapterFactory.html"><b>here</b></a>.
-     </li>
-     <li type="i">Back in the <samp>RSESamplesPlugin</samp> class, add the highlighted code 
-     <b><a href="startup.html">here</a></b> to your <samp>startup</samp> method.
-     </li>
-   </ol>
-</li>
-</ol>
-
-<p>Once again, run the workbench to see your new subsystem:<br>
-<IMG border="0" src="runIt2.gif" width="886" height="594"><br>
-It is looking better now! There are icons and labels, and the team resources are expandable. Try the following things with
-your new subsystem resources:</p>
-<ul>
-<li>Right-click on <samp>Team 1</samp> and select the <a href="renameAction.gif">rename action</A>. The rename action is enabled because you
-overwrote <a href="TeamResourceAdapter.html#canRename">canRename</a> in the team resource adapter class. Try renaming it to a name already in use.
-The <a href="renameDialog.gif">rename dialog</a> can catch this error because we returned the list of names in use in 
-the <a href="TeamResourceAdapter.html#getNames">getRemoteParentNamesInUse</a>
-method in our team resource adapter class. Rename to a new name. The rename in fact happens because we implemented
-the <a href="TeamResourceAdapter.html#doRename">doRename</a> method.
-<li>The default filter <samp>All teams</samp> exists because we wrote code to create it in our <a href="DeveloperSubSystemConfiguration.html#createDefaultFilterPool">createDefaultFilterPool</a> method of our subsystem configuration. Try creating a new filter: right-click on <samp>Teams</samp> subsystem and select 
-<a href="newFilterAction.gif">New-&gt;Filter</a> to get the
-<a href="NewFilterWizard.gif">New Filter wizard</a>. Enter <samp>*2</samp>, press <b>Next</b>, and 
-enter <samp>Test filter</samp> for the filter name. Press <b>Finish</b>
-to create the filter. Expand it, and you will see that only teams whose name ends with "2" are shown:<br>
-<IMG border="0" src="testFilter.gif">
-<br>
-Filter support is free in the RSE,
-but you do have to write our own code to apply that filter pattern as you see fit. In this case, we did this in our 
-<a href="DeveloperSubSystem.html#resolveFilterString">internalResolveFilterString</a> method of our subsystem.<li>Notice how a resource like team can display multiple times, by different filters that resolve to it.
-Rename <samp>Team 2</samp> shown under the new expanded <samp>Test filter</samp>, and notice how it is successfully
-renamed under both filters. This ability to refresh the name in all occurrences of the same resource is made
-possible by the adapter methods <a href="TeamResourceAdapter.html#getAbsoluteName">getAbsoluteName</a>, which helps
-RSE find redundant copies of the same object, and <a href="TeamResourceAdapter.html#refreshRemoteObject">refreshRemoteObject</a>,
-which the RSE calls, on each redundant copy, on a rename operation.
-<IMG border="0" src="testRename.gif"></ul>
-<p><em>Note:</em> For your reference here is some information on how to further 
-evolve the functions via your adapter, should you want to:</p>
-<ul>
-<li>To not show the rename and delete actions at all, or to enable them, 
-override appropriate methods in the adapter class. For details see the methods 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#showRename(java.lang.Object)">showRename</A>, 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#showDelete(java.lang.Object)">showDelete</A>, 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#doRename(org.eclipse.swt.widgets.Shell, java.lang.Object, java.lang.String)">doRename</A>
- and 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#doDelete(org.eclipse.swt.widgets.Shell, java.lang.Object)">doDelete</A> in the parent 
-<samp><A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html">AbstractSystemViewAdapter</A></samp> class.
-<li>To supply your own validator for syntax checking of new names on the rename dialogs,
-override <A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#getNameValidator(java.lang.Object)">getNameValidator</A>.
-<li>To add additional actions to the pop-up menus, implement the <A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#addActions(org.eclipse.rse.ui.SystemMenuManager, org.eclipse.jface.viewers.IStructuredSelection, org.eclipse.swt.widgets.Shell, java.lang.String)">addActions</a> 
-method in your adapter class.
-<li>To support dragging and dropping, override the 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#canDrag(java.lang.Object)">canDrag</a> and 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#canDrop(java.lang.Object)">canDrop</a> parent methods in your adapter class.
-<li>To add additional properties to the property sheet, implement the 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#internalGetPropertyDescriptors()">internalGetPropertyDescriptors</a> and
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#internalGetPropertyValue()">internalGetPropertyValue</a> methods
-in your adapter class.
-<li>To add property pages to your remote objects (the Properties popup menu item will then appear) use
-the RSE <A href="../plugin/propertypage.html">propertyPages</a> extension point. 
-</ul>
-<p>Now you will continue with the tutorial by enhancing the running example to supply its own actions for creating and changing
-filters. You will support two types of filters in our subsystems: team filters and developer filters. You have seen team filter already,
-but developer filters will be new. They will contain a team name and a developer name-pattern, and when expanded, they will list all the
-matching developers in the given team. The filter string syntax for developer filters will be "team-name/developer-generic-name". Because
-you have more than one type of filter, our filter wizards will set the type attribute for the filters, so the change action will know
-which dialog to present to the user. This will also allow you to have different icons for each filter. 
-<ol start="11"> 
-  <li>Follow these steps to enable support for our own filter-support:
-      <ol>
-         <li type="i">First,  create the new GUI pane for your developer filter prompts. Select the <samp>samples.subsystems</samp>
-         package and in it create a new class named <samp><b>DeveloperFilterStringEditPane</b></samp> that extends the
-         class <samp><b>SystemFilterStringEditPane</b></samp> in package <samp>org.eclipse.rse.ui.filters</samp>. 
-         Edit the new class, adding the code highlighted <a href="DeveloperFilterStringEditPane.html">here</a>.
-         </li>
-         
-         <li type="i">Edit the <samp>DeveloperSubSystemConfiguration</samp> class, and add the code highlighted 
-         <a href="DeveloperSubSystemConfiguration2.html">here</a>.
-         </li>
-         
-         <li type="i">Next, you need the unique icons for your own filters, which you referred to in your subsystem factory. Edit the <samp>RSESamplesPlugin</samp> file and edit the <samp>initializeImageRegistry</samp>
-         to add the lines of code highlighted <a href="InitializeImageRegistry2.html">here</a>. Now you need these icons. 
-         Select the folder named <b>icons</b> and use <b>File-&gt;Import</b> to 
-         import the <samp>teamFilter.gif</samp> and <samp>developerFilter.gif</samp> files from the 
-         <samp>org.eclipse.rse.examples.tutorial\icons</samp> folder.</li>
-         
-         <li type="i">Now you need to edit your subsystem so it will parse the two types of filters you now
-         have. Edit <samp>DeveloperSubSystem</samp> and edit it as highlighted <a href="DeveloperSubSystem2.html#resolve">here</a>.
-         </li>
-
-         <li type="i">In the project's root folder, find and edit file <samp>rseSamplesResources.properties</samp> and 
-         add the line highlighted <a href="rseSamplesResources4.html">here</a>.
-         </li>
-         
-         <li type="i">Now you can run again. Right click on the <samp>Teams</samp> subsystem, to see the new actions for 
-         creating filters:<br>
-         <IMG border="0" src="NewFilterActions.gif">
-         <IMG border="0" src="TeamFilterWizard.gif"><br><br>
-         <IMG border="0" src="DeveloperFilterWizard.gif"><br><br>
-         
-         Create a team filter and a developer filter, and notice the new icons:<br>
-         <IMG border="0" src="NewFilterIcons.gif"><br><br>
-         
-         Now right-click on a team filter and select Change, and then do the same for a developer filter:<br>
-         <IMG border="0" src="TeamFilterDialog.gif">
-         <IMG border="0" src="DeveloperFilterDialog.gif"><br>
-         </li>
-         
-      </ol>
-  </li>
-</ol>
-
-
-<br><br><br>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/testFilter.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/testFilter.gif
deleted file mode 100755
index 38008bb54..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/testFilter.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/testRename.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/testRename.gif
deleted file mode 100755
index 8c1f64b2c..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/testRename.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorials.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorials.html
deleted file mode 100755
index 7eb3d18c8..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorials.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<title>Tutorials</title>
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Tutorials</h1>
-<p>This section walks through the tutorials that demonstrate how to use the RSE <a href="Extensions.html">extension points</a> to
-extend the RSE:
-<ul>
-<li>Popup menu actions for remote resources should now be contributed via the standard Eclipse extension point, <tt>org.eclipse.ui.popupMenus</tt>.  An example of this usage is provided in the <tt>org.eclipse.rse.examples.tutorial</tt> plug-in.
-<li>Property pages should for remote resources now be contributed via the standard Eclipse extension point, <tt>org.eclipse.ui.propertyPages</tt>. An example of this usage is provided in the <tt>org.eclipse.rse.examples.tutorial</tt> plug-in.
-<li><a href="tutorial/subsystem.html">Creating a subsystem configuration</a> for working with remote resources, using the <a href="plugin/subsystem.html">org.eclipse.rse.core.subsystemConfigurations</a> extension point.
-</ul>
-<p>The source code for all tutorials is available in the RSE-examples package, which 
-can be obtained from the <a href="http://download.eclipse.org/tm/downloads/">
-Target Management download site</a> or directly from the RSE <b>Update Site</b>. In fact, 
-the simplest way to get the examples is to choose <I>Help &gt; Software Updates &gt;
-Find and Install</I> from the Workbench, get the Examples installed, and then choose
-<I>File &gt; Import... &gt; Plug-in development &gt; Plug-ins and Fragments</I>.
-Choose the <tt>org.eclipse.rse.examples.tutorial</tt> plug-in and import it with
-source folders.</p>
-<p>In addition to providing the ready-made code, the tutorial also shows you 
-how to actally create the Eclipse plug-in project (Please bear with us if the
-instructions do not 100% match the latest code due to recent refactorings).
-The tutorial starts out by showing
-you how to <A href="tutorial/pdeProject.html">create an Eclipse plug-in
-project</A>, using the Plug-in Development Environment. While any Eclipse plug-in
-project will do, there are benefits to using the RSE-supplied <A
-	href="api/plugin/uiPluginAPI.html">base class</A> for your project, and other RSE-supplied
-infrastructure such as<A href="api/messages/uiMessageAPI.html"> messages</A>, and the many other user interface base classes and re-usable <A
-	href="api/uiAPI.html">user interface classes</A> supplied by
-the RSE core plug-in project. The tutorial step for creating a plug-in project sets up your project for using these.
-</p>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/usingAPIs.html b/rse/doc/org.eclipse.rse.doc.isv/guide/usingAPIs.html
deleted file mode 100755
index 851083f9b..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/usingAPIs.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<title>Using the Remote System Explorer API</title>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Using the Remote System Explorer API</h1>
-<p>In addition to all the programming API provided by Eclipse, the Remote System Explorer itself
-comes with numerous classes and interfaces that may be of value to programmers extending the RSE.
-Typically, these are used in conjunction with the <a href="Extensions.html">extension points</a>
-defined by the RSE.
-<p>
-The API set supplied by the RSE can be roughly partitioned into three areas:
-<ol>
-<li><a href="api/uiAPI.html">User interface</a> support, to make it easier to author plug-ins that extend or use the RSE.
-<li><a href="api/resourceAPI.html">Remote resources</a> support, to enable access to remote resources via predefined subsystems.
-<li><a href="api/modelAPI.html">Model</a> support, to enable traversal of the RSE model, to access connections, subsystem factories, subsystems, filters, and so on.
-</ol>
-</p>
-<p>
-This guide will introduce the capabilities of the API, leaving the programming details to the 
-reference section.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/view_RS.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/view_RS.gif
deleted file mode 100755
index 8ee06ea76..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/view_RS.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/view_pulldown.gif b/rse/doc/org.eclipse.rse.doc.isv/guide/view_pulldown.gif
deleted file mode 100755
index 5b8aa81c0..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/view_pulldown.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/icons/developer.gif b/rse/doc/org.eclipse.rse.doc.isv/icons/developer.gif
deleted file mode 100755
index 9dae955d0..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/icons/developer.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/icons/developerFilter.gif b/rse/doc/org.eclipse.rse.doc.isv/icons/developerFilter.gif
deleted file mode 100755
index aaf308445..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/icons/developerFilter.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/icons/team.gif b/rse/doc/org.eclipse.rse.doc.isv/icons/team.gif
deleted file mode 100755
index 510a75377..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/icons/team.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/icons/teamFilter.gif b/rse/doc/org.eclipse.rse.doc.isv/icons/teamFilter.gif
deleted file mode 100755
index a8091af8f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/icons/teamFilter.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.isv/notices.html b/rse/doc/org.eclipse.rse.doc.isv/notices.html
deleted file mode 100755
index 1215ce37e..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/notices.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2010. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-   <title>Legal Notices</title>
-</head>
-<body>
-
-<h3>
-<a NAME="Notices"></a>Notices</h3>
-<p>
-The material in this guide is Copyright (c) IBM Corporation and others 2000, 2010.
-</p>
-<p>
-<a href="about.html">Terms and conditions regarding the use of this guide.</a>
-</p>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt
deleted file mode 100755
index 6b248354d..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/options.txt
+++ /dev/null
@@ -1,140 +0,0 @@
--quiet
--encoding "iso-8859-1"
--charset "iso-8859-1"
--source 1.4
--sourcepath "../org.eclipse.rse.connectorservice.dstore/src
-;../org.eclipse.rse.core/src
-;../org.eclipse.rse.files.ui/src
-;../org.eclipse.rse.processes.ui/src
-;../org.eclipse.rse.services/src
-;../org.eclipse.rse.services/clientserver
-;../org.eclipse.rse.services.dstore/src
-;../org.eclipse.rse.services.dstore/miners
-;../org.eclipse.rse.shells.ui/src
-;../org.eclipse.rse.subsystems.files.core/src
-;../org.eclipse.rse.subsystems.files.dstore/src
-;../org.eclipse.rse.subsystems.files.ftp/src
-;../org.eclipse.rse.subsystems.files.local/src
-;../org.eclipse.rse.subsystems.files.ssh/src
-;../org.eclipse.rse.subsystems.processes.core/src
-;../org.eclipse.rse.subsystems.processes.dstore/src
-;../org.eclipse.rse.subsystems.processes.local/src
-;../org.eclipse.rse.subsystems.processes.shell.linux/src
-;../org.eclipse.rse.subsystems.shells.core/src
-;../org.eclipse.rse.subsystems.shells.dstore/src
-;../org.eclipse.rse.subsystems.shells.local/src
-;../org.eclipse.rse.subsystems.shells.ssh/src
-;../org.eclipse.rse.subsystems.shells.telnet/src
-;../org.eclipse.rse.subsystems.terminals.core/src
-;../org.eclipse.rse.subsystems.terminals.ssh/src
-;../org.eclipse.rse.ui/model
-;../org.eclipse.rse.ui/UI
-;../org.eclipse.rse.ui/subsystems"
--d reference/api
--bootclasspath @rt@
--classpath @cp@
-;../org.eclipse.dstore.core/@dot
-;../org.eclipse.dstore.core/bin
-;../org.eclipse.dstore.extra/@dot
-;../org.eclipse.dstore.extra/bin
--breakiterator
--tag generated:X
--tag lastgen:X
--tag model:X
--tag ordered:X
--use
--splitIndex
--windowtitle "RSE API Specification"
--doctitle "RSE API Specification"
--header "<b>RSE</b><br>Release 3.2"
--bottom "Copyright (c) IBM Corporation and others 2000, 2010. All Rights Reserved."
--group "RSE Services Plug-in Packages" "org.eclipse.rse.services;org.eclipse.rse.services.*;org.eclipse.rse.internal.services.*"
--group "RSE Core Plug-in Packages" "org.eclipse.rse.core;org.eclipse.rse.core.*"
--group "RSE UI Plug-in Packages" "org.eclipse.rse.ui;org.eclipse.rse.ui.*;org.eclipse.rse.files.ui.*;org.eclipse.rse.shells.ui.*;org.eclipse.rse.processes.ui.*"
--link http://java.sun.com/j2se/1.4.2/docs/api
--linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api @javadoc.link.location@/platform/reference/api/
--linkoffline ./../../../org.eclipse.dstore.doc.isv/reference/api ../org.eclipse.dstore.doc.isv/reference/api
--link http://bundles.osgi.org/javadoc/r4
-
-org.eclipse.rse.connectorservice.dstore
-org.eclipse.rse.connectorservice.dstore.util
-org.eclipse.rse.core
-org.eclipse.rse.core.comm
-org.eclipse.rse.core.events
-org.eclipse.rse.core.filters
-org.eclipse.rse.core.model
-org.eclipse.rse.core.references
-org.eclipse.rse.core.subsystems
-org.eclipse.rse.dstore.universal.miners
-org.eclipse.rse.files.ui
-org.eclipse.rse.files.ui.actions
-org.eclipse.rse.files.ui.compare
-org.eclipse.rse.files.ui.dialogs
-org.eclipse.rse.files.ui.resources
-org.eclipse.rse.files.ui.widgets
-org.eclipse.rse.filters
-org.eclipse.rse.logging
-org.eclipse.rse.model
-org.eclipse.rse.persistence
-org.eclipse.rse.persistence.dom
-org.eclipse.rse.processes.ui
-org.eclipse.rse.services
-org.eclipse.rse.services.clientserver
-org.eclipse.rse.services.clientserver.archiveutils
-org.eclipse.rse.services.clientserver.java
-org.eclipse.rse.services.clientserver.messages
-org.eclipse.rse.services.clientserver.processes
-org.eclipse.rse.services.clientserver.processes.handlers
-org.eclipse.rse.services.clientserver.search
-org.eclipse.rse.services.dstore
-org.eclipse.rse.services.dstore.util
-org.eclipse.rse.services.files
-org.eclipse.rse.services.processes
-org.eclipse.rse.services.search
-org.eclipse.rse.services.shells
-org.eclipse.rse.services.terminals
-org.eclipse.rse.shells.ui
-org.eclipse.rse.shells.ui.view
-org.eclipse.rse.subsystems.files.core
-org.eclipse.rse.subsystems.files.core.model
-org.eclipse.rse.subsystems.files.core.servicesubsystem
-org.eclipse.rse.subsystems.files.core.subsystems
-org.eclipse.rse.subsystems.files.core.util
-org.eclipse.rse.subsystems.files.dstore
-org.eclipse.rse.subsystems.files.ftp
-org.eclipse.rse.subsystems.files.local
-org.eclipse.rse.subsystems.files.ssh
-org.eclipse.rse.subsystems.processes.core
-org.eclipse.rse.subsystems.processes.core.subsystem
-org.eclipse.rse.subsystems.processes.core.subsystem.impl
-org.eclipse.rse.subsystems.processes.dstore
-org.eclipse.rse.subsystems.processes.servicesubsystem
-org.eclipse.rse.subsystems.processes.local
-org.eclipse.rse.subsystems.processes.shell.linux
-org.eclipse.rse.subsystems.shells.core.model
-org.eclipse.rse.subsystems.shells.core.subsystems
-org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem
-org.eclipse.rse.subsystems.shells.dstore
-org.eclipse.rse.subsystems.shells.local
-org.eclipse.rse.subsystems.shells.ssh
-org.eclipse.rse.subsystems.shells.telnet
-org.eclipse.rse.subsystems.terminals.core
-org.eclipse.rse.subsystems.terminals.core.elements
-org.eclipse.rse.subsystems.terminals.ssh
-org.eclipse.rse.ui
-org.eclipse.rse.ui.actions
-org.eclipse.rse.ui.dialogs
-org.eclipse.rse.ui.filters
-org.eclipse.rse.ui.filters.actions
-org.eclipse.rse.ui.filters.dialogs
-org.eclipse.rse.ui.messages
-org.eclipse.rse.ui.model
-org.eclipse.rse.ui.open
-org.eclipse.rse.ui.operations
-org.eclipse.rse.ui.propertypages
-org.eclipse.rse.ui.subsystems
-org.eclipse.rse.ui.validators
-org.eclipse.rse.ui.view
-org.eclipse.rse.ui.widgets
-org.eclipse.rse.ui.widgets.services
-org.eclipse.rse.ui.wizards
diff --git a/rse/doc/org.eclipse.rse.doc.isv/plugin.properties b/rse/doc/org.eclipse.rse.doc.isv/plugin.properties
deleted file mode 100755
index 5b2580689..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#    IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName=RSE Developer Guide
-providerName=Eclipse TM Project
diff --git a/rse/doc/org.eclipse.rse.doc.isv/plugin.xml b/rse/doc/org.eclipse.rse.doc.isv/plugin.xml
deleted file mode 100755
index 99d609fe7..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/plugin.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
-     Copyright (c) 2005, 2006 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- ===================================================== -->
-<!-- Declare the documentation for the RSE ISV Guide       -->
-<!-- We will declare only one infoset (book)               -->
-<!-- ===================================================== -->
-
-<plugin>
-
-
-<!-- ============================================================================= -->
-<!-- Define primary TOC                                                            -->
-<!-- ============================================================================= -->
-
-   <extension point="org.eclipse.help.toc"> 
-       <toc file="toc.xml" primary="true" category="DSDP.TM"/>
-       <index path="index/"/>
-   </extension>
-
-<!-- ============================================================================= -->
-<!-- Define TOCs                                                                   -->
-<!-- ============================================================================= -->
-
-   <extension point="org.eclipse.help.toc"> 
-       <toc file="topics_Guide.xml"/>   
-       <toc file="topics_Reference.xml"/>   
-       <toc file="topics_Questions.xml"/>   
-       <toc file="topics_Samples.xml"/>   
-   </extension>
-   
-<!-- ============================================================================= -->
-<!-- Define Javadoc locations                                                      -->
-<!-- ============================================================================= -->
-   <extension point="org.eclipse.pde.core.javadoc">
-       <javadoc path="reference/api">
-           <plugin id="org.eclipse.rse.core" />
-           <plugin id="org.eclipse.rse.services" />
-           <plugin id="org.eclipse.rse.ui" />
-       </javadoc>
-   </extension>
-   
-</plugin>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/questions/index.html b/rse/doc/org.eclipse.rse.doc.isv/questions/index.html
deleted file mode 100755
index 9596b5129..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/questions/index.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="Author" content="IBM">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Questions Index</title>
-</head>
-<body>
-<h1>RSE Questions Index</h1>
-<h2> RSE Services Layer</h2>
-<ul>
-  <li><a href="../guide/rse_int_services.html">What is available in the RSE Services Layer
-    API Packages?</a> </li>
-</ul>
-<h2> RSE Subsystems Layer</h2>
-<ul>
-  <li><a href="../guide/rse_int_subsystems.html">What is available in the RSE Subsystems Layer
-    API Packages?</a> </li>
-</ul>
-<h2> RSE Files</h2>
-<ul>
-  <li><a href="../guide/rse_int_files.html">What is available in the RSE Files packages?</a>
-  </li>
-</ul>
-<h2> RSE Shells</h2>
-<ul>
-  <li><a href="../guide/rse_int_shells.html">What is available in the RSE Shells packages?</a>
-  </li>
-</ul>
-<h2> RSE Processes</h2>
-<ul>
-  <li><a href="../guide/rse_int_processes.html">What is available in the RSE Processes packages?</a>
-  </li>
-</ul>
-
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/reference/.cvsignore b/rse/doc/org.eclipse.rse.doc.isv/reference/.cvsignore
deleted file mode 100644
index 9e5bfb42d..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-api
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/.cvsignore b/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/.cvsignore
deleted file mode 100644
index 9c59eabff..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-org_eclipse_*.html
diff --git a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html b/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html
deleted file mode 100755
index 0b5ea3c34..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>RSE Extension Points</title>
-<link rel="stylesheet" type="text/css" HREF="../../book.css">
-</head>
-<body>
-<h1>RSE Extension Points</h1>
-<p>The following extension points can be used to extend the capabilities of the
-  RSE infrastructure: </p>
-<ul>
-  <li><a href="org_eclipse_rse_core_keystoreProviders.html">org.eclipse.rse.core.keystoreProviders</a></li>
-  <li><a href="org_eclipse_rse_core_modelInitializers.html">org.eclipse.rse.core.modelInitializers</a></li>
-  <li><a href="org_eclipse_rse_core_persistenceProviders.html">org.eclipse.rse.core.persistenceProviders</a></li>
-  <li><a href="org_eclipse_rse_core_subsystemConfigurations.html">org.eclipse.rse.core.subsystemConfigurations</a></li>
-  <li><a href="org_eclipse_rse_core_systemTypes.html">org.eclipse.rse.core.systemTypes</a></li>
-  <li><a href="org_eclipse_rse_core_systemTypeProviders.html">org.eclipse.rse.core.systemTypeProviders</a></li>
-  <li><a href="org_eclipse_rse_services_archivehandlers.html">org.eclipse.rse.services.archivehandlers</a></li>
-  <li><a href="org_eclipse_rse_services_codePageConverters.html">org.eclipse.rse.services.codePageConverters</a></li>
-  <li><a href="org_eclipse_rse_subsystems_files_core_remoteFileTypes.html">org.eclipse.rse.subsystems.files.core.remoteFileTypes</a></li> 
-  <li><a href="org_eclipse_rse_subsystems_files_ftp_ftpListingParsers.html">org.eclipse.rse.subsystems.files.ftp.ftpListingParsers</a></li>
-  <!-- TODODeferred after RSE 1.0
-  <li><a href="org_eclipse_rse_ui_compile.html">org.eclipse.rse.ui.compile</a></li>
-  -->
-  <li><a href="org_eclipse_rse_ui_mountPathMappers.html">org.eclipse.rse.ui.mountPathMappers</a></li>
-  <li><a href="org_eclipse_rse_ui_newConnectionWizards.html">org.eclipse.rse.ui.newConnectionWizards</a></li>
-</ul>
-
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/reference/misc/index.html b/rse/doc/org.eclipse.rse.doc.isv/reference/misc/index.html
deleted file mode 100755
index 23f76241b..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/misc/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="Author" content="IBM">
-<link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css">
-<title>Other Reference Information</title>
-</head>
-<body>
-<h1>Other Reference Information</h1>
-<p>The following specifications, white papers, and design notes describe various
-  aspects of the remote development tooling. </p>
-<ul>
-  <li><a href="overview-rse.html">Map of Eclipse Remote System Explorer Plug-ins</a>
-  </li>
-</ul>
-
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/reference/misc/overview-rse.html b/rse/doc/org.eclipse.rse.doc.isv/reference/misc/overview-rse.html
deleted file mode 100755
index 1cfe3cf77..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/misc/overview-rse.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="Author" content="IBM">
-<title>RSE Overview - Map of RSE Plug-ins</title>
-<link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css">
-</head>
-<body>
-<h1>RSE Overview - Map of RSE Plug-ins</h1>
-<p>The Remote System Explorer provides a comprehensive environment for managing remote resources and processes </p>
-<p>The Remote System Explorer tooling itself is divided up into a number of separate
-  plug-ins. The following table shows which API packages are found in which plug-ins as of
-Eclipse 3.0. This table is useful
-  for determining which plug-ins a given plug-in should include as prerequisites.
-</p>
-<table border="1" width="80%" align="center">
-  <tbody>
-  <tr>
-    <td><b>API Package</b></td>
-    <td><b>Required plug-in id</b></td>
-  </tr>
-    <tr>
-    <td><tt>org.eclipse.rse.core[.*]</tt></td>
-    <td><tt>org.eclipse.rse.core</tt></td>
-  </tr>
-  <tr>
-    <td><tt>org.eclipse.rse.ui[.*]</tt></td>
-    <td><tt>org.eclipse.rse.ui</tt></td>
-  </tr>
-  <tr>
-    <td><tt>junit.*</tt></td>
-    <td><tt>org.junit</tt></td>
-  </tr>
-  </tbody>
-</table>
-
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/reference/misc/runtime-options.html b/rse/doc/org.eclipse.rse.doc.isv/reference/misc/runtime-options.html
deleted file mode 100644
index 94aef22fb..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/misc/runtime-options.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<!-- David Dykstal (IBM) - [208953] document how to disable system types -->
-<meta name="Author" content="IBM">
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Remote System Explorer runtime options</title>
-</head>
-
-<body>
-<h1>Remote System Explorer runtime options</h1>
-<p>
-Some RSE runtime preferences are set using system properties.
-With RSE release 2.0, all new runtime preferences are set using the plugin_customization.ini method.
-</p>
-
-<h2>System properties</h2>
-<p>
-The following system properties are used by RSE.
-Properties are set using 
-<code>-DpropertyName=propertyValue</code>
-as a VM argument to the Java VM.
-</p>
-<dl>
-<dt><a name="showNewConnectionPrompt" id="showNewConnectionPrompt"></a>rse.showNewConnectionPrompt</dt>
-<dd>
-whether to show the New Connection prompt in RSE views by default.
-The value may be <code>true</code> or <code>false</code>.
-The default is <code>true</code>.
-</dd>
-<dt><a name="showLocalConnection" id="showLocalConnection"></a>rse.showLocalConnection</dt>
-<dd>
-whether to create and show a Local connection by default when RSE starts with a new workspace.
-The value may be <code>true</code> or <code>false</code>.
-The default is <code>true</code>.
-</dd>
-</dl>
-
-<h2>Plugin customizations</h2>
-<p>
-See <a href="../../../org.eclipse.platform.doc.isv/guide/product_configproduct.htm">Customizing a product</a>
-for a description of plugin preference customization.
-</p>
-
-<h3>Core Preferences</h3>
-<dl>
-<dt>org.eclipse.rse.core/DEFAULT_PERSISTENCE_PROVIDER</dt>
-<dd>
-The id of the default persistence provider.
-This provider is used when new profiles are created and an explicit persistence provider is not set for them.
-The default value is <code>org.eclipse.rse.persistence.MetadataPropertyFileProvider</code>
-</dd>
-<dl>
-<dt>org.eclipse.rse.core/{systemTypeID}.systemType.enabled</dt>
-<dd>
-<p>
-This preference allows you to disable installed system types on a product basis.
-Values may be true or false.
-</p>
-<dl>
-<dt>true</dt>
-<dd>The system type is enabled. Connections of this system type may be created.</dd>
-<dt>false</dt>
-<dd>The system type is disabled. Connections of this system type may not be created. The system type will be unavailable in the user interface.</dd>
-</dl>
-<p>The default value is true for each installed system type.</p>
-<p>The following example shows how to disable the "telnet" system type.</p>
-<xmp>
-org.eclipse.rse.core/org.eclipse.rse.systemtype.telnet.systemType.enabled = false
-</xmp>
-</dd>
-</dl>
-
-<h3>User Interface Preferences</h3>
-<dl>
-<dt>org.eclipse.rse.ui/MNEMONICS_POLICY</dt>
-<dd>
-<p>
-The value is a bit field composed of or'ing the following bit flag values together to achieve
-the desired setting.
-</p>
-<dl>
-<dt>bit mask - value 1</dt>
-<dd>
-If on, specifies whether or not to insert mnemonic indications into 
-the current text of a label.
-</dd>
-<dt>bit mask - value 2</dt>
-<dd>
-If on, specifies to generate mnemonics of the form (X) at the end of labels for
-those languages matching the locale pattern.
-If off, then only characters from the label will be used as mnemonics.
-</dd>
-</dl>
-<p>
-The default value is 3.
-</p>
-</dd>
-<dt>org.eclipse.rse.ui/APPEND_MNEMONICS_PATTERN</dt>
-<dd>
-The value is a regular expression that is matched against the current locale.
-Some products will desire to append mnemonics only for certain locales.
-The default pattern matches Chinese, Japanese, and Korean.
-</dd>
-<dt>org.eclipse.rse.ui/SHOW_EMPTY_LISTS</dt>
-<dd>
-Allows a product to customize whether or not to show empty list messages in the remote system view
-when expanding a filter that results in an empty list of resources.
-The default value is <code>true</code>.
-</dd>
-</dl>
-
-</body>
-
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/samples/samples.html b/rse/doc/org.eclipse.rse.doc.isv/samples/samples.html
deleted file mode 100644
index fd89fdd21..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/samples/samples.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-<title>Installing The Examples</title>
-</head>
-
-<body>
-<h1>Installing The Examples</h1>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/schema.css b/rse/doc/org.eclipse.rse.doc.isv/schema.css
deleted file mode 100755
index 4efbf2672..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/schema.css
+++ /dev/null
@@ -1,66 +0,0 @@
-H6.CaptionFigColumn#header {
-	font-size:16px; 
-	display:inline
-}
-
-P.Note#copyright {
-	font-size: smaller; 
-	font-style: normal;
-	color: #336699; 
-	display:inline;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#dtd {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-P.Code#dtdAttlist {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 20.000000pt;
-}
-
-P.Code#tag {
-	color: #000080; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#cstring {
-	color: #008000; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;	
-}
-
-.ConfigMarkup#elementDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-.ConfigMarkup#attlistDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 32.000000pt;
-}
-
diff --git a/rse/doc/org.eclipse.rse.doc.isv/toc.xml b/rse/doc/org.eclipse.rse.doc.isv/toc.xml
deleted file mode 100755
index 40e824218..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/toc.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!--
-     Copyright (c) 2005, 2006 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- ============================================================================= -->
-<!-- Define the top level topics                                                   -->
-<!-- ============================================================================= -->
-
-<toc label="RSE Developer Guide">
-	<topic label="Guide" href="guide/rse_int.html">
-		<link toc="topics_Guide.xml" />
-		<anchor id="guide_additions"/>
-	</topic>
-	<topic label="Reference">
-		<link toc="topics_Reference.xml" />
-		<anchor id="reference_additions"/>
-	</topic>
-	<topic label="Questions Index" href="questions/index.html">
-		<link toc="topics_Questions.xml" />
-		<anchor id="questions_additions"/>
-	</topic>
-	<topic label="Legal" href="notices.html"/>
-</toc>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Guide.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Guide.xml
deleted file mode 100755
index 579ca374a..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Guide.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!--
-     Copyright (c) 2005, 2007 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- ============================================================================= -->
-<!-- Define topics for the main guide                                              -->
-<!-- ============================================================================= -->
-<toc label="Guide">
-	<topic label="RSE Architecture" href="guide/rse_int_architecture.html">
-		<topic label="Overview" href="guide/rse_int_overview.html"/>
-		<topic label="Artifacts" href="guide/Artifacts.html"/>
-		<topic label="Model" href="guide/Model.html"/>
-		<topic label="Services" href="guide/rse_int_services.html"/>
-		<topic label="Subsystems" href="guide/rse_int_subsystems.html"/>
-		<topic label="Connector Services" href="guide/rse_int_connectorservices.html"/>
-		<topic label="Hosts" href="guide/rse_int_hosts.html"/>
-	</topic>
-	<topic label="Using the RSE API" href="guide/usingAPIs.html">
-		<topic label="RSE User Interface API" href="guide/api/uiAPI.html" />
-		<topic label="RSE Remote Resource API" href="guide/api/resourceAPI.html" />
-		<topic label="RSE Model API" href="guide/api/modelAPI.html" />
-	</topic>
-	<!-- topic label="Plugging into the RSE" href="guide/plugin.html" -->
-	<topic label="Plugging into the RSE">
-		<topic label="Extensions" href="guide/Extensions.html"/>
-		<topic label="Plugging in a Popup Menu" href="guide/plugin/popup.html" />
-		<topic label="Plugging in a Property Page" href="guide/plugin/propertypage.html" />
-		<topic label="Plugging in a System Type" href="guide/plugin/systemtype.html" />
-		<topic label="Plugging in a Subsystem" href="guide/plugin/subsystem.html" />
-		<topic label="Relevant Eclipse Extension Points" href="guide/plugin/other.html" />
-	</topic>
-	<topic label="Tutorials" href="guide/tutorials.html">
-		<topic label="Creating a Remote Resource Property Page" href="guide/tutorial/propertypage.html" />
-		<topic label="Creating a Subsystem Configuration" href="guide/tutorial/subsystem.html" />
-		<topic label="Creating a Remote Resource Popup Menu Action" href="guide/tutorial/popup.html" />
-	</topic>
-</toc>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Questions.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Questions.xml
deleted file mode 100755
index 8b1b0716f..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Questions.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!--
-     Copyright (c) 2005, 2006 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- ============================================================================= -->
-<!-- Define topics for the questions index                                         -->
-<!-- ============================================================================= -->
-<toc label="Questions">
-</toc>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
deleted file mode 100755
index 02058995e..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!--
-     Copyright (c) 2005, 2010 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- ============================================================================= -->
-<!-- Define topics for the references                                              -->
-<!-- ============================================================================= -->
-<toc label="Reference">
-
-	<topic label="Extension Points Reference" href="reference/extension-points/index.html">
-		<topic label="org.eclipse.rse.core.keystoreProviders" href="reference/extension-points/org_eclipse_rse_core_keystoreProviders.html" />
-		<topic label="org.eclipse.rse.core.modelInitializers" href="reference/extension-points/org_eclipse_rse_core_modelInitializers.html" />
-		<topic label="org.eclipse.rse.core.persistenceProviders" href="reference/extension-points/org_eclipse_rse_core_persistenceProviders.html" />
-		<topic label="org.eclipse.rse.core.subsystemConfigurations" href="reference/extension-points/org_eclipse_rse_core_subsystemConfigurations.html" />
-		<topic label="org.eclipse.rse.core.systemTypeProviders" href="reference/extension-points/org_eclipse_rse_core_systemTypeProviders.html" />
-		<topic label="org.eclipse.rse.core.systemTypes" href="reference/extension-points/org_eclipse_rse_core_systemTypes.html" />
-		<topic label="org.eclipse.rse.services.archivehandlers" href="reference/extension-points/org_eclipse_rse_services_archivehandlers.html" />
-		<topic label="org.eclipse.rse.services.codePageConverters" href="reference/extension-points/org_eclipse_rse_services_codePageConverters.html" />
-	    <topic label="org.eclipse.rse.subsystems.files.core.remoteFileTypes" href="reference/extension-points/org_eclipse_rse_subsystems_files_core_remoteFileTypes.html" />
-		<topic label="org.eclipse.rse.subsystems.files.ftp.ftpListingParsers" href="reference/extension-points/org_eclipse_rse_subsystems_files_ftp_ftpListingParsers.html" />
-		<!-- TODODeferred after RSE 1.0
-		<topic label="org.eclipse.rse.ui.compile" href="reference/extension-points/org_eclipse_rse_ui_compile.html" />
-		-->
-		<topic label="org.eclipse.rse.ui.mountPathMappers" href="reference/extension-points/org_eclipse_rse_ui_mountPathMappers.html" />
-		<topic label="org.eclipse.rse.ui.newConnectionWizards" href="reference/extension-points/org_eclipse_rse_ui_newConnectionWizards.html" />
-		<anchor id="rse-extension-points-ref" />
-	</topic>
-	
-	<topic label="Other reference information">
-		<topic label="Runtime options" href="reference/misc/runtime-options.html" />
-	</topic>
-	
-	<topic label="Remote Systems API Reference By Topic">
-		<topic label="Core">
-			<topic label="org.eclipse.rse.core" href="reference/api/org/eclipse/rse/core/package-summary.html" />
-			<topic label="org.eclipse.rse.core.comm" href="reference/api/org/eclipse/rse/core/comm/package-summary.html" />
-			<topic label="org.eclipse.rse.core.events" href="reference/api/org/eclipse/rse/core/events/package-summary.html" />
-			<topic label="org.eclipse.rse.core.subsystems" href="reference/api/org/eclipse/rse/core/subsystems/package-summary.html" />
-	    </topic>
-	    <topic label="Logging">
-	    	<topic label="org.eclipse.rse.logging" href="reference/api/org/eclipse/rse/logging/package-summary.html"/>
-	    </topic>
-		<topic label="Model and Persistence">
-			<topic label="org.eclipse.rse.core.model" href="reference/api/org/eclipse/rse/core/model/package-summary.html"/>
-			<topic label="org.eclipse.rse.core.filters" href="reference/api/org/eclipse/rse/core/filters/package-summary.html"/>
-			<topic label="org.eclipse.rse.core.references" href="reference/api/org/eclipse/rse/core/references/package-summary.html"/>
-			<topic label="org.eclipse.rse.persistence" href="reference/api/org/eclipse/rse/persistence/package-summary.html"/>
-			<topic label="org.eclipse.rse.persistence.dom" href="reference/api/org/eclipse/rse/persistence/dom/package-summary.html"/>
-		</topic>
-		<topic label="Common Client and Server Helpers">
-			<topic label="org.eclipse.rse.services.clientserver" href="reference/api/org/eclipse/rse/services/clientserver/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.clientserver.java" href="reference/api/org/eclipse/rse/services/clientserver/java/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.clientserver.messages" href="reference/api/org/eclipse/rse/services/clientserver/messages/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.clientserver.processes.handlers" href="reference/api/org/eclipse/rse/services/clientserver/processes/handlers/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.clientserver.processes" href="reference/api/org/eclipse/rse/services/clientserver/processes/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.clientserver.search" href="reference/api/org/eclipse/rse/services/clientserver/search/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.clientserver.archiveutils" href="reference/api/org/eclipse/rse/services/clientserver/archiveutils/package-summary.html"/>
-		</topic>
-		<topic label="Basic Services Layer">
-			<topic label="org.eclipse.rse.services" href="reference/api/org/eclipse/rse/services/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.files" href="reference/api/org/eclipse/rse/services/files/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.processes" href="reference/api/org/eclipse/rse/services/processes/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.search" href="reference/api/org/eclipse/rse/services/search/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.shells" href="reference/api/org/eclipse/rse/services/shells/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.terminals" href="reference/api/org/eclipse/rse/services/terminals/package-summary.html"/>
-		</topic>
-		<topic label="Services Implementations">
-			<topic label="org.eclipse.rse.services.dstore" href="reference/api/org/eclipse/rse/services/dstore/package-summary.html"/>
-			<topic label="org.eclipse.rse.services.dstore.util" href="reference/api/org/eclipse/rse/services/dstore/util/package-summary.html"/>
-		</topic>
-		<topic label="DStore Miners">
-			<topic label="org.eclipse.rse.dstore.universal.miners" href="reference/api/org/eclipse/rse/dstore/universal/miners/package-summary.html"/>
-		</topic>
-		<topic label="Connector Service Implementations">
-			<topic label="org.eclipse.rse.connectorservice.dstore" href="reference/api/org/eclipse/rse/connectorservice/dstore/package-summary.html"/>
-			<topic label="org.eclipse.rse.connectorservice.dstore.util" href="reference/api/org/eclipse/rse/connectorservice/dstore/util/package-summary.html"/>
-		</topic>
-		<topic label="File Subsystem">
-			<topic label="org.eclipse.rse.subsystems.files.core" href="reference/api/org/eclipse/rse/subsystems/files/core/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.files.core.model" href="reference/api/org/eclipse/rse/subsystems/files/core/model/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.files.core.servicesubsystem" href="reference/api/org/eclipse/rse/subsystems/files/core/servicesubsystem/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.files.core.subsystems" href="reference/api/org/eclipse/rse/subsystems/files/core/subsystems/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.files.core.util" href="reference/api/org/eclipse/rse/subsystems/files/core/util/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.files.dstore" href="reference/api/org/eclipse/rse/subsystems/files/dstore/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.files.ftp" href="reference/api/org/eclipse/rse/subsystems/files/ftp/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.files.local" href="reference/api/org/eclipse/rse/subsystems/files/local/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.files.ssh" href="reference/api/org/eclipse/rse/subsystems/files/ssh/package-summary.html"/>
-		</topic>
-		<topic label="Process Subsystem">
-			<topic label="org.eclipse.rse.subsystems.processes.core" href="reference/api/org/eclipse/rse/subsystems/processes/core/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.processes.core.subsystem.impl" href="reference/api/org/eclipse/rse/subsystems/processes/core/subsystem/impl/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.processes.core.subsystem" href="reference/api/org/eclipse/rse/subsystems/processes/core/subsystem/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.processes.dstore" href="reference/api/org/eclipse/rse/subsystems/processes/dstore/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.processes.local" href="reference/api/org/eclipse/rse/subsystems/processes/local/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.processes.servicesubsystem" href="reference/api/org/eclipse/rse/subsystems/processes/servicesubsystem/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.processes.shell.linux" href="reference/api/org/eclipse/rse/subsystems/processes/shell/linux/package-summary.html"/>
-		</topic>
-		<topic label="Shell Subsystem">
-			<topic label="org.eclipse.rse.subsystems.shells.core.model" href="reference/api/org/eclipse/rse/subsystems/shells/core/model/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.shells.core.subsystems" href="reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem" href="reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.shells.dstore" href="reference/api/org/eclipse/rse/subsystems/shells/dstore/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.shells.local" href="reference/api/org/eclipse/rse/subsystems/shells/local/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.shells.ssh" href="reference/api/org/eclipse/rse/subsystems/shells/ssh/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.shells.telnet" href="reference/api/org/eclipse/rse/subsystems/shells/telnet/package-summary.html"/>
-		</topic>
-		<topic label="Terminal Subsystem">
-			<topic label="org.eclipse.rse.subsystems.terminals.core" href="reference/api/org/eclipse/rse/subsystems/terminals/core/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.terminals.core.elements" href="reference/api/org/eclipse/rse/subsystems/terminals/core/elements/package-summary.html"/>
-			<topic label="org.eclipse.rse.subsystems.terminals.ssh" href="reference/api/org/eclipse/rse/subsystems/terminals/ssh/package-summary.html"/>
-		</topic>
-		<topic label="User Interface">
-			<topic label="org.eclipse.rse.ui" href="reference/api/org/eclipse/rse/ui/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.actions" href="reference/api/org/eclipse/rse/ui/actions/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.dialogs" href="reference/api/org/eclipse/rse/ui/dialogs/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.filters.actions" href="reference/api/org/eclipse/rse/ui/filters/actions/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.filters.dialogs" href="reference/api/org/eclipse/rse/ui/filters/dialogs/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.filters" href="reference/api/org/eclipse/rse/ui/filters/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.messages" href="reference/api/org/eclipse/rse/ui/messages/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.model" href="reference/api/org/eclipse/rse/ui/model/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.open" href="reference/api/org/eclipse/rse/ui/open/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.operations" href="reference/api/org/eclipse/rse/ui/operations/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.propertypages" href="reference/api/org/eclipse/rse/ui/propertypages/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.subsystems" href="reference/api/org/eclipse/rse/ui/subsystems/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.validators" href="reference/api/org/eclipse/rse/ui/validators/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.view" href="reference/api/org/eclipse/rse/ui/view/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.widgets" href="reference/api/org/eclipse/rse/ui/widgets/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.widgets.services" href="reference/api/org/eclipse/rse/ui/widgets/services/package-summary.html"/>
-			<topic label="org.eclipse.rse.ui.wizards" href="reference/api/org/eclipse/rse/ui/wizards/package-summary.html"/>
-		</topic>
-		<topic label="File UI">
-			<topic label="org.eclipse.rse.files.ui" href="reference/api/org/eclipse/rse/files/ui/package-summary.html"/>
-			<topic label="org.eclipse.rse.files.ui.actions" href="reference/api/org/eclipse/rse/files/ui/actions/package-summary.html"/>
-			<topic label="org.eclipse.rse.files.ui.compare" href="reference/api/org/eclipse/rse/files/ui/compare/package-summary.html"/>
-			<topic label="org.eclipse.rse.files.ui.dialogs" href="reference/api/org/eclipse/rse/files/ui/dialogs/package-summary.html"/>
-			<topic label="org.eclipse.rse.files.ui.resources" href="reference/api/org/eclipse/rse/files/ui/resources/package-summary.html"/>
-			<topic label="org.eclipse.rse.files.ui.widgets" href="reference/api/org/eclipse/rse/files/ui/widgets/package-summary.html"/>
-	    </topic>
-		<topic label="Process UI">
-			<topic label="org.eclipse.rse.processes.ui" href="reference/api/org/eclipse/rse/processes/ui/package-summary.html"/>
-	    </topic>
-		<topic label="Shell UI">
-			<topic label="org.eclipse.rse.shells.ui" href="reference/api/org/eclipse/rse/shells/ui/package-summary.html"/>
-			<topic label="org.eclipse.rse.shells.ui.view" href="reference/api/org/eclipse/rse/shells/ui/view/package-summary.html"/>
-	    </topic>
-	</topic>
-	<topic label="Remote Systems API Reference All Packages" href="reference/api/overview-summary.html">
-	</topic>
-</toc>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Samples.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Samples.xml
deleted file mode 100755
index 87ed6b6a1..000000000
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Samples.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!--
-     Copyright (c) 2005, 2006 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<!-- ============================================================================= -->
-<!-- Define topics for the samples                                                 -->
-<!-- ============================================================================= -->
-<toc label="Examples" >
-   <topic label="Installing the Examples" href="samples/samples.html" />
-   <anchor id="examples"/>
-</toc>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/.project b/rse/doc/org.eclipse.rse.doc.user/.project
deleted file mode 100755
index 21a245ce6..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF b/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF
deleted file mode 100755
index db6094c5c..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.doc.user; singleton:=true
-Bundle-Version: 3.2.2.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
diff --git a/rse/doc/org.eclipse.rse.doc.user/about.html b/rse/doc/org.eclipse.rse.doc.user/about.html
deleted file mode 100755
index d4cc693f9..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/book.css b/rse/doc/org.eclipse.rse.doc.user/book.css
deleted file mode 100755
index 157414c6c..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/book.css
+++ /dev/null
@@ -1 +0,0 @@
-@import "../PRODUCT_PLUGIN/book.css";
diff --git a/rse/doc/org.eclipse.rse.doc.user/build.properties b/rse/doc/org.eclipse.rse.doc.user/build.properties
deleted file mode 100755
index b770336d3..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Martin Oberhuber (Wind River) - Add Getting Started Guide
-###############################################################################
-bin.includes = META-INF/,\
-               plugin.xml,\
-               about.html,\
-               concepts/,\
-               images/,\
-               plugin.properties,\
-               ref/,\
-               tasks/,\
-               book.css,\
-               notices.html,\
-               toc.xml,\
-               gettingstarted/
-               
diff --git a/rse/doc/org.eclipse.rse.doc.user/concepts/cbegin.html b/rse/doc/org.eclipse.rse.doc.user/concepts/cbegin.html
deleted file mode 100755
index a252a9d67..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cbegin.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Remote System Explorer Connections</title>
-</head>
-
-<!--
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-David Dykstal (IBM) - [203337] RSE user guide - TOC differs from Chapter for setting up a dstore server
--->
-
-<body id="cbegin-body">
-<a name="cbegin"><!-- --></a>
-<h1 class="topictitle1">Remote System Explorer Connections</h1>
-<div>
-<p>When you first open the Remote System Explorer, you are not
-connected to
-any system except your local workstation. To connect to a remote
-server,
-you need to define a connection. A connection is a TCP/IP network
-connection
-to your server, that enables you to access, edit, run, compile, and
-debug items on the server. When you define a connection, you select the
-type of connection you want, specify the
-name or IP address of the remote system and you also give the
-connection itself
-a unique name that acts as a label in your workspace so that you can
-easily
-connect and disconnect. These actions are performed in the Remote
-System Explorer. </p>
-<p>When you open the workbench for the first time, you
-need to define a profile,
-define a connection, and then connect to a server. When you connect,
-the workbench prompts you for your user ID and password on that server
-so
-that you can access the folders and files on that server.</p>
-<p>Note: Make sure you have started the server programs on your
-remote system. These programs depend on the kind of system you
-are connecting to. See the appropriate tasks below for the recommended
-ways to configure and start your server.</p>
-<p>When you have a connection, you can organize your data using <a
- href="cfilters.html">filters,
-filter pools, and filter pool references</a>, which list a set of
-folders and files from your server in the Remote Systems view. </p>
-<p>You can use the Remote System Explorer to access files on many
-kinds
-of servers, such as Linux, UNIX, Windows, or your local workstation. See the
-links below for information on how to connect to these other kinds of
-servers.</p>
-</div>
-<div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="cfilters.html" title="">Remote System Explorer filters, filter
-pools, and filter pool references</a><br />
-<a href="cprofile.html" title="">Remote System Explorer Profiles</a><br />
-<a href="cuniversal.html">Universal Systems</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="../tasks/tbeginlinux.html" title="">Connecting to a remote Linux or UNIX server</a><br />
-<a href="../tasks/tbeginwindows.html" title="">Connecting to a remote Windows server</a><br />
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/concepts/cfilters.html b/rse/doc/org.eclipse.rse.doc.user/concepts/cfilters.html
deleted file mode 100755
index 7d7f01898..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cfilters.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<!-- David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools -->
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Filters, filter pools, and filter pool references</title>
-</head>
-
-<body id="cfilters-body">
-<a name="cfilters"></a>
-<h1 class="topictitle1">Filters, filter pools, and filter pool references</h1>
-<div>
-<h2>Filters and Filtering Resources</h2>
-<p>
-The Remote System Explorer is a set of local client tools you use to
-organize
-how you want to work with the resources such as folders and files on
-your
-remote server. The following graphic serves as an introduction to
-some of the main components of the Remote System Explorer:<br />
-<img src="../images/ModelRSE.png" alt="" /><br />
-</p>
-<p>
-In the Remote System Explorer perspective, you query
-your server
-to list and perform actions upon remote resources such as folders and
-files. You perform
-these tasks on these remote resources by using <i>filters</i> that
-show these resources at your workstation.<br />
-</p>
-<p>
-The Remote System Explorer perspective is designed to allow you to
-manipulate the resources directly on the remote system. The
-actions that are available depend on the type of system you are
-connecting to and the way the resource is recognized. For
-example, your selections can define
-a filter string to find all files that match *.c in a particular
-directory.
-</p>
-<p>
-Filters, then, reveal resources on the remote system. The types of resources
-they reveal depend on the subsystem you are viewing. A file subsystem, for example,
-reveals files and directories on the remote system. A process subsystem will reveal
-running processes.
-</p>
-<p>
-File subsystems are quite rich in their function. For example, you can copy files
-and folders between remote systems regardless of the type of connection you have
-to those remote systems. Just a quick note: if a directory is revealed by a filter, copying that 
-directory to a remote system will result in all the files in that folder being
-copied, not just those that are revealed by the filter. This is consistent with
-the way resources are managed elsewhere in Eclipse.
-</p>
-<h2>Filter Pools</h2>
-<p>
-<a name="cfilters__poolsdesc"></a>
-If you have been using the Remote System Explorer for some
-time, your workspace might contain too many filters to navigate easily.
-Or,
-you might just want to keep groups of filters separate if, for example,
-you
-need to represent two distinct environments in the Remote System
-Explorer,
-regardless of how many filters you have. In either case, you can group
-filters
-into <i>filter pools</i>.
-</p>
-<p>
-For example, one filter pool could contain filters for an accounts
-receivable
-program while another contains filters for a payroll program. Or, if
-you
-have two different environments on your server: a production
-environment and a test environment, you can define a distinct
-environment and set of filters for each.
-</p>
-<p><a name="cfilters__poolsdesc2"></a>Without
-filter pools, all of your filters appear together
-in all connections. When you create filter pools, however, any filter
-you
-create within that filter pool is distinct to that connection, and will
-not
-appear in any other connections. (See the related links for more
-information
-about filter pools.)
-</p>
-<p>
-Note: at time this filter pool names cannot contain three consecutive underscore characters.
-</p>
-<h2>Sharing Filters</h2>
-<p>You
-can share filter pools among many connections through
-the use of a <i>filter pool reference</i>. A filter pool reference is
-a mechanism
-that displays a filter pool from one connection in any other
-connection, so
-that when you make a change to the original filter pool, your change is
-reflected
-your filter pool reference.
-</p>
-<p>
-All connections, filters, filter pools, and so on, belong to a
-Remote System Explorer <i>profile</i>, that you define during your
-first connection
-to a server. You might wonder what happens to your filters or filter
-pools if you delete a connection, especially if you have filters shared
-among
-two or more connections. Rest assured that the filters are not deleted,
-since
-filters actually belong to profiles, and not connections.
-</p>
-<p>
-Keep in mind that if you need to have an entirely new configuration
-of filter pools, filters and connection in the Remote System Explorer,
-you can always create a new profile. See
-the related links for more information.
-</p>
-</div>
-<div>
-<!-- TODODeferred
-<p><b class="relconceptshd">Related concepts</b><br/>
-<a href="cuseractions.html" title="">User actions</a><br/>
-<a href="cremcompile.html" title="">Compiling</a><br/>
-</p>
--->
-<p><b>Related Tasks</b><br />
-<a href="../tasks/tmanagepools.html" title="">Configuring filter pools</a><br />
-<a href="../tasks/tmanageedit.html" title="">Changing filters</a><br />
-<a href="../tasks/tmanagedel.html" title="">Deleting filters</a><br />
-<a href="../tasks/tbeginsecprofile.html" title="">Creating a second profile</a><br />
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/concepts/cprofile.html b/rse/doc/org.eclipse.rse.doc.user/concepts/cprofile.html
deleted file mode 100755
index dc12ccd8f..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cprofile.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-	<!-- David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools -->
-	<link rel="stylesheet" type="text/css" href="../book.css" />
-	<title> Remote System Explorer Profiles </title> 
-</head>
-<body id="cprofile-body">
-<a name="cprofile"> 
-<!-- -->
-</a> <h1 class="topictitle1"> Remote System Explorer Profiles </h1> 
-<div>
-	<p>
-		All Remote System Explorer resources such as connections, filters, and filter pools are owned by a profile. Profiles help you manage these resources when you have a lot of connections. The Remote System Explorer creates two profiles when starting up for the first time: a <em>private profile</em>, usually named after the host name of the machine that creates the workspace, and a profile called <i> Team</i>. The intent is to be able to share the Team profile in the future with other members of your team. You can also create your own profiles.
-	</p>
-	<p>
-		Note: due to an internal restriction a profile name cannot contain three consecutive underscore characters at this time.
-	</p>
-	<div class="p">
-		Profiles contain: 
-		<ul>
-			<li>
-				Connections -- including subsystem properties. User IDs and passwords are not shared.
-			</li>
-			<li>
-				Filters, filter pools, and filters pool references 
-			</li>
-			<li>
-				Other artifacts associated with a profile
-			</li>
-		</ul>
-	</div>
-	<p>
-		Profiles can be active or inactive. The Remote System Explorer displays all connections from all active profiles and, within a connection, allows filter pools to be referenced from any active profile. Further, the user actions and compile commands shown in the right-click menu for a remote resource are from all active profiles.
-	</p>
-	<p>
-		Your private profile cannot be deleted or made inactive.
-	</p>
-	<div class="p">
-<!-- TODO rework 
-Placing all connection and filter data in a profile
-shared by the team
-assists in team support, since all connections, filter pools, and team
-profiles
-can be shared among team members.
--->
-		You can use the Team view to control which profiles display in your workspace by making the profiles active. 
-<!-- TODO rework
-<div class="note"><span class="notetitle">Note: </span>Making
-a profile active or inactive does not affect your teammates. For
-example,
-you can choose not to display one of your own profiles in your
-workspace,
-but a teammate can make that profile active in his or her workspace.
-You will
-see the profiles you or your teammates have made inactive in the Team
-view when you perform a synchronization with the repository in which
-the profiles are stored. See topics in the help contents and
-links
-below about team support for more information on profiles and shared
-data.</div>
--->
-	</div>
-<!-- TODO rework
-<p>To reduce collisions when you synchronize the user IDs and the
-ordering of
-resources in a profile are stored locally on your workstation. To
-participate
-in team support, you need to synchronize with, and upload your profiles
-to a central repository. Use the <a href="../tasks/tteamsup.html">Team
-view</a> to
-share source and profile information with other team members, and to
-synchronize
-that information with the repository. Everything except your user ID
-will
-then be stored on the server, and any developer can obtain profile
-resources
-from the central server. </p>
--->
-</div>
-<div>
-	<p>
-		<b class="relconceptshd"> Related concepts</b> 
-		<br />
-		<a href="cfilters.html" title=""> Remote System Explorer filters, filter pools, and filter pool references</a> 
-		<br />
-		<a href="cbegin.html" title=""> Remote System Explorer Connections</a> 
-		<br />
-<!-- TODO rework
-<a href="cteam.html" title="">Team support</a><br/>
--->
-	</p>
-	<p>
-		<b class="reltaskshd"> Related tasks</b> 
-		<br />
-<!-- TODO rework
-<a href="../tasks/tteamsup.html" title="">Using team support</a><br/>
-<a href="../tasks/tteamsup1.html" title="">Working with profiles and team support</a><br/>
--->
-		<a href="../tasks/tbeginsecprofile.html" title=""> Creating a second profile</a> 
-		<br />
-	</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/concepts/cremcompile.html b/rse/doc/org.eclipse.rse.doc.user/concepts/cremcompile.html
deleted file mode 100755
index 2a7b31c67..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cremcompile.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Compiling</title>
-</head>
-
-<body id="cremcompile-body">
-<a name="cremcompile"><!-- --></a>
-<h1 class="topictitle1">Compiling Programs</h1>
-<div>
-<p>You can run a compile command on a server from the Remote System
-Explorer perspective. When you compile, the workbench determines
-the source type of the file, and then runs
-the last used compile command for that type. However, you can always
-change
-this behavior through Remote Systems preferences (see the related
-links).</p>
-<p>You can also compile multiple resources listed in a filter by
-holding down the CTRL key and clicking on all the members
-you want to compile, right-click to access the compile menu, and then
-select the compile command you wish to run. The workbench determines
-what order to compile these resources according to the preferences you
-specify for that workspace.</p>
-<div class="p">Note that multiple file compilation is disabled if:
-<ul>
-  <li>One or more of the selected source types are not compatible.</li>
-  <li>The selected resources are not from the same connection.</li>
-</ul>
-</div>
-<p>A compile command is always associated with a particular source
-type. It consists of an identifier and a command string that will be
-run on the
-server. Each profile in the Remote System Explorer has a set of
-source member types,
-and each source type has a set of compile commands associated with
-them. You
-can add source types to a profile and add compile commands to a source
-type.</p>
-<p>IBM supplies a number
-of default compile commands for common file types and you can also add
-your own. Since compile commands are owned by a profile they can
-be shared using team support.</p>
-<p>See the related topics below for more information.</p>
-</div>
-<div>
-<p><b class="reltaskshd">Related concepts</b><br/>
-<a href="cprofile.html"><span style="text-decoration: underline;">Profiles</span></a><br/>
-<a href="crunremcmds.html">Commands and Shells</a><br/>
-</p>
-<p><b class="relrefhd">Related reference</b><br/>
-<a href="../ref/rrsepref.html" title="">Preferences</a><br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/concepts/crunremcmds.html b/rse/doc/org.eclipse.rse.doc.user/concepts/crunremcmds.html
deleted file mode 100755
index 33848229d..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/crunremcmds.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Shells and commands in the Remote Systems view</title>
-</head>
-
-<body id="crunremcmds-body">
-<a name="crunremcmds"><!-- --></a>
-<h1 class="topictitle1">Shells and commands in the Remote Systems view</h1>
-<div>
-<p>You can use the Remote Shell view to run and interact with commands
-and command shells on universal systems. A universal system includes Windows,
-Linux, and UNIX system types.<br/>
-</p>
-<p>Specifically, use the view to: </p>
-<ul>
-  <li>Run commands in a command shell</li>
-  <li>Display and interpret the output of a program</li>
-  <li>Enter input to a program</li>
-  <li>Display and manage different commands and shells from the same
-view. Multiple commands can be run in a single shell (one command at a time per
-shell), multiple shells may be run on a single system, and multiple systems may be
-running shells.</li>
-</ul>
-<p>Whenever a command shell is launched or a command is run from within
-Remote System Explorer, the Remote Shell view is used to display the output
-and provide a way to work with that output. </p>
-</div>
-<div>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="../tasks/truncmdsview.html" title="">Running and viewing commands using the Remote Shell view</a><br/>
-<a href="../tasks/twrkcmdshl.html" title="In the Remote Systems view, you can launch a shell to perform commands in the iSeries Integrated File System (IFS).">Working
-with command shells</a><br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/concepts/cteam.html b/rse/doc/org.eclipse.rse.doc.user/concepts/cteam.html
deleted file mode 100755
index 017308bc8..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cteam.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Team support</title>
-</head>
-<body id="cteam-body">
-<a name="cteam"><!-- --></a>
-<h1 class="topictitle1">Team support</h1>
-<div>
-<p>The team support model works with shared repositories that store
-version-managed resources on servers that are accessible to the entire team. Usually
-you would share the folders and files of an Eclipse project. Each
-team member sends their changes to the repository, and receives changes
-that
-were made by a team member from the repository. While the Remote System
-Explorer
-is not project-based, (it is designed for direct access to remote
-resources),
-there is a single project created for all the non-remote resources that
-the
-Remote System Explorer manages. Profiles are stored in that project and
-so everything that belongs to a profile can be
-shared with your teammates.</p>
-<div class="p"><a name="cteam__profilelist"><!-- --></a>Profiles
-contain:
-<ul>
-  <li>Connections -- including various subsystem properties. User IDs
-and passwords are not shared.</li>
-  <li>Filters, filter pools, and filters pool references</li>
-  <li>User-defined actions</li>
-  <li>Compile commands</li>
-</ul>
-</div>
-<p> Use the Team view of the Remote System Explorer perspective to
-associate
-and synchronize the project named RemoteSystemsConnection that contains
-these profiles with a repository. After
-synchronizing with the repository, you will receive all the shared
-Remote System
-Explorer resources from your team, including their profiles. You then
-use the <b>Reload Remote System Explorer</b> action, located on the
-pop-up menu, to make the Remote System Explorer know about these
-changes. You can also, of course, quit and restart the
-workbench. See the related tasks for more information.</p>
-<p>Any resources received that are in a profile that you have already
-active, such
-as Team, will immediately be available and accessible to you. However,
-resources
-in other profiles will not be available unless you choose to make those
-profiles
-active. If you use multiple workstations, team support can also be used
-to
-make your own private configurations of filters, filter pools, and
-connections available on all the workstations by making
-your profile active on each workstation.</p>
-</div>
-<div>
-<p><b class="relconceptshd">Related concepts</b><br/>
-<a href="cprofile.html" title="">Remote System Explorer Profiles</a><br/>
-</p>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="../tasks/tteamsup.html" title="">Using team support</a><br/>
-<a href="../tasks/tteamsup1.html" title="">Working with profiles and team support</a><br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/concepts/cuniversal.html b/rse/doc/org.eclipse.rse.doc.user/concepts/cuniversal.html
deleted file mode 100755
index 7c69c9de8..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cuniversal.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2003, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Linux, UNIX, and Windows host access</title>
-</head>
-
-<!--
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-David Dykstal (IBM) - [203337] RSE user guide - TOC differs from Chapter for setting up a dstore server
--->
-
-<body>
-<a name="cuniversal"><!-- --></a>
-<h1 class="topictitle1">Universal Systems</h1>
-<div>
-<p>At a minimum the Remote System Explorer provides access to
-Linux,
-UNIX, and Windows systems. These are called "universal" systems
-since their file and command systems are quite similar. You can
-export,
-import, explore remote files, and run remote
-commands on all of these system types.
-You can also drag/drop and copy/paste between
-two systems of the same or different type.
-For example, you can drag and drop a file
-from your Windows host to your Linux host,
-from one Linux host to another, or from one
-file in your Linux host to another file in
-the same host.</p>
-<p>The Remote System Explorer can also provide access to other types of
-systems if the support is installed in the workbench. Examples of
-such systems might be IBM iSeries or zSeries server systems.<br />
-</p>
-<p>Expand the topics in the help contents or click the following links
-for
-information on Universal host access:<br />
-</p>
-</div>
-<div>
-<p><b>Related concepts</b><br clear="all" />
-<a href="crunremcmds.html">Shells and commands in the Remote Systems view</a><br clear="all" />
-</p>
-<p><b>Related tasks</b><br clear="all" />
-<a href="../tasks/tbeginlinux.html">Connecting to a remote Linux or UNIX server</a><br clear="all" />
-<a href="../tasks/tbeginwindows.html">Connecting to a remote Windows server</a><br clear="all" />
-<a href="../tasks/tbeginsecond.html">Creating a second connection to a remote host</a><br clear="all" />
-<a href="../tasks/tbegindelete.html">Deleting a connection</a><br clear="all" />
-<a href="../tasks/tbegindiscon.html">Disconnecting from a remote host</a><br clear="all" />
-<a href="../tasks/ttablecopy.html">Copying and pasting in the Remote System Explorer</a><br clear="all" />
-<a href="../tasks/ttabledrag.html">Dragging and dropping items in the Remote System Explorer</a><br clear="all" />
-<a href="../tasks/tbeginenv.html">Configuring environment variable support for connections</a>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/concepts/cuseractions.html b/rse/doc/org.eclipse.rse.doc.user/concepts/cuseractions.html
deleted file mode 100755
index 752abc751..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/concepts/cuseractions.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>User actions (user options)</title>
-</head>
-
-<body id="cuseractions-body">
-<a name="cuseractions"><!-- --></a>
-<h1 class="topictitle1">User actions (user options)</h1>
-<div>
-<p>User actions are server commands that you define on the <b>Work
-With
-User Actions</b> window, and will run against resources such as files
-and folders on your server.</p>
-<div class="p">Each user action has:
-<ul>
-  <li>A unique name. </li>
-  <li>A command (that might have substitution variables). The user
-action may also
-specify how the command is to be run on the server.</li>
-  <li>Substitution variables that are replaced with information from
-the resource (such as its name) when
-the command is run.</li>
-  <li>An optional comment used to describe the action in more detail.</li>
-  <li>Various options to affect what happens when the command is run;
-for example,
-whether to prompt first.</li>
-  <li>One or more file types that limit the action to specific types of
-remote resources. For example, a command to start a program that
-searches text files could be limited to just text files. The action is
-only shown
-for remote objects which is one of the specified types.</li>
-</ul>
-</div>
-</div>
-<div>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="../tasks/tworkuseract.html" title="">Managing user actions
-(user options)</a><br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g1installing.html b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g1installing.html
deleted file mode 100644
index 3938dca59..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g1installing.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) 2006, 2010 Wind River Systems, Inc. and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Installing the RSE</title>
-</head>
-
-<!--
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-David Dykstal (IBM) - [203337] RSE user guide - TOC differs from Chapter for setting up a dstore server
-Martin Oberhuber (Wind River) - [314217] "Installing RSE" is outdated in RSE user docs
--->
-
-<body id="g1installing-body">
-<a name="g1installing"><!-- --></a>
-<h1 class="topictitle1">Installing the Remote System Explorer</h1>
-<div>
-<p>
-The simplest way to get RSE is via Software Updates: From your running instance
-of Eclipse 3.4 or newer, choose <i>Help &gt; Install New Software...</i>.
-to open the software installation wizard.</p>
-
-<p>
-In case an update site is not pre-configured, consult the 
-<a href="http://www.eclipse.org/tm">Eclipse TM Homepage</a> for finding
-the latest update site to use, or enable an Eclipse Release Train Repository,
-like the <a href="http://download.eclipse.org/releases/helios">http://download.eclipse.org/releases/helios</a>
-repository for Eclipse 3.6 (June 2010).
-
-Type <i>"Remote"</i> in the filter box and press ENTER to find the RSE downloads;
-for the stand-alone Terminal view, find <i>"Terminal"</i>. Select what you want to install 
-and finish the wizard.</p>
-
-<p>If you prefer manual installation, you can download RSE SDK from the
-<a href="http://download.eclipse.org/tm/downloads/">Target
-Management Download Site</a> and extract it into the dropins folder of
-Eclipse 3.4 or later, or link it as product extension.</p>
-<p>Start Eclipse Workbench, and choose <i>Window &gt; Open Perspective &gt; 
-Other &gt; Remote System Explorer</i>.</p>
-</div>
-
-<div>
-<!--
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../concepts/cbegin.html" title="">Remote System Explorer Connections</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
--->
-<p><b class="reltaskshd">Follow-up tasks</b><br />
-<a href="g2firststeps.html" title="">First Steps with the Remote System Explorer</a><br />
-<a href="../tasks/tbeginlinux.html">Connecting to a remote Linux or UNIX server</a><br clear="all" />
-<a href="../tasks/tbeginwindows.html">Connecting to a remote Windows server</a><br clear="all" />
-<a href="gusing.html" title="">Using Remote System Explorer Connections</a><br />
-<a href="gxtending.html" title="">Extending Remote System Explorer</a><br />
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g2firststeps.html b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g2firststeps.html
deleted file mode 100644
index 731b67af2..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g2firststeps.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) 2006, 2008 Wind River Systems, Inc. and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>First Steps with RSE</title>
-</head>
-
-<!--
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-David Dykstal (IBM) - [203337] RSE user guide - TOC differs from Chapter for setting up a dstore server
--->
-
-<body id="g2firststeps-body">
-<a name="g2firststeps"><!-- --></a>
-<h1 class="topictitle1">First Steps with the Remote System Explorer</h1>
-<div>
-Even without an actual connection to a remote system, you can start experimenting 
-with the Remote System Explorer UI on the local host, which is shown by default
-under the <i>Local</i> node:
-<ul>
-  <li>Browse the Filesystem, choose <i>contextmenu &gt; show in Table</i>, and 
-     observe the Properties view.</li>
-  <li>Create a new <a href="../concepts/cfilters.html">Filter</a> to show 
-     specific resources in the file system only.</li>
-  <li>Launch an <a href="../concepts/crunremcmds.html">RSE Shell</a>
-     (Shells node &gt; Launch)
-      <ul><li>In the Shell, perform commands such as ls, dir, ps, gcc, make and see 
-         the output interpreted</li>
-          <li>Use Ctrl+Space Content Assist on the shell command entry field</li>
-      </ul></li>
-</ul>
-For operations on an actual remote system, you can either
-<ul>
-  <li>use the "<b>SSH Only</b>" system type (<i>New > Other > Remote System Explorer > Connection</i>), or</li>
-  <li>start a <a href="../tasks/tbeginlinux.html">dstore server daemon</a>
-      on the remote system and use any of the other connection types.</li>
-</ul>
-<p>RSE is a framework that supports plugging in many different communication protocols.
-By default, the dstore, FTP and ssh protocol plug-ins are provided, with dstore being 
-the richest in features.<br />
-DStore requires a server to run on the remote system. There are several methods to 
-get a server launched for a particular user, the most easy one to set up is the 
-daemon method.</p>
-</div>
-
-<div>
-<p><b class="reltaskshd">Follow-up tasks</b><br />
-<a href="../tasks/tbeginlinux.html">Connecting to a remote Linux or UNIX server</a><br clear="all" />
-<a href="../tasks/tbeginwindows.html">Connecting to a remote Windows server</a><br clear="all" />
-<a href="gusing.html" title="">Using Remote System Explorer Connections</a><br />
-<a href="gxtending.html" title="">Extending Remote System Explorer</a><br />
-</p>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../concepts/cbegin.html" title="">Remote System Explorer Connections</a><br />
-<a href="../concepts/cfilters.html" title="">Remote System Explorer filters, filter pools, and filter pool references</a><br />
-<a href="../concepts/cuniversal.html">Universal Systems</a><br />
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g_start.html b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g_start.html
deleted file mode 100644
index 746318c7a..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g_start.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) 2006, 2008  Wind River Systems, Inc. and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Getting Started with RSE</title>
-</head>
-
-<!--
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-David Dykstal (IBM) - [203337] RSE user guide - TOC differs from Chapter for setting up a dstore server
--->
-
-<body id="gstart-body">
-<a name="gstart"><!-- --></a>
-<h1 class="topictitle1">Getting Started with the Remote System Explorer</h1>
-<div>
-<p>The Remote System Explorer (RSE) is a perspective and toolkit in Eclipse
-Workbench, that allows you to connect and work with a variety of remote 
-systems. With the predefined plug-ins, You can look at remote file systems, 
-transfer files between hosts, do remote search, execute commands and work
-with processes.</p>
-<p>Additional capabilities may be added by Software Vendors by providing new
-<i>System Types</i>, <i>Services</i> and <i>Subsystem implementations</i> 
-for specific remote access protocols or resource kinds respectively. The framework
-helps by providing lots of predefined re-usable components, like persistence 
-mechanisms, filtering and team sharing.</p>
-<a href="../images/RSESample.gif">
-<!-- <img src="../images/RSESample.gif" alt="A sample RSE session" width="917" height="659" /><br />
--->
-<img src="../images/RSESample_small.gif" alt="A sample RSE session" width="459" height="330" /><br />
-</a>
-<p>Here is a screenshot of a sample session with RSE (Click on the picture to
-enlarge it).
-This tutorial will guide you quickly through the most prominent features of 
-the Remote System Explorer:</p>
-<ul>
-  <li><a href="g1installing.html" title="">Installing the Remote System Explorer</a></li>
-  <li><a href="g2firststeps.html" title="">First Steps with the Remote System Explorer</a></li>
-  <li><a href="gusing.html" title="">Using Remote System Explorer Connections</a></li>
-  <li><a href="gxtending.html" title="">Extending Remote System Explorer</a></li>
-</ul>
-
-</div>
-
-<div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../concepts/cbegin.html" title="">Remote System Explorer Connections</a><br />
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/gusing.html b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/gusing.html
deleted file mode 100644
index d81d3eb89..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/gusing.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Using Remote Connections</title>
-</head>
-<body id="gusing-body">
-<a name="gusing"><!-- --></a>
-<h1 class="topictitle1">Using Remote Connections</h1>
-<div>
-<p>
-Here are a few tasks that help you get acquainted with RSE. All tasks assume that you have
-switched to the Remote System Explorer Perspective in your Workbench. Some of the tasks
-can not be performed on all system types, although RSE tries to provide a consistent UI
-across many different kinds of remote systems..
-</p>
-<ul>
-  <li>In the RSE Perspective, Remote Systems View, press the <b>New Connection</b> button.
-    <ul>
-      <li>Note: In the Preferences, you can enable displaying available new connection types in the RSE tree.</li>
-    </ul>
-  </li>
-  <li>Select the desired system type
-    <ul>
-      <li>Coose system type "SSH Only" for ssh servers, or any other for dstore.</li>
-    </ul>
-  </li>
-  <li>Enter an IP address for a remote system running an ssh server or dstore server.
-    A connection name will be suggested automatically, but can be changed.
-    <ul>
-      <li>You can also run a dstore server on the local machine for testing. In this case, type "localhost" as address.</li>
-      <li>You can press Finish right away, the wizard defaults are usually fine.</li>
-    </ul>
-  </li>
-  <li>Fill in the username / password dialog.
-    <ul>
-      <li>Note: For ssh, if you have private keys, the password here is just a dummy. 
-      Enter anything and save it. You can setup ssh private key authentication through
-      the <b>Team &gt; CVS &gt; SSH2 Connection Method</b> Preference page.</li>
-    </ul>
-  </li>
-  <li><b>Browse remote files</b>, or open remote shells.
-    <ul>
-      <li>You can <b>drag and drop</b> files between local and remote file systems, between editors and any view.
-        Files are transferred as needed.</li>
-      <li>On dstore, you can browse into remote archives (*.zip, *.tar) without having to transfer the entire contents. This works thanks
-        to "miners" on the remote side. Custom miners can be plugged into the dstore server.</li>
-      <li>On dstore, you can choose <b>Search &gt; Remote...</b>.
-        <ul>
-        <li>The dstore miners support searching a remote file system without having to transfer any data.</li>
-        </ul>
-      </li>  
-    </ul> 
-  </li>
-  <li>On dstore, when the remote system is Linux, AIX or Other Unix:
-    <ul>
-      <li>Browse remote <b>Processes</b>.</li>
-      <li>Select "My Processes" and choose context menu &gt; <b>Monitor</b>.</li>
-      <li>Enable polling, choose a short wait time. See processes appear and vanish as you perform commands in a remote shell.</li>
-    </ul>
-  </li> 
-</ul>
-</div>
-
-<div>
-<p><b class="reltaskshd">Follow-up tasks</b><br/>
-<a href="gxtending.html" title="">Extending Remote System Explorer</a><br/>
-</p>
-
-<p><b class="relconceptshd">Related concepts</b><br/>
-<a href="../concepts/cbegin.html" title="">Remote System Explorer Connections</a><br/>
-<a href="../concepts/cfilters.html" title="">Remote System Explorer filters, filter
-pools, and filter pool references</a><br/>
-<a href="../concepts/crunremcmds.html" title="">Shells and commands in the 
-Remote Systems view</a><br/>
-</p>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="../tasks/ttablecopy.html" title="">Copying and pasting in the Remote System Explorer</a><br/>
-<a href="../tasks/truncmdsview.html" title="">Running and viewing commands using the Remote Shell view</a><br/>
-<a href="../tasks/twrkcmdshl.html" title="">Working with command shells</a><br/>
-<a href="../tasks/tmanagesearch.html" title="">Search for text and files on remote servers</a><br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/gxtending.html b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/gxtending.html
deleted file mode 100644
index 8a879d625..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/gxtending.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) 2006, 2007 Wind River Systems, Inc. and others. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Extending Remote System Explorer</title>
-
-
-<script language="JavaScript" type="text/javascript">
-function handleLink(url){
-   if (isBadLink(url)){
-	   externalizeLink(url);
-   }
-   return true;
-}
-
-function externalizeLink(url){
-	var base = "http://help.eclipse.org/helios/index.jsp?topic=//org.eclipse.rse.doc.isv/guide/";
-	var oldsegs = url.href.split('/');
-	var name = oldsegs[oldsegs.length-1];
-
-	var newref = base + name;
-	url.href = newref;
-}
-
-function isBadLink(url){
-    var status = getStatus(url);
-	if (status =='404'){ // not found on internet?
-		return true;
-	}
-    else if (status == '-1'){ //not found locally
- 		return true;
-	}
-    else { // link is okay
-		return false;
-    }
-}
-
-function getStatus(url){
-	var request = null;
-	try { 
-		request = new XMLHttpRequest(); 
-	}
-	catch(e){
-	}
-
-	if(!request) 
-		return -1;
-	try { 
-		request.open("GET",url.href,false); 
-		request.send(null);
-	}
-	catch(e){ 
-		return -1; 
-	}
-	return request.status;
-}
-</script>
-
-
-</head>
-<body id="gxtending-body">
-<a name="gxtending"><!-- --></a>
-<h1 class="topictitle1">Extending Remote System Explorer</h1>
-<div>
-<p>There are numerous ways how developers and software vendors can extend the 
-capabilities of the Remote System Explorer. Please look at the
-
-<a href="../../org.eclipse.rse.doc.isv/guide/rse_int_architecture.html" onclick="return handleLink(this);">RSE Developer Guide</a> to learn about adding subsystems,
-
-
-
-remote property pages or additional popup actions. The developer guide
-holds extensive 
-<a href="../../org.eclipse.rse.doc.isv/guide/tutorials.html" onclick="return handleLink(this);">tutorials</a>, 
-<a href="../../org.eclipse.rse.doc.isv/guide/rse_int_architecture.html" onclick="return handleLink(this);">overview documentation and 
-reference</a>.</p>
-
-<p>Users can configure and customize the Remote System Explorer through
-<!-- TODODeferred
-User actions, Compile Commands and
--->
-<a href="../ref/rrsepref.html">Preferences</a> and connection setup
-<!-- TODO rework
-<a href="../concepts/cteam.html">shared in a team</a>.
--->
-</p>
-</div>
-
-<div>
-<p><b class="relconceptshd">Related concepts</b><br/>
-<a href="../concepts/cfilters.html" title="">Remote System Explorer filters, filter
-pools, and filter pool references</a><br/>
-<!-- TODO rework
-<a href="../concepts/cteam.html" title="">Team support</a><br/>
--->
-</p>
-<!--
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="../tasks/truncmdsview.html" title="">Running and viewing commands using the Remote Shell view</a><br/>
-</p>
--->
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/images/ModelRSE.png b/rse/doc/org.eclipse.rse.doc.user/images/ModelRSE.png
deleted file mode 100755
index d079e6e26..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/images/ModelRSE.png
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.user/images/RSESample.gif b/rse/doc/org.eclipse.rse.doc.user/images/RSESample.gif
deleted file mode 100644
index 4ddb991f3..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/images/RSESample.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.user/images/RSESample_small.gif b/rse/doc/org.eclipse.rse.doc.user/images/RSESample_small.gif
deleted file mode 100644
index 9f72e4cd2..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/images/RSESample_small.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.user/images/gsarrow.gif b/rse/doc/org.eclipse.rse.doc.user/images/gsarrow.gif
deleted file mode 100755
index c48660dbe..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/images/gsarrow.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.user/images/navigator.jpg b/rse/doc/org.eclipse.rse.doc.user/images/navigator.jpg
deleted file mode 100755
index 08ef7717e..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/images/navigator.jpg
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.user/images/newconnection_wiz.gif b/rse/doc/org.eclipse.rse.doc.user/images/newconnection_wiz.gif
deleted file mode 100755
index 63f3d1b37..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/images/newconnection_wiz.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.user/images/pw.jpg b/rse/doc/org.eclipse.rse.doc.user/images/pw.jpg
deleted file mode 100755
index 8c5a47757..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/images/pw.jpg
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.user/images/search.gif b/rse/doc/org.eclipse.rse.doc.user/images/search.gif
deleted file mode 100755
index f0461093c..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/images/search.gif
+++ /dev/null
diff --git a/rse/doc/org.eclipse.rse.doc.user/notices.html b/rse/doc/org.eclipse.rse.doc.user/notices.html
deleted file mode 100755
index e21409abe..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/notices.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-   <title>Legal Notices</title>
-</head>
-<body>
-
-<h3>
-<a NAME="Notices"></a>Notices</h3>
-<p>
-The material in this guide is Copyright (c) IBM Corporation and others 2000, 2011.
-</p>
-<p>
-<a href="about.html">Terms and conditions regarding the use of this guide.</a>
-</p>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/plugin.properties b/rse/doc/org.eclipse.rse.doc.user/plugin.properties
deleted file mode 100755
index 4b6b7920a..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/plugin.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Initial Contributors:
-# The following IBM employees contributed to the Remote System Explorer
-# component that contains this file: David McKnight, Kushal Munir, 
-# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-# 
-# Contributors:
-# {Name} (company) - description of contribution.
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE User Guide
-providerName = Eclipse TM Project
diff --git a/rse/doc/org.eclipse.rse.doc.user/plugin.xml b/rse/doc/org.eclipse.rse.doc.user/plugin.xml
deleted file mode 100755
index f79986589..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006 IBM Corporation and others. All rights reserved.
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Initial Contributors:
-The following IBM employees contributed to the Remote System Explorer
-component that contains this file: David McKnight, Kushal Munir, 
-Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-
-Contributors:
-{Name} (company) - description of contribution.
--->
-<plugin>
-	<extension point="org.eclipse.help.toc">
-		<toc file="toc.xml" primary="true" category="DSDP.TM"/>
-	</extension>
-</plugin>
-
diff --git a/rse/doc/org.eclipse.rse.doc.user/ref/rrsepref.html b/rse/doc/org.eclipse.rse.doc.user/ref/rrsepref.html
deleted file mode 100755
index d42da1ab7..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/ref/rrsepref.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Accessing Remote System Explorer preferences</title>
-</head>
-<body id="rrsepref-body">
-<a name="rrsepref"><!-- --></a>
-<h1 class="topictitle1">Accessing Remote System Explorer preferences</h1>
-<div>
-<div class="p">
-The Remote System Explorer has settings that
-you can customize in a preference page. The name of the category is
-Remote Systems and it appears
-in the tree view of the Preferences window. </div>
-<div class="p">
-<div class="skipspace">
-<table cellpadding="4" cellspacing="0" summary="" frame="border"
- border="1" rules="all">
-  <tbody>
-    <tr>
-      <td valign="top"><b>Option</b></td>
-      <td valign="top"><b>Description</b></td>
-      <td valign="top"><b>Default</b></td>
-    </tr>
-    <tr>
-      <td valign="top">Default user ID for each system type</td>
-      <td valign="top">Specifies a default user ID for a non-local system type.
-If you do not set the default user ID at the connection level, then the User
-ID that you specify here will be used. Note: Changing the user ID on the
-Preferences dialog affects all connections and subsystems that inherit it.</td>
-      <td valign="top">Your local user ID</td>
-    </tr>
-    <tr>
-      <td valign="top">Show connection names prefixed by profile name</td>
-      <td valign="top">Select this to display connection names in the
-Remote System Explorer tree view as profile.connection.</td>
-      <td valign="top">Off</td>
-    </tr>
-    <tr>
-      <td valign="top">Show filter pools in Remote Systems view</td>
-      <td valign="top">Select this to show filter pools when expanding a subsystem.
-When this is not selected, expanding a subsystem will display the filters.</td>
-      <td valign="top">Off</td>
-    </tr>
-    <tr>
-      <td valign="top">Show "New Connection" prompt in Remote Systems view</td>
-      <td valign="top">The <img src="../images/newconnection_wiz.gif" alt=""/> New
-Connection option is displayed in the Remote Systems view so that you can
-create a new connection.</td>
-      <td valign="top">Off</td>
-    </tr>
-    <tr>
-      <td valign="top">Re-open Remote Systems view to previous state</td>
-      <td valign="top">Select this to automatically open previously expanded
-connections on start-up.</td>
-      <td valign="top">On</td>
-    </tr>
-    <tr>
-      <td valign="top">Use cached information to restore the Remote Systems view</td>
-      <td valign="top">Select this option to use locally cached information instead 
-      of connecting immediately if you are automatically opening the 
-      previously expanded connections when starting RSE.</td>
-      <td valign="top">On</td>
-    </tr>
-<!-- TODO UDA
-    <tr>
-      <td valign="top">Cascade user actions by profile</td>
-      <td valign="top">The <span><b>Work With</b> &gt; <b>User Actions</b></span> menu will cascade according to active profile.</td>
-      <td valign="top">Off</td>
-    </tr>
--->
-  </tbody>
-</table>
-</div>
-</div>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/ref/rsearch.html b/rse/doc/org.eclipse.rse.doc.user/ref/rsearch.html
deleted file mode 100755
index b5f80b4a5..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/ref/rsearch.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Using search parameters with special characters</title>
-</head>
-
-<body id="rtablesub-body"><a name="rtablesub"><!-- --></a>
-<h1 class="topictitle1">Using search parameters with special characters</h1>
-<div>
-<div class="p">You can use special characters such as ?, *, and \, when searching
-for files and strings, based on the following rules.
-</div>
-<div class="p">
-<div class="skipspace">
-<table cellpadding="4" cellspacing="0" summary="" frame="border" border="1" rules="all">
-<tbody>
-<tr>
-<td valign="top"><b>Option</b></td>
-<td valign="top"><b>Description</b></td>
-</tr>
-<tr>
-<td valign="top">*</td>
-<td valign="top">Searches all items. </td>
-</tr>
-<tr>
-<td valign="top">abc*</td>
-<td valign="top">Searches for items that begin with the characters abc,
-for example, abcd or abctest.</td>
-</tr>
-<tr>
-<td valign="top">*abc</td>
-<td valign="top">Searches for items ending with the characters abc, for example, dabc or testabc.</td>
-</tr>
-<tr>
-<td valign="top">*b*</td>
-<td valign="top">Searches for items that have the character b anywhere in the name.</td>
-</tr>
-<tr>
-<td valign="top">a*c</td>
-<td valign="top">Searches for items that begin with the character a and end with the character c.</td>
-</tr>
-<tr>
-<td valign="top">"a*"</td>
-<td valign="top">Searches for items within quotation marks that start
-with the character a, for example, "a," "ab," or "ad." Note that when you
-use quotation marks, the specification becomes case sensitive.</td>
-</tr>
-<tr>
-<td valign="top">abc?</td>
-<td valign="top">Searches for four-character items that begin with the
-characters abc and have a single fourth character, for example, abcd.</td>
-</tr>
-<tr>
-<td valign="top">?abc</td><td valign="top">Searches for four-character items that begin with a
-single character and end in abc, for example, dabc.</td>
-</tr>
-<tr>
-<td valign="top">?b?</td>
-<td valign="top">Searches for three-character items that have a b in the middle, for example, abc.</td>
-</tr>
-<tr>
-<td valign="top">a?c</td>
-<td valign="top">Searches for three-character items that have the character a and c with a single character in between.</td>
-</tr>
-<tr>
-<td valign="top">ab?</td>
-<td valign="top">Searches for three-character items that start with ab and end in a third single character, for example, abc.</td>
-</tr>
-<tr>
-<td valign="top">a\* or a\?</td>
-<td valign="top">Searches for characters where the * and ? are interpreted
-literally, for example, a* or a?. The slash represents an escape character.
-To use a slash literally, enter \\.</td>
-</tr>
-</tbody>
-</table>
-</div>
-</div>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tarchive.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tarchive.html
deleted file mode 100755
index 6e6ad1425..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tarchive.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Managing archived files</title>
-</head>
-
-<body id="tarchive"><a name="tarchive"><!-- --></a>
-<h1 class="topictitle1">Managing archived files</h1>
-<div class="p">
-<p>You can work with archived files and folders in the Remote System Explorer.</p>
-<p>Use the Remote Systems view perform the following actions with archived files:</p>
-<ul>
-<li><a href="#tarchive__browse">Browse files in an archive</a></li>
-<li><a href="#tarchive__copy">Copy, paste, and move archives</a></li>
-<li><a href="#tarchive__drag">Drag and drop files between archives</a></li>
-<li><a href="#tarchive__create">Create files and folders within an archive</a></li>
-<li><a href="#tarchive__delete">Delete archives</a></li>
-<li><a href="#tarchive__search">Search for content within an archive</a></li>
-</ul>
-</div>
-<div class="p">
-<p>Pick from the following:</p>
-<table border="1" frame="hsides" rules="rows" cellpadding="4" cellspacing="0" summary="" class="skipspace">
-<tbody>
-<tr>
-<th align="left" valign="bottom" id="d0e45">Task</th>
-<th align="left" valign="bottom" id="d0e47">Description</th>
-</tr>
-<tr id="tarchive__browse">
-<td align="left" valign="top" id="d0e50" headers="d0e45"><b>Browsing:</b></td>
-<td align="left" valign="top" headers="d0e47 d0e50">To browse and open
-files in an archive, click the plus sign beside the archive to display the
-contents. Continue to expand folders within the archive or double-click any
-file to open it in the default editor. Save files as you normally would and
-they are saved in the archive. In the properties view, note the addition of
-"#archive#" to the path of the file, to indicate how the file exists inside
-the archive.</td>
-</tr>
-<tr id="tarchive__copy">
-<td align="left" valign="top" id="d0e55" headers="d0e45"><b>Copying and pasting:</b></td>
-<td align="left" valign="top" headers="d0e47 d0e55">To copy
-and paste files, or move them from one location to another, right-click a
-file or folder inside an archive and select <b>Copy</b> or <b>Move</b>. (When
-you select <b>Move</b> instead of <b>Copy</b>, you delete the file in the
-original location, to move it to a new one.) Using the window that opens,
-you can paste the item to any archived, or unarchived location by expanding
-the tree-view to any specific location, and clicking <b>OK</b>. Note that
-you can perform this action across different connections as well.</td>
-</tr>
-<tr id="tarchive__drag">
-<td align="left" valign="top" id="d0e75" headers="d0e45"><b>Dragging and dropping:</b></td>
-<td align="left" valign="top" headers="d0e47 d0e75">You can
-drag and drop files between archives, from an archive to an unarchived location,
-or from an unarchived location into an archive. Expand both the original and
-destination locations in the Remote Systems view, click the item you want
-to move, and drag it with your cursor to the new location. Note that you can
-perform this action across different connections as well.</td>
-</tr>
-<tr id="tarchive__create">
-<td align="left" valign="top" id="d0e80" headers="d0e45"><b>Creating:</b></td>
-<td align="left" valign="top" headers="d0e47 d0e80">To create files and
-folders inside an archive, or to create a new archive, right-click any folder
-in the archive, or the root level archive itself, and select:
-<ul>
-<li><b>New &gt; File</b> to create a normal file within the archive. You can
-also select the file type to be an archive, whereby you can create an archive
-inside of an archive.</li>
-<li><b>New &gt; Folder</b> to create a normal folder within the archive. Then
-right-click your virtual folder to create more folders or files.</li>
-</ul>
-</td>
-</tr>
-<tr id="tarchive__delete">
-<td align="left" valign="top" id="d0e94" headers="d0e45"><b>Deleting:</b></td>
-<td align="left" valign="top" headers="d0e47 d0e94">To delete a file
-or folder from inside an archive, simply right-click the item and select <b>Delete</b>,
-or hit the Delete key. </td>
-</tr>
-<tr id="tarchive__search">
-<td align="left" valign="top" id="d0e208" headers="d0e45">
-<b>Searching for content inside an archive:</b></td>
-<td align="left" valign="top" headers="d0e47 d0e208">
-To search for files within an archive, right-click the archive, select <b>Search</b>,
-and complete the dialog box to specify what kinds of files and folder you
-want to find. Note that if you begin your search on a normal, unarchived directory
-that contains an archive, the default behaviour is <i>not</i> to search the
-archive. You need to check the <b>Search archive files</b> checkbox to search for
-contents inside archives in that directory.</td>
-</tr>
-</tbody>
-</table>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindelete.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindelete.html
deleted file mode 100755
index 48201a630..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindelete.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Deleting a connection</title>
-</head>
-
-<body id="tbegindelete">
-<a name="tbegindelete"><!-- --></a>
-<h1 class="topictitle1">Deleting a connection</h1>
-<div>
-<div class="p">Deleting a connection to a remote server does not delete
-any elements
-on the server. The action deletes your specific configuration for that
-connection,
-including your filters, filter pools, user actions, compile actions,
-saved
-commands, and named types.
-<p>To delete a connection, in the Remote Systems
-view, right-click your connection and select <b>Delete</b>.</p>
-</div>
-</div>
-<div>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="tbegindiscon.html" title="">Disconnecting from a remote server</a><br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindeleteprofile.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindeleteprofile.html
deleted file mode 100755
index f4b8ee3c1..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindeleteprofile.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Deleting a profile</title>
-</head>
-
-<body id="tbegindelete">
-<a name="tbegindelete"></a>
-<h1 class="topictitle1">Deleting a profile</h1>
-<div>
-<div class="p">Deleting a profile does not delete any elements on the
-server. The
-action only deletes your specific configuration (connections and filters)
-for that profile. To delete a profile:
-</div>
-<ol>
-  <li>Make the Team view active by clicking on its tab.</li>
-  <li>Right-click on the profile you wish to delete to bring up its context menu.</li>
-  <li>Select the <b>Delete...</b> operation.</li>
-</ol>
-</div>
-<div>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="tbeginsecprofile.html" title="">Creating a second profile</a><br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindiscon.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindiscon.html
deleted file mode 100755
index 250a72a4b..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindiscon.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Disconnecting from a remote server</title>
-</head>
-
-<body id="tbegindiscon">
-<a name="tbegindiscon"></a>
-<h1 class="topictitle1">Disconnecting from a remote server</h1>
-<div>
-<div class="p">To disconnect from a remote server in the Remote Systems
-view, right-click one of the subsystems displayed under your connection
-name
-and select <b>Disconnect</b>, or close the workbench.
-</div>
-<div class="p">
-<p>If you choose to close the workbench in order to disconnect, it
-notifies you of any outstanding communications requests. However, any
-tools
-launched from the workbench that run externally from the Remote System
-Explorer
-communications server, such as an external remote editor, are not
-affected because they
-have their own communication connection.</p>
-<p>You can monitor and change
-the properties of your connection in the Properties view of the Remote
-System
-Explorer perspective. Some values are read-only, and you can change
-others,
-such as the description or the server name. Although each Remote System
-Explorer
-subsystem maintains its own list of properties, three properties
-(connected
-or disconnected, port, and user ID) are shared among all subsystems. If
-you
-change any of these properties in one subsystem, the other subsystems
-reflect
-the change.</p>
-<p>Select a subsystem and check the Properties view to see
-the shared properties for all of your subsystems. For example, the
-Connected
-value is Yes or No for all of your subsystems under one connection. If
-you
-have difficulties connecting and disconnecting from the server, see the
-related link for troubleshooting information.</p>
-</div>
-</div>
-<div>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="tbegindelete.html" title="">Deleting a connection</a><br/>
-<br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindstore.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindstore.html
deleted file mode 100644
index 984dcefa1..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbegindstore.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Setting up a dstore server</title>
-</head>
-<!--
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-David Dykstal (IBM) - [203337] RSE user guide - TOC differs from Chapter for setting up a dstore server
--->
-	
-<body>
-<h1>Setting up a dstore server</h1>
-<p>
-There are two separate platform families on which you can run a dstore server: the Linux/UNIX family and the Windows family. Each is set up a bit differently. Follow the link to the platform of your choice.<br />
-</p>
-<p>
-<a href="tbeginlinux.html">Connecting to a remote Linux or UNIX server</a><br />
-<a href="tbeginwindows.html">Connecting to a remote Windows server</a>
-</p>
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginenv.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginenv.html
deleted file mode 100755
index 2a41baed2..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginenv.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Configuring environment variable support for connections</title>
-</head>
-
-<body id="tbeginenv">
-<a name="tbeginenv"></a>
-<h1 class="topictitle1">Configuring environment variable support for connections</h1>
-<div>
-<p>Environment variables are set for the remote job process
-when you first connect to a remote system. This means that the results
-of setting the variables are shown in the Remote Shell view.
-If the system type you are using is case sensitive (UNIX for example),
-then the environment variables will also be case sensitive. Spaces and
-equals signs (=) are only allowed in the value for the environment
-variable, not in
-its name.</p>
-<p>You can define environment variables for all Remote System Explorer
-connection types that support them (Windows, Linux, UNIX, and other
-system types that are installed).</p>
-<p>If you change an environment variable while the Remote System
-Explorer is connected to a
-remote server, the change does not take affect until you disconnect and
-reconnect.</p>
-<p>Although environment variables are set in subsystem properties
-pages, the Remote System Explorer stores
-them globally by connection.</p>
-<p>If you need to specify different environment variables or user IDs
-for a particular remote system, you can do so by defining multiple
-connections to that
-remote system and then defining the environment variables on the file
-subsystem for each
-connection.</p>
-<p>To configure environment variables:
-</p>
-<ol>
-  <li><span>Create a connection to a server if necessary.</span></li>
-  <li><span>Expand your connection name in the Remote Systems view.</span></li>
-  <li><span>Right-click on a file subsystem and select <b>Properties</b>.</span></li>
-  <li><span>Click <b>Environment Variables</b> and configure the variables as needed.</span>
-    <ul>
-      <li>To add an environment variable, click <b>Add</b>. Enter a
-name and value for this variable, and click<b>OK</b>.</li>
-      <li>To change an environment variable, select the variable in the
-table and modify the name or value directly. To use a dialog box,
-select the variable and click <b>Change</b>. The name and value of the
-current variable
-are pre-filled in the dialog box. Overwrite whichever field you want to
-change and click <b>OK</b>.</li>
-      <li>To remove a variable, click the variable to select it and
-click <b>Remove</b>.</li>
-      <li>To move a variable up in the list, click the variable to
-select it and click <b>Move up</b>.</li>
-      <li>To move a variable down in the list, click the variable to
-select it and click <b>Move down</b>.</li>
-    </ul>
-  </li>
-</ol>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html
deleted file mode 100755
index efcd6cc7a..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Connecting to a remote Linux or UNIX server</title>
-</head>
-
-<body id="tbeginlinux">
-<a name="tbeginlinux"><!-- --></a>
-<h1 class="topictitle1">Connecting to a remote Linux or UNIX server</h1>
-<p>The following documentation explains how to install the Linux or UNIX server
-code, start the server daemon, and make a connection to a remote Linux
-or UNIX server. Look <a href="tbeginwindows.html">here</a> for setting up
-a server on <a href="tbeginwindows.html">Windows</a>.</p>
-<div>
-<div class="p">
-<p><b>Prerequisites</b></p>
-<p>To use the Remote System Explorer communications server daemon you need
-to install Perl. Using the daemon helps eliminate some of the manual steps
-when you connect to the server.</p>
-<p><b>Installing the server code</b></p>
-<div class="p">
-<ol>
-<li>
-Find the package that contains the server.
-The server code is usually packaged with the containing product and you should refer to that 
-product's documentation for finding and installing the server package.
-The server is also available, however, on the Eclipse 
-<a href="http://download.eclipse.org/tm/downloads/">Target Management download site</a>
-as the package <b>rseserver-&lt;version&gt;-&lt;os&gt;.tar</b>. For example, rseserver-2.0-linux.tar contains the release 2.0 server
-for Linux. There are servers for Linux, AIX, a generic Unix version that can be tailored to your particular flavor
-of Unix, and an experimental Mac OS X version.</li> 
-<li>Ensure that Perl is installed.</li>
-<li>Ensure that a Java Runtime Environment (JRE) version 1.4 or higher is installed.
-An IBM, Sun or equivalent JRE is required; The gcj-based jvm shipped with most Linux
-distributions does not work. If in doubt, run the command <br/><tt>java -version</tt> (see 
-below) and check if there is a reference to gcj. You can download a Sun JRE from 
-<a href="http://java.sun.com">http://java.sun.com</a>.</li>
-<li>Create a directory where you want to install the server code. The remainder
-of these instructions will assume the directory /opt/rseserver (suitable for
-team sharing), but you are free to use any directory.</li>
-<li>Upload the server package to this directory. You can use FTP.</li>
-<li>Switch to the /opt/rseserver directory by typing:
-<pre>cd /opt/rseserver</pre>
-</li>
-<li>Run the following command in the /opt/rseserver directory to extract the
-server code from the package appropriate to your operating system. For linux this command is:
-<pre>tar -xf rseserver-2.0-linux.tar</pre>
-</li>
-</ol>
-</div>
-
-<p><b>Starting the server</b></p>
-<div class="p">You can start the RSE communications
-server with the server daemon, or manually. Before starting the server, make
-sure the Java command is in your path, you can do this by running the following
-command:<pre>java -version</pre>
-</div>
-<div class="p">You should see something
-similar to the following:<pre>java version "1.4.1"
-Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.1)
-Classic VM (build 1.4.1, J2RE 1.4.1 IBM build cxppc321411-20040301 (JIT enabled: jitc))</pre>
-</div>
-<div class="p">If
-you receive a "command not found" error, then try creating a symbolic link
-to the java command in /usr/bin by running the following command:<pre>ln -s  /opt/IBMJava2-141/jre/bin/java /usr/bin/java</pre>
-</div>
-<div class="p"><b>To start the server with the server daemon</b>
-<ol>
-<li>Ensure that you are running using the root user ID. (If the daemon is
-not run under root, it will be unable to authenticate connecting users.) Run
-the following commands:<pre>su -l root
-cd /opt/rseserver
-perl ./daemon.pl [daemonPort] [serverPortRange]</pre>
-</li>
-</ol>
-Note that the server daemon runs on port 4075 by default. You can pass the optional
-daemonPort argument to force a different port if you want.<br/>
-If your daemon runs behind a firewall, you may want to specify the optional
-<i>serverPortRange</i> argument to restrict selected server ports to the
-range given:<pre>
-perl ./daemon.pl 4075 10000-10010</pre>
-
-<p><b>To start the server manually</b></p>
-<div class="p">
-<div class="note">
-Note: In the following discussion we assume that the RSE server has been installed on Linux.
-If you are running on a UNIX system the script name is "server.sh" rather than "server.pl".
-</div>
-If you do not have root access on a remote machine, you can start the server manually for your particular user id only.
-Run the following commands:
-<pre>
-cd /opt/rseserver
-perl ./server.pl [port]
-</pre>
-These commands run the server.pl script located in the /opt/rseserver directory. The port parameter to the server.pl script is
-optional. If you do not specify a port, then the server will pick the first
-one available and print the port number to standard out. By default, it is
-usually 4033. If you would like to use a different port, you will then have
-to enter this port number in port property for the Files subsystem for your
-connection in the Remote System Explorer (see <span class="uicontrol">Connecting to the
-Remote Server</span>, below). Otherwise, you do not need to change this
-property.</div>
-<div class="p"><div class="note">
-Note: When you connect RSE to the server, the server will terminate as 
-soon as you disconnect the client. The daemon, however, will not terminate.
-</div></div>
-
-<p><b>Rexec Server Launcher</b></p>
-<div class="p">If you have Rexec access enabled to your remote system, you
-can also have the server started automatically by an Rexec command from the
-client, when you connect. To do so, use the Server Launcher Properties in 
-the New Connection Wizard.
-</div>
-<p><b>Running the daemon at startup</b></p>
-<div class="p">You might instead want
-to configure the daemon to run at start up for Linux. To do so, you need to
-append a call to the daemon to your startup script.  Add the following lines
-to the bottom of the /etc/rc.d/rc.local file:<pre>cd /opt/rseserver
-perl ./daemon.pl &amp;</pre>
-</div>
-<p><b>SSL Encryption and Firewalls</b></p>
-<div class="p">By default the RSE DStore connection is unencrypted. You
-can, however, configure it to use SSL encryption.
-<p>Because all dstore data transfer is done through a single TCP/IP 
-connection, the connection can also be tunneled through an ssh channel.
-In fact, the same ssh channel can also be used to start the server,
-like in the following example:</p>
-<pre>
-ssh -l moberhuber build.eclipse.org -L27127:build.eclipse.org:27127 \
-  "sh -c 'cd ~/rseserver/latest; perl ./server.pl 27127'"
-</pre>
-<p>
-Here, the RSE Server is started on port 27127 through an ssh connection,
-and at the same time port 27127 is forwarded through ssh to the local 
-host. You can now connect RSE to localhost:27127, and the connection
-will transparently be forwarded to the remote system.
-</p>
-</div>
-</div>
-</div><br></br>
-<p><b>Connecting to the Remote Server</b></p>
-<div class="p">To make a connection
-to your remote server:</div>
-<ol>
-  <li><span>Switch to the Remote System Explorer perspective. From the workbench
-menu, click <span class="menucascade"><span class="uicontrol">Window </span> &gt; <span class="uicontrol">Open Perspective </span> &gt; <span class="uicontrol">Remote System Explorer</span></span>.</span></li>
-  <li><span>In the Remote Systems view, <b>New Connection</b> is automatically
-expanded to show the various remote systems you can connect to through the
-Remote System Explorer. Expand <b>Linux</b> or <b>Unix</b> to
-invoke the new connection dialog box and configure a connection.</span></li>
-  <li><span>Enter a name for your first profile and click <b>Next</b>. (This
-step only occurs if you have never defined a connection before.)</span></li>
-  <li><span>Enter a connection name. This name displays in your tree view and
-must be unique to the profile.</span></li>
-  <li><span>Enter the name or TCP/IP address of your Linux server in the <b>Host
-name</b> field, for example, LINUX_A.</span></li>
-  <li><span>(Optional) Enter a <b>Description</b>. The description appears
-in the Properties view after the connection is created.</span></li>
-  <li><span>Click <b>Finish</b> to define your system. </span></li>
-</ol>
-<div class="skipspace">
-<div class="attention"><span class="attentiontitle">Attention: </span>To check your port number, right-click your
-connection or subsystem from the Remote Systems view and select <b>Properties</b>.
-Click <b>Subsystem</b> to view the relevant information. If your port is "0,"
-then your Remote System Explorer communications server will pick any free
-port on the server. If you specified a port number when starting the server,
-you need to enter it here, for example, to work with a firewall.</div>
-</div>
-<div class="p">
-<div class="note"></div>
-</div>
-</div>
-<div>
-<p><b class="reltaskshd">Related tasks</b>
-<a href="tbeginwindows.html" title="">Connecting to a remote Windows
-server</a>
-<!-- TODO SSL configuration -->
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginpass.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginpass.html
deleted file mode 100755
index 9098a0955..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginpass.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-	<link rel="stylesheet" type="text/css" href="../book.css" />
-	<title>Saving passwords for remote systems</title> 
-</head>
-<body>
-<h1>Saving passwords for remote systems</h1> 
-<p>
-	When you use the Remote System Explorer, you can save passwords for remote systems on your local PC. The stored passwords are then retrieved whenever a password is required to connect. When you save your password for a particular remote system, you will not be prompted to sign on when you try to connect to that system. 
-</p>
-<p>
-	When you first try to connect to a remote system, you will be prompted with the following dialog: 
-</p>
-<img src="../images/pw.jpg"></img> 
-<p>
-	To save this password on your local PC: 
-</p>
-<ol>
-	<li>
-		Enter your user ID 
-	</li>
-	<li>
-		Enter your password 
-	</li>
-	<li>
-		Select <b>Save user ID</b> 
-	</li>
-	<li>
-		Select <b>Save password</b> 
-	</li>
-</ol>
-<p>
-	The next time that you connect to the remote system, you will not be prompted to sign on again. 
-</p>
-<p>
-	<b>Note:</b> If you still want to be prompted for your user ID and password, right-click on the subsystem and select <b>Connect...</b>. 
-</p>
-<h2>Where passwords are stored</h2> 
-<p>
-	RSE uses the Eclipse-supplied keyring file to store passwords. This is the same keyring used by other eclipse services such as the Eclipse Team support. By default, this is stored in the configuration area under org.eclipse.core.runtime/.keyring in an encrypted format. The encryption does not require a password itself so anyone using Eclipse is capable of decrypting this file. 
-</p>
-<p>
-	Users can choose to store the keyring in a different file, or provide a password for doing real encryption by using runtime options when starting Eclipse as follows: <pre><code>
-eclipse -keyring C:/mykeyring.txt -password mypasswd
-	</code></pre> Even so, encryption is not particularly strong. So if your workstation is not protected you should remove your passwords and not store them in the future. 
-</p>
-<h2>Adding, changing, and removing stored passwords</h2> 
-<p>
-	You can use the password information page to add, change, and remove stored passwords for remote systems: 
-</p>
-<ol>
-	<li>
-		Select <b>Window</b> -&gt; <b>Preferences</b> 
-	</li>
-	<li>
-		Expand <b>Remote Systems</b> 
-	</li>
-	<li>
-		Select <b>Passwords</b> 
-	</li>
-</ol>
-<p>
-	Use the Add, Change, and Remove buttons to manage your password information for remote systems. 
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginsecond.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginsecond.html
deleted file mode 100755
index 07ddaf1db..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginsecond.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Creating a second connection to a remote server</title>
-</head>
-
-<!--
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-David Dykstal (IBM) - [203337] RSE user guide - TOC differs from Chapter for setting up a dstore server
--->
-
-<body><a name="tbeginsecond"></a>
-<h1 class="topictitle1">Creating a second connection to a remote server</h1>
-<div class="p">
-<p>In the Remote System Explorer, you can create a second connection
-to the same, or a different type of server, such as Linux, UNIX, or Windows.
-You can also create a second connection to the same server with a separate job
-environment, for example, to specify different environment variables or different user IDs.</p>
-To create a second connection:
-</div>
-<div>
-<ol>
-<li><span>In the Remote Systems view, expand <b>New Connection</b>.</span></li>
-<li><span>Click the plus sign beside the type of server you to which you want to make a second connection. For example, Linux, UNIX, or Windows.</span></li>
-<li><span>Complete the dialog as you normally would, making sure that you give your new connection a unique name.</span></li>
-</ol>
-</div>
-<div>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tbeginenv.html" title="">Configuring environment variable support for connections</a><br />
-<a href="tbeginlinux.html" title="">Connecting to a remote Linux or UNIX server</a><br />
-<a href="tbeginwindows.html" title="">Connecting to a remote Windows server</a><br />
-</p>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginsecprofile.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginsecprofile.html
deleted file mode 100755
index 8e8aafc0c..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginsecprofile.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<!-- David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools -->
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Creating a second profile</title>
-</head>
-
-<body id="tbeginsecprofile">
-<a name="tbeginsecprofile"></a>
-<h1 class="topictitle1">Creating a second profile</h1>
-<p>You might want to create a second profile for connections and data that belong to a particular version of a software release, and are
-shared by all team members.</p>
-<p>To create a second profile:</p>
-<ol>
-<li>Make the Team view active by clicking on its tab</li>
-<li>From the Team view's menu bar, click the "Create a new profile" button</li>
-<li>Complete the "New Profile" wizard.</li>
-</ol>
-<p>
-Note: due to an internal restriction a profile name cannot contain three consecutive underscore characters at this time.
-</p>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="tbegindeleteprofile.html" title="">Deleting a profile</a><br/>
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginwindows.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginwindows.html
deleted file mode 100755
index b2c6906bd..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginwindows.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Connecting to a remote Windows server</title>
-</head>
-
-<body>
-<a name="tbeginwindows"></a>
-<h1 class="topictitle1">Connecting to a remote Windows server</h1>
-<div>
-<p>The following documentation explains how to install the Windows server
-code, start the server daemon, and make a connection to a remote Windows
-server. Look <a href="tbeginlinux.html">here</a> for setting up
-a server on <a href="tbeginlinux.html">Linux, General UNIX or Mac</a>,
-and additional configuration options.</p>
-<div class="p">
-<p><b>Installing the server code</b></p>
-<div class="p">
-<ol>
-<li>
-Create a directory where you want to install the server code. The
-remainder of these instructions will assume the directory name and location is
-C:\rseserver, but you are free to use any directory you choose.</li>
-<li>Find the package that contains the server.
-The server code is usually packaged with a containing product and you should refer to that 
-product's documentation for finding and installing the server package.
-The server is also available, however, on the Eclipse 
-<a href="http://download.eclipse.org/tm/downloads/">Target Management download site</a>
-as the package <b>rseserver-&lt;version&gt;-&lt;os&gt;.zip</b>. For example, rseserver-2.0-windows.zip contains the release 2.0 server
-for Windows.</li>
-<li>Copy the rseserver.zip to the C:\rseserver directory (this could be on a different machine).</li>
-<li>Using an unzip utility to extract the server code to the C:\rseserver directory.</li>
-</ol>
-</div>
-<p><b>Starting the server</b></p>
-<p>You can start the RSE communications server with the server manually, or with a daemon.</p>
-
-<div class="p"><b>To start the server with a the server daemon:</b>
-<ol>
-<li>Simply double click the <code>daemon.bat</code> program to start a server daemon.</li>
-<li>You can edit the <code>daemon.bat</code> file to change properties for the daemon,
-like a specific daemon port to use or to force a port range for the server
-(in order to comply with firewalls).</li>
-</ol>
-<blockquote>
-<p>Note that the server daemon <b>does not</b> enforce any user
-authentication. If you run the server daemon, any user can connect to the machine, work
-with the file system and run commands.
-<span style="font-weight: bold;">Use of the server daemon on Windows systems is not recommended</span>.
-</p>
-The server daemon runs on port 4075 by default. You can pass the optional
-daemonPort argument to force a different port if you want.<br/>
-If your daemon runs behind a firewall, you may want to specify the optional
-<i>serverPortRange</i> argument to restrict selected server ports to the
-range given:<pre>
-daemon.bat 4075 10000-10010</pre>
-</blockquote>
-</div>
-
-<div class="p"><b>To start the server manually:</b>
-<ol>
-<li>Simply double click on the <code>server.bat</code> program to start a
-dstore server. The server will pick the first port available and print 
-the port number. By default, it is usually 4033. 
-You will then have to enter this port number in port property for the 
-Files subsystem for your connection in the Remote System Explorer.</li>
-<li>For security reasons, the server will only wait a limited time
-until a client connects (12000 seconds by default).</li>
-<li>In order to start the server with an exactly specified port or
-timeout, open a Windows command prompt and enter:
-<pre>
-c:<br/>
-cd \rseserver<br/>
-server.bat [port] [timeout]
-</pre>
-</li>
-<li>When you connect RSE to the server, the server will terminate as soon as you
-disconnect the client. The daemon, however, will not terminate.</li>
-</ol>
-</div>
-</div>
-
-<div class="p"><b>To connect to a remote Windows server:</b>
-<ol>
-<li><span>Switch to the Remote System Explorer perspective.</span></li>
-<li><span>In the Remote Systems view, <b>New Connection</b> is
-automatically be expanded to show the various remote systems you can connect to
-through the Remote System Explorer. Expand <b>Windows</b> to invoke a dialog
-and configure a connection.</span></li>
-<li><span>Enter a name for your first profile and click <b>Next</b>.
-(This step only occurs if you have never defined a connection before.)</span></li>
-<li><span>Enter a connection name. This name displays in your tree
-view and must be unique to the profile.</span></li>
-<li><span>Enter the name or TCP/IP address of your Windows server in
-the <b>Host Name</b> field, for example, jsandler.</span></li>
-<li><span>Enter a <b>Description</b>(optional); the description
-appears in the Properties view after the connection is created.</span></li>
-<li><span>Click <b>Finish</b> to define your system. </span></li>
-</ol>
-</div>
-
-<div class="p">
-<div class="note"><span class="notetitle">Note: </span>To check your
-port number, right-click your connection or subsystem
-from the Remote Systems view and select <b>Properties</b>. Click <b>Subsystem</b>
-to see the relevant information. If your port is "0," then your Remote
-System Explorer communications server will pick any free port on the Windows
-server.  If you specified a port number when starting the server, you need to
-enter it here, for example, to work with a firewall.</div>
-</div>
-</div>
-<div>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="tbeginlinux.html" title="">Connecting to a remote Linux or UNIX server</a><br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbuild.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbuild.html
deleted file mode 100755
index 6c9f135f8..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbuild.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Exporting resources to a remote file system</title>
-</head>
-
-<body id="tremoexp"><a name="tremoexp"><!-- --></a>
-<h1 class="topictitle1">Building programs on a remote system</h1>
-<div>
-<p>A configuration in the External Tools dialog lets you build programs on remote systems.</p>
-<div class="p">To build programs on a remote system:</div>
-<ol>
-<li><span>Select <span><b>Run</b> &gt; <b>External Tools</b> &gt; <b>External Tools</b></span> from the workbench menu bar. The External Tools dialog opens.</span></li>
-<li><span>Right click on <b>Remote Build</b> and select <b>New</b>. A remote build configuration is created.</span></li>
-<li><span>Choose the connection for the remote system or create a new one.</span></li>
-<li><span>Type the build command or browse the file system to find the build command</span></li>
-<li><span>Type or select the working directory. This is the directory where the command will be run.</span></li>
-<li><span>Enter the arguments to the build command.</span></li>
-<li><strong>Optional: </strong><span>Select the checkbox to specify that there is an associated project with this
-build command. If the command operates on a set of remote files (for example, a command such as 'make'), the Remote System
-Explorer will interpret any errors or other messages and allow you to double click on them to open the source.
-Specifying this option means the Remote System Explorer will open the source from a local project (that is, it will
-not open the remote source). This is useful if you are developing a program from a local project.</span></li>
-<li><strong>Optional: </strong><span>Select the checkbox to specify that local files should be exported before the
-build command is executed. This is useful if you are developing your remote application from a local project. In such
-cases, you would export the files from the workspace to the remote system using the <b>Remote file system</b> export wizard.
-That wizard lets you save the settings of the export to a file. The settings file contains information about which
-files were exported and various export options. You can specify this settings file here. This configuration will use
-the settings file to do the export and when the export is completed it will execute the build command. This ensures
-that the local source you are working on is always sent to the remote system before the build takes place.</span></li>
-<li><span>Click on <b>Apply</b> to save the configuration. Click on <b>Run</b> to execute it.</span></li>
-</ol>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tedittype.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tedittype.html
deleted file mode 100755
index d6cc57d04..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tedittype.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Editing an existing type</title>
-</head>
-
-<body id="tedittype"><a name="tedittype"><!-- --></a>
-<h1 class="topictitle1">Editing an existing type</h1>
-<div>
-<div class="p">To edit an existing type: </div>
-<ol>
-<li><span>In the Remote Systems view, right-click on a file subsystem, and select <span><b>Work With </b> &gt; <b>Named
-Types</b></span>.</span></li>
-<li><span>On the Work With Named Types window, expand <b>Object </b> or <b>Member</b>.</span></li>
-<li><span>Select your defined type from the list. You cannot edit any predefined types.</span></li>
-<li><span>Make the required changes.</span></li>
-<li><span>Click <b>Apply</b>.</span></li>
-</ol>
-</div>
-<div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../concepts/cuseractions.html" title="">User actions (user options)</a><br />
-</p>
-<p><b class="reltaskshd">Related tasks</b><br />
-<a href="tremtype.html" title="">Removing an existing type</a><br />
-</p>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagedel.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagedel.html
deleted file mode 100755
index f425ed5f0..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagedel.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2003, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Deleting filters in the Remote Systems view</title>
-</head>
-
-<body>
-<a name="tmanagedel"></a>
-<h1 class="topictitle1">Deleting filters</h1>
-<div>
-<div class="p">Deleting a filter does not delete any elements that you
-managed with
-that filter. The action only deletes your specific configuration for
-that
-filter. To delete a filter:</div>
-<ol>
-  <li><span>In the Remote Systems view, expand your connection, and
-then expand <b>Files</b>. </span></li>
-  <li><span>Right-click your filer and select <b>Delete</b>.</span>
-  </li>
-</ol>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanageedit.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tmanageedit.html
deleted file mode 100755
index bbb5adc10..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanageedit.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2003, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Changing filters</title>
-</head>
-
-<body>
-<a name="tmanageedit"></a>
-<h1 class="topictitle1">Changing filters</h1>
-<div>
-<div class="p">You can change a filter if you want to alter
-the host items that it displays in the Remote
-Systems view. When you change a filter, you
-can also add extra conditions to what is
-filtered. For example, if you have a filter
-that displays all files of type *.c, you
-may also want to add an additional filter string that
-will display files of type *.h also. To change
-a filter:</div>
-<ol>
-<li><span>In the Remote Systems view, expand your connection name,
-and then expand <b>Files</b> to see a list of filters.</span></li>
-<li><span>Right-click the filter and select <b>Properties</b>.</span></li>
-<li><span>In the properties window, select the <b>Filter Strings</b> category and edit the conditions that are filtered
-and click <b>Apply</b>.</span>
-<ul>
-<li>If you want to add extra conditions, as described in the
-introduction to this topic, click <b>New filter string</b> and complete the dialog.
-Click <b>Create</b>.</li>
-</ul>
-</li>
-<li><span>Click <b>OK</b>.</span></li>
-</ol>
-<div class="p"></div>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagemem.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagemem.html
deleted file mode 100755
index be1027551..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagemem.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2003, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Creating file filters</title>
-</head>
-
-<body>
-<h1>Creating file filters</h1>
-<p>File filters list a set of files and folders from your host in the Remote Systems view.</p>
-<ol>
-<li>In the Remote Systems view, expand your connection and then expand <b>Files</b>.</li>
-<li>Right-click <b>Files</b>, or your filter pool, and select <b>New</b> &gt; <b>Filter</b>.</li>
-<li>Browse, specify, or select from the <b>Fold</b> drop-down list the folder that contains the appropriate files and folders.</li>
-<li>Enter a generic or specific file name in the <b>File name filter</b> field. The default is * (asterisk). You can, for example, enter s* to list all files that start with s.</li>
-<li>(Optional) To select a specific file type, enter the type in the <b>File types</b> field, or click <b>Select</b> to select from all known file types.</li>
-<li>Use the <b>Show files only</b> check box to select whether you want to list only files.</li>
-<li>Click <b>Next</b>.</li>
-<li>Enter a name for your filter and select the profile that you want to use. Use an individually created profile to keep your work private, or select the Team profile to share with others.
-Note: Filters are named so that the Remote System Explorer can save them for future use.</li>
-<li>Click <b>Next </b>to see more text information about the filter or click <b>Finish</b>.</li>
-</ol>
-Your new file filter is displayed in the Remote Systems view under Files.
-<p><b>Related tasks</b><br/>
-<a href="tmanageedit.html">Changing filters</a><br/>
-<a href="tmanagepools.html">Configuring filter pools</a></p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagepools.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagepools.html
deleted file mode 100755
index 2954b62a2..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagepools.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<!-- David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools -->
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Configuring filter pools</title>
-</head>
-
-<body id="tmanagepools">
-<a name="tmanagepools"></a>
-<h1 class="topictitle1">Configuring filter pools</h1>
-<div>
-<p>
-If you have been using the Remote System Explorer for some
-time, your workspace might contain too many filters to navigate easily.
-Or,
-you might just want to keep groups of filters separate if, for example,
-you
-need to represent two distinct server environments in the Remote System
-Explorer,
-regardless of how many filters you have. In either case, you can group
-filters
-into <i>filter pools</i>.
-</p>
-<p>
-All filters live in filter pools, but these remain hidden unless you choose
-to manage them explicitly. If you do not manage them yourself the Remote
-System Explorer manages them for you and all of your filters appear together
-in all connections. When you create filter pools, however, any filter you
-create within that filter pool is only present in connections that reference
-that filter pool, and will not appear in any other connections. (See the
-related links for more information about filter pools.)
-</p>
-<p>To illustrate the use of filter pools,</p>
-<ol>
-<li><span>Click the menu button <img src="../images/gsarrow.gif" alt=""/> on
-the toolbar for the Remote Systems view, and select <b>Show Filter
-Pools</b>.</span></li>
-<li><span>Expand the <span style="font-weight: bold;">Local </span>system
-and the <span style="font-weight: bold;">Local Files</span> subsystem,
-and you can now see your filters
-listed under <b><i>Connection name</i> Filter Pool</b>.</span></li>
-<li><span>Right-click <b>Local Files</b> and select <b>New &gt;
-Filter Pool</b>.</span></li>
-<li><span>Enter a pool name and click <b>Finish</b>. (You do not
-need to
-change your profile selection.) Your new filter pool displays
-underneath your
-connection.</span></li>
-<li><span>Right-click your new filter pool and select <b>New &gt;
-Filter</b><b></b>.</span></li>
-<li><span>Complete the wizards as you normally would (see related
-tasks).
-When you are finished, you can see your new filters displayed in your
-new filter pool.</span></li>
-</ol>
-<p>
-If you decide not to see the filter pools anymore, click
-the menu
-button <img src="../images/gsarrow.gif" alt=""/> on the toolbar for the
-Remote
-Systems view, and select <b>Show Filter Pools</b> again to deselect
-the check
-mark.
-</p>
-<p>
-Note: at time this filter pool names cannot contain three consecutive underscore characters.
-</p>
-</div>
-<div>
-<p><b class="relconceptshd">Related concepts</b><br></br>
-<a href="../concepts/cfilters.html" title="">Remote System Explorer
-filters, filter pools, and filter pool references</a><br></br>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagepoolsref.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagepoolsref.html
deleted file mode 100755
index d734c3025..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagepoolsref.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Configuring filter pool references</title>
-</head>
-
-<body id="tmanagepools"><a name="tmanagepools"><!-- --></a>
-<h1 class="topictitle1">Configuring filter pool references</h1>
-<div>
-<div class="p">
-<p>You can share filter pools among many connections through
-the use of a <i>filter pool reference</i>. A filter pool reference is a mechanism
-that displays a filter pool from one connection in any other connection, so
-that when you make a change to the original filter pool, your change is reflected
-your filter pool reference.</p>
-<div class="p">Before
-you create a filter pool reference, ensure that you have already completed
-the following (see related tasks for more information):
-<ul>
-<li>You have defined more than one connection to the same server</li>
-<li>You have defined more than one filter pool</li>
-<li>You have enabled <b>Show Filter Pools</b> from the Remote Systems view toolbar</li>
-</ul>
-</div>
-<p>To use filter pools references:</p>
-<ol>
-<li><span>In the Remote Systems view, expand the connection where you want
-to display a filter pool that exists in another connection.</span></li>
-<li><span>Right-click on a file subsystem and select <b>New &gt; Filter Pool
-Reference &gt; <i>your profile</i> &gt; <i>name of pool</i></b>.</span></li>
-<li><span>Look under that subsystem again and you will see the filter
-pool reference.</span></li>
-</ol>
-<div class="p">To delete a filter pool reference, right-click it and select <b>Remove
-reference</b>. You can also move your filter pools up and down with the
-right-click menu.
-</div>
-</div>
-<div>
-<p>
-<b class="relconceptshd">Related concepts</b><br />
-<a href="../concepts/cfilters.html" title="">Remote System Explorer filters, filter pools, and filter pool references</a><br />
-</p>
-<p>
-<b class="reltaskshd">Related tasks</b><br />
-<a href="tmanagepools.html" title="">Configuring filter pools</a><br />
-<a href="tbeginsecond.html" title="">Creating a second connection to a remote server</a><br />
-</p>
-</div>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagesearch.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagesearch.html
deleted file mode 100755
index 149405f1f..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tmanagesearch.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Search for text and files on remote servers</title>
-</head>
-
-<body id="tmanagesearch"><a name="tmanagesearch"><!-- --></a>
-<h1 class="topictitle1">Search for text and files on remote servers</h1>
-<div>
-<p>You can search for text strings and files on any remote server
-or file system, including Linux, UNIX, and Windows systems.</p>
-<div class="p">There are three main ways you can search for files and text strings
-on remote servers, depending on your goal:
-<ul>
-<li>Search for text strings within a file</li>
-<li>Search for text strings and/or files within a folder</li>
-<li>Search for text strings, files, and/or folders within a remote file system</li>
-</ul>
-To search for files, text strings, and folders:
-<ol>
-<li>In the Remote Systems view, expand your iSeries, Linux, UNIX, or Windows
-connection until you reach the folder, file, or file system that you want
-to search. Select the containing item by clicking on the item.</li>
-<li>Right-click and select <b>Search</b>. Or, click <b>Search &gt; Remote</b> from
-the workbench menu. Or, for the keyboard shortcut, enter CTRL+H. All of these
-actions will invoke the Search window. </li>
-<li>In the Remote Search window, click the Remote Search tab if it is not
-already in focus. You can now search for text strings, files, and/or folders,
-with the option to use powerful Regular Expressions, in addition normal and
-variable expressions, such as a*b. See <a href="../ref/rsearch.html">Using
-search parameters with special characters</a> for more information. Regular
-Expressions might be most familiar to Linux and Unix users.
-For more information on Regular Expressions, see
-
-<a href="http://en.wikipedia.org/wiki/Regular_expression" target="_blank">http://en.wikipedia.org/wiki/Regular_expression.</a>
-<ul>
-<li>To search for strings, in the <b>Search string</b> field, enter the string
-that you want to search for, whether it be from a file, a folder, or an entire
-file system. Select the <b>Case sensitive</b> or <b>Regular expression</b> check
-boxes if they apply. Leave this field as an asterisk (*) if you do not want
-to search for strings. You can use commas to specify more than one type of
-string to search for. For example, you could enter "*.c, *.java, b?a.txt,
-" and so on.</li>
-<li>To search for files, in the <b>File name patterns</b> field, enter the
-name of the file you are looking for. Check the <b>Regular expression</b> check
-box if this option applies. Leave this field as an asterisk (*) if you do
-not want to search for files. You can use commas to specify more than one
-type of folder to search for. You can also click <b>Browse</b> to select file
-extensions to search for.</li>
-</ul>
-<div class="note"><span class="notetitle">Note: </span>
-You cannot edit the contents of the <b>Folder</b> field; however,
-you can click the <b>Browse</b> button to browse to and specify another folder.
-If the <b>Folder</b> field is empty, you need to browse to a particular folder
-before you can launch the search.
-</div>
-</li>
-<li>Click <b>Search</b>.</li>
-</ol>
-The matching strings and/or files display in the Remote Search view.
-The view updates itself as more matches are found and you can click the <b>Stop</b> button
-if you want to stop the search process. The view shows the strings and/or
-files that you searched for, with the matches listed beneath in a tree-view
-structure. For example, if you searched the file "README.txt" for the following
-string, "*bin*", then the Remote Search results view might look like this:
-<p><br /><img src="../images/search.gif" alt="" /><br /></p>
-<div class="p">To manipulate the set
-of search results:
-<ul>
-<li>Right-click the parent items of the tree, in this example, "README.txt",
-and you can select any of the regular Remote Systems options, for example, <b>Open
-With</b>, <b>Rename</b>, <b>Properties</b>, and so on.</li>
-<li>Right-click any line beneath the parent search item in the tree, in this
-example, "bin/rmid and jre/bin/rmid":
-<ul>
-<li>Select <b>Copy</b> to copy the path as you see it to your clipboard.</li>
-<li>Select <b>Go to</b> to open the file in an editor, which highlights the matching text. You can double-click on any line to perform the same action.</li>
-</ul>
-</li>
-</ul>
-</div>
-</div>
-</div>
-<div>
-<p><b class="relrefhd">Related reference</b><br />
-<a href="../ref/rsearch.html" title="">Using search parameters with special characters</a><br />
-</p>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tremoexp.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tremoexp.html
deleted file mode 100755
index c52180c57..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tremoexp.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Exporting resources to a remote file system</title>
-</head>
-
-<body id="tremoexp"><a name="tremoexp"><!-- --></a>
-<h1 class="topictitle1">Exporting resources to a remote file system</h1>
-<div>
-<p>A page in the Export wizard enables you to export resources from the workspace to a remote file system.</p>
-<div class="p">To export resources from the workspace:</div>
-<ol>
-<li><span>Select <span><b>File</b> &gt; <b>Export</b></span> from the workbench menu bar. The Export wizard opens.</span></li>
-<li><span>Select <b>Remote file system</b>. Click  <b>Next</b>.
-The Remote file system page opens.</span></li>
-<li><span>Use the left and right panes to select resources to export. Choose
-individual resources from the right pane, or entire folders from the left
-one.</span></li>
-<li><span>In the  <b>Folder</b> field, select or browse for
-the destination folder.</span></li>
-<li><strong>Optional: </strong><span>Select the check box to overwrite (without
-prompting) files of the same name in the remote folder.</span></li>
-<li><span>Select one of the radio buttons to either replicate the workspace
-folder structure in the remote system or create only the actual folders you
-have selected.</span></li>
-<li><strong>Optional: </strong><span>Select the check box to save the settings of this
-export to a file. You can later right click on the file in the Navigator or other views
-and export the same set of files without having to use the export wizard.</span>
-<ul><li><strong>Optional: </strong><span>Deselect the checkbox to export only the set of files
-that have changed since the last export. This is selected by default. It ensures that only files
-that have changed since the last export will be exported next time and provides better performance.</span></li>
-</ul>
-</li>
-<li><span>When you have specified the destination directory, click  <b>Finish</b> to
-export the resources to the remote system.</span>
-</li>
-</ol>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tremoimp.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tremoimp.html
deleted file mode 100755
index fb2363c27..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tremoimp.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Importing resources from a remote file system</title>
-</head>
-
-<body id="tremoimp"><a name="tremoimp"><!-- --></a>
-<h1 class="topictitle1">Importing resources from a remote file system</h1>
-<div>
-<p>A page in the Import wizard enables you to import resources from a remote file system to the workspace.</p>
-<div class="p">To import resources to the workspace:</div>
-<ol>
-<li><span>Select  <span><b>File</b> &gt; <b>Import</b></span> from the menu bar. The Import wizard opens.</span></li>
-<li><span>Select  <b>Remote file system.</b> Click  <b>Next</b>.
-The Remote file system page opens.</span></li>
-<li><span>Select or type a source folder, or click  <b>Browse</b> to
-select a folder from the  <b>Browse For Folder</b> window. </span> Note that you can create a connection from this window.</li><li><span>Use the left and right panes to select resources to import. Choose
-individual resources from the right pane, or entire folders from the left
-one. You can select files from multiple projects.</span></li>
-<li><span>In the second  <b>Folder</b> field, specify the
-destination for the imported resources.</span></li>
-<li><strong>Optional: </strong><span>Select the check box to overwrite (without prompting) files of the same name in the workspace.</span></li>
-<li><span>Select one of the radio buttons to either replicate the remote folder structure in the workspace or create only the actual folders you have selected.</span></li>
-<li><span>When you have specified the source and destination, click  <b>Finish</b> to import the resources to the workspace.</span></li>
-</ol>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tremtype.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tremtype.html
deleted file mode 100755
index 0008b5521..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tremtype.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Removing an existing type</title>
-</head>
-
-<body id="tremtype"><a name="tremtype"><!-- --></a>
-<h1 class="topictitle1">Removing an existing type</h1>
-<div>
-<div class="p">To remove an existing type: </div>
-<ol>
-<li><span>In the Remote Systems view, right-click on a subsystem, and select <span><b>Work With </b> &gt; <b>Named Types</b></span>.</span></li>
-<li><span>On the Work With Named Types window, expand <b>Object</b> or <b>Member</b>.</span></li>
-<li><span>Select your defined type from the list. You cannot remove any predefined types.</span></li>
-<li><span>Click <b>Remove</b>.</span></li>
-</ol>
-</div>
-<div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../concepts/cuseractions.html" title="">User actions (user options)</a><br />
-</p><p><b class="reltaskshd">Related tasks</b><br />
-<a href="tedittype.html" title="">Editing an existing type</a><br />
-</p>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/truncmdsview.html b/rse/doc/org.eclipse.rse.doc.user/tasks/truncmdsview.html
deleted file mode 100755
index 70751e495..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/truncmdsview.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Running and viewing commands using the Remote Shell view </title>
-</head>
-
-<body id="truncmdsview"><a name="truncmdsview"><!-- --></a>
-<h1 class="topictitle1">Running and viewing commands using the Remote Shell view </h1>
-<div>
-<div class="p">You can open a shell for your local and remote systems, from the
-Remote System Explorer, <p><b>Opening the Remote Shell view and launching
-a command shell</b></p>
-<p>In the Remote System Explorer, switch to the Remote Shell view by clicking <b>Window &gt; Show View &gt; Remote Shell</b> from
-the menu bar. To open a new shell in the Remote Shell view, click the down
-arrow in the view and select <b>Launch shell</b>. To launch a new shell for
-another connection requires that an existing shell for that connection is
-selected in the view. Otherwise, the shell must be launched from the Remote
-Systems, Remote System Details, or the Remote Shell view.</p>
-<p><b>Working with shells</b></p>
-<p> When the Remote Shell view is open, you can work
-with shells. A shell that
-preserves its environment across commands. The environment for all commands
-in the shell may change in response to your input.   For example, if you type
-"cd .."
-you change the working directory for that shell.</p>
-<p><b>Viewing output in an editor</b></p>
-<p>You can double-click a line of output to open
-it in an editor. For example, if you encounter an error while running a command,
-you can double-click the error and the editor opens the source to the line
-of code where the parser found a problem.</p>
-<p><b>Closing shells</b></p>
-<p>The <b>Cancel shell</b> toolbar item is enabled when the currently displayed shell or command
-is active. Press <b>Cancel Shell</b>, to terminate that process.
-If the shell is active, it cancels the shell before removing it from the view.</p>
-<p><b>Content assist</b></p>
-<p>The Remote Shell view supports content assist. You can press CTRL+space to complete file names
-or environment variable names while you type commands.</p>
-<p></p>
-</div>
-</div>
-<div>
-<p><b class="relconceptshd">Related concepts</b><br />
-<a href="../concepts/crunremcmds.html" title="">Shells and commands in the Remote Systems view</a><br />
-</p><p><b class="reltaskshd">Related tasks</b><br />
-<a href="twrkcmdshl.html" title="">Working with command shells</a><br />
-</p>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/ttablecopy.html b/rse/doc/org.eclipse.rse.doc.user/tasks/ttablecopy.html
deleted file mode 100755
index 6610d4df5..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/ttablecopy.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Copying and pasting in the Remote System Explorer</title>
-</head>
-
-<body>
-<h1>Copying and pasting in the Remote System Explorer</h1>
-<p>You can copy and paste files not only between
-files and folders, but between different
-host systems as well. For example, you can
-copy a file from one folder on your host
-to another, or from one type of system to
-another. You can select multiple files as
-well. However, there are guidelines for what
-kinds of items you can and cannot copy and
-paste. In the Remote Systems view, expand
-the two connections (that represent the two
-hosts) until you see the file that you want
-to copy and the location on the other host
-where you want to paste the file.</p>
-<p>To copy and paste:</p>
-<ol>
-<li>Right-click the original file to select it and select <b>Copy</b>.</li>
-<li>Navigate through the directories and files until you find the place where you want to paste the file.</li>
-<li>Right-click on the parent file that contains the files where you want to paste your file, and select <b>Paste</b>.</li>
-</ol>
-<p><b>Related tasks</b><br/>
-<a href="ttabledrag.html">Dragging and dropping items in the Remote System Explorer</a><br/>
-</p>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/ttabledrag.html b/rse/doc/org.eclipse.rse.doc.user/tasks/ttabledrag.html
deleted file mode 100755
index e7e2c1f7d..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/ttabledrag.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2003, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Dragging and dropping items in the Remote System Explorer</title>
-</head>
-
-<body>
-<a name="ttabledrag"></a>
-<h1 class="topictitle1">Dragging and dropping items in the Remote System Explorer</h1>
-<div>
-<div class="p">
-<div class="p">You can drag and drop files between different
-hosts, such as Local, Linux, UNIX, or Windows.
-Additionally, you can drag and drop items
-within one view; for example, in the Remote
-Systems view, or you can drag and drop items
-between views; for example, from the Remote
-Systems view to the Remote Systems Details
-view. When you drag and drop items, you copy,
-rather than cut, the item that you move.
-If you want to remove an item completely
-and put it in another location, drag and
-drop the item first, and then delete the
-item from the original location.</div>
-<p>To drag and drop files or objects:<br/>
-</p>
-<ol>
-<li>In the Remote Systems view, expand the two connections (that
-represent the two hosts) until you see the file you want to copy and the location
-on the other host where you want to paste the file. Or, open two
-views that contain the item and the destination.</li>
-<li>Click the item once to select it, hold down the left mouse button
-while you drag the item to the desired location, and then release the button.</li>
-</ol>
-</div>
-</div>
-<div>
-<p><b>Related tasks</b><br clear="all"/>
-<a href="ttablecopy.html" title="">Copying and pasting in the Remote System Explorer</a><br clear="all"/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tteamsup.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tteamsup.html
deleted file mode 100755
index 9160287f7..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tteamsup.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Using team support</title>
-</head>
-
-<body id="tteamsup">
-<a name="tteamsup"><!-- --></a>
-<h1 class="topictitle1">Using team support</h1>
-<div>
-<div class="p">You can use any Eclipse-enabled repository from any
-vendor. The following
-information describes project-sharing using Concurrent Versions System
-(CVS) support that comes with Eclipse. Steps and user interface
-elements will differ depending on the repository
-support that you have installed.
-<div class="note"><span class="notetitle">Note: </span>When you
-synchronize your RemoteSystemsConnection project with the repository
-the first time, you will see many files in conflict.
-This is because it takes one synchronization to properly align
-the server's encoded version information with your local files. This
-happens only once and you can just receive all of the incoming changes
-and your local workspace will then be synchronized with the server. You
-might also find inactive profiles that belong to other teammates in the Team
-view after you synchronize with the central server. You can choose whether
-or not to activate these profiles in the Team view if you want to see the
-profile's contents in the Remote System Explorer on your local workstation.</div>
-<p>In a team programming environment, team members do work in their own workbench,
-isolated from others. Eventually they will want to share their work with
-their teammates. The Remote System Explorer allows them to share
-their connections, filter pools, and filters. To share these resources:</p>
-</div>
-<ol>
-<li class="skipspace">In the Remote System Explorer perspective, select the Team tab which by
-  default is located in the same pane as the Remote Systems view. This
-  will bring the Team view to the front of the Remote System Explorer.
-  You can also use the <img src="../images/gsarrow.gif" title="" alt="menu" style="width: 24px; height: 23px;"/>
-button on the Remote Systems view and select the <span style="font-weight: bold;">Work
-With Profiles</span> action.<span> </span></li>
-<li class="skipspace"><span>Expand <b>RemoteSystemsConnections</b>. The profiles that you have defined, as well as the Team profile, are displayed. The Team profile is created by the Remote System Explorer to use for sharing connections, filter pools, and filters if you do not want to share them in a profile that you create and manage.</span></li>
-<li class="skipspace"><span>Right-click on <b>RemoteSystemsConnections</b>
-and select <span><b>Team</b> &gt; <b>Share Project</b></span> . </span></li>
-<li class="skipspace"><span>Select <b>CVS</b> and click <b>Next</b>.</span></li>
-<li class="skipspace"><span>Select <b>Use existing repository
-location </b> if you have already defined a CVS repository. Select <b>Create a new
-repository</b> location if you need to define a CVS repository (this
-information should be available from the person who configured the CVS
-repository on the server). To create a CVS repository definition:</span>
-    <ol type="a">
-      <li class="skipspace"><span>In the <b>Host</b> field, type the
-address of the server, for example mymachine.com. </span></li>
-      <li class="skipspace"><span>In the <b>Repository path</b> field,
-type the path to the repository on the server, for example /home/test, d:/test. </span></li>
-      <li class="skipspace"><span>In the <b>User</b> field, type the
-user name to use to connect to the repository. </span></li>
-      <li class="skipspace"><span>In the <b>Password</b> field, type
-the password for the user name. </span></li>
-      <li class="skipspace"><span>From the <b>Connection Type</b>
-list, select the authentication protocol of the CVS server. There are three
-connection methods that come with the Eclipse CVS client: </span>
-        <ul>
-          <li><b>pserver</b>: A CVS specific connection method. </li>
-          <li><b>extssh</b> : An SSH 1.0 client included with the workbench. </li>
-          <li><b>ext</b>: The CVS ext connection method that uses an
-external tool such as SSH to connect to the repository. The tool used
-by ext is configured in the<span><b>Team</b> &gt; <b>CVS</b> &gt; <b>EXT
-Connection Method</b></span> preference page. </li>
-        </ul>
-      </li>
-      <li class="skipspace"><span>If the server uses a custom port,
-enable <b>Use Port</b> and
-enter the port number. </span></li>
-    </ol>
-  </li>
-  <li class="skipspace"><span>Click <b>Finish</b>. The repository
-location is
-created. The <span style="font-weight: bold;">RemoteSystemsConnections</span> project will be created remotely and the Synchronize view will open and
-  allow you to commit its resources to the server. If the project already
-  exists remotely, the Synchronize view will show conflicts on any files
-  that exist both locally and remotely. If the </span><span><span
- style="font-weight: bold;">RemoteSystemsConnections</span> </span><span>project
-already exists in the repository when you first share it, there may be
-many conflicts. Generally, these are not real conflicts, but simply considered
-conflicts on the first synchronize because there is no local CVS information for the
-resources in your workspace.
-If you have not created any resources in your Team profile, you can
-safely send or receive all of the conflicting files. If you have created
-resources in your Team profile, you should check each conflicting file to ensure
-there really are no differences, and if there are, resolve them by merging.</span></li>
-  <li class="skipspace"><span>To synchronize your resources with those
-in the associated repository, right-click on the <span style="font-weight: bold;">RemoteSystemsConnection
-    </span>project, and select <span><b>Team</b> &gt; <b>Synchronize
-with Repository</b></span>.</span></li>
-  <li class="skipspace"><span>After sharing or synchronizing, and
-receiving incoming resources from the repository, right-click on the <span
- style="font-weight: bold;">RemoteSystemsConnection </span>project,
-and select <b>Reload Remote System Explorer</b>. This refreshes
-the Remote System Explorer and Team view to reflect the new or changed
-resources.</span></li>
-</ol>
-</div>
-<div class="nested1" id="tviewproject"><a name="tviewproject"><!-- --></a>
-<h2 class="topictitle2">Viewing the project resources in the Navigator
-view</h2>
-<div>
-<div class="p">The Navigator view provides a hierarchical view of all
-the resources in the workspace. From here, you can view the contents of the projects
-that are shared, including the <span style="font-weight: bold;">RemoteSystemsConnection
-</span>project, and select team-related actions on particular
-resources. By default, the Navigator view is included in the Resources perspective.
-To add it to the current perspective,
-<ol>
-  <li>Select <span><b>Window</b> &gt; <b>Show View</b> &gt; <b>Other</b></span>.</li>
-  <li>Expand <b>Basic.</b> </li>
-  <li>Select <b>Navigator.</b></li>
-</ol>
-</div>
-<div class="p"><img src="../images/navigator.jpg" alt=""/></div>
-</div>
-<div>
-<p><b class="relconceptshd">Related concepts</b><br/>
-<a href="../concepts/cteam.html" title="">Team support</a><br/>
-<a href="../concepts/cprofile.html" title="">Remote System Explorer
-Profiles</a><br/>
-</p>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="tteamsup1.html" title="">Working with profiles and team support</a><br/>
-</p>
-</div>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tteamsup1.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tteamsup1.html
deleted file mode 100755
index b1aa0fb3c..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tteamsup1.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Working with profiles and team support</title>
-</head>
-
-<body id="tteamsup1">
-<a name="tteamsup1"></a>
-<h1 class="topictitle1">Working with profiles and team support</h1>
-<div>
-<div class="p">All connections, filter data, user actions, and compile
-commands belong to profiles. Profiles can be shared by team members for the purpose of
-team development. You can work with your profiles in the Team view to enable
-greater control over team-sharable elements in the Remote System Explorer.
-<div class="note"><span class="notetitle">Note: </span>Because
-the Remote Systems view only displays connections, filters, user
-actions, and compile commands from active profiles, you need to be in the Team
-view to work with or activate your non-active profiles.
-</div>
-</div>
-<div class="p">To manage your team profiles:
-<div class="p">
-<ol>
-<li>In the Remote Systems perspective, select the Team tab which by
-default is located in the same pane as the Remote Systems view.
-This will bring the Team view to the front of the Remote System
-Explorer. You can also use the
-<img  src="../images/gsarrow.gif" title="" alt="menu" style="width: 24px; height: 23px;"/>
-button on the Remote Systems view and select the <span style="font-weight: bold;">Work With Profiles</span>
-action.<br/>
-  </li>
-  <li>In the Team view, expand the root element, <b>RemoteSystemsConnections</b>,
-to see a list of your profiles.
-    <ul>
-      <li>To create a profile, right-click on the root element in the
-Team view, and select <b>New &gt; Profile</b> and complete the dialog box for the
-profile.</li>
-      <li>To activate or deactivate a profile, right-click the profile
-and select <b>Active</b> (if it is deactivated) or <b>Not active</b> (if it is active).</li>
-      <li>To duplicate a profile in the view, right-click the profile
-and select <b>Duplicate</b>. This action copies all of the profile's connections, filters, user
-actions, and compile commands.</li>
-      <li>To rename a profile, right-click the profile and select <b>Rename</b>.</li>
-    </ul>
-  </li>
-  <li>In the Team view, you can also expand your profiles to view
-connections, filter pools, user actions, and compile commands that belong to each
-profile. Right-click on any of your specific filters, user actions, and so on,
-to open a <b>Work with</b> window. These are the same actions available in the
-Remote Systems view. To work with filter pools, for example, right-click one
-of your filters, and select <b>Work with filter pools</b>. Keep in mind that
-the Remote Systems view is the more ideal environment to manipulate filters,
-filter pools, compile commands, user actions, and so on. The Team view is designed to
-manage profiles, and view the elements that belong to each profile. The Remote
-Systems view is designed for you to work with all the items that belong to your
-active profiles. It includes a greater number of right-click and menu options
-for a development-focused approach.</li>
-  <li>When you have finished working with your profiles, switch back to
-the Remote Systems view, by clicking the Remote Systems tab, to continue
-working with active profile artifacts, or remain in the Team view to
-<a  href="tteamsup.html">synchronize your profiles with the repository</a>.</li>
-</ol>
-</div>
-</div>
-</div>
-<div>
-<p><b class="relconceptshd">Related concepts</b><br/>
-<a href="../concepts/cteam.html" title="">Team support</a><br/>
-<a href="../concepts/cprofile.html" title="">Remote System Explorer Profiles</a><br/>
-</p>
-<p><b class="reltaskshd">Related tasks</b><br/>
-<a href="tteamsup.html" title="">Using team support</a><br/>
-<!-- TODODeferred after RSE 1.0
-<a href="tworkuseract.html" title="">Managing user actions (user options)</a><br/>
--->
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tusingefs.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tusingefs.html
deleted file mode 100644
index 16dad2f55..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tusingefs.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<!-- David Dykstal (IBM) - [236082] Add documentation on using RSE and EFS -->
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Using RSE and EFS</title>
-</head>
-
-<body>
-
-<h1>Using RSE and EFS</h1>
-<p>
-The Eclipse File System (EFS) is an interface supported by Eclipse that allows Eclipse to use non-local file systems.
-Many Eclipse components are <strong>EFS-aware</strong>, that is, they can use resources supplied by EFS as if they were located on a local file system.
-An <strong>EFS Provider</strong> is an implementer of this EFS interface and provides a file system support for the resources it exposes.
-RSE is an EFS provider that allows you to access remote resources from any EFS-aware Eclipse component such as the Java Development Tools.
-</p><p>
-EFS can take any remote file system available through RSE and its various protocols (like the ssh, ftp and dstore connections) and make it visible as resources in the workspace. By sitting at the heart of the Eclipse resource system, the full power of Eclipse - including source parsers, outline views, content assist and the like - comes to remote files as well.
-</p><p>
-Since RSE's <em>raison d'etre</em> is remote access, it solves the problem of logging in to remote systems and keeping credentials in a usable UI.
-</p><p>
-There are issues, however, with treating remote resources as local ones.
-</p><p>
-EFS makes the Eclipse workspace more flexible, but components and plugins need to be aware that the resources they work on can now be remote.
-Work is going on throughout Eclipse to improve their EFS integration and hopefully their performance.
-For now, however, working with remote resources through RSE and EFS is best done on a fast network with low latency.
-</p><p>
-Pure RSE/EFS projects (i.e. where the .project file is on the remote system) are currently not supported due to low-level interactions between EFS, the Eclipse platform, and the RSE caching mechanism.
-Purely remote projects will not open automatically on Eclipse startup.
-However, one can link lower-level folders of a project to an EFS provider, allowing a project to contain a mix of remote and local resources.
-Note that team support (such as that provided by CVS) will not synchronize resources linked through an EFS provider at this time.
-</p><p>
-Using this support you could, for example, set up a Java project from a machine at home and link to files on an account at work. If you makes changes at work, you can come home, refresh the project and everything will be updated and compiled.
-</p><p>
-The advantages of using linked resources and an RSE-supplied EFS are that the tools that the workbench provides are available directly on the remote source. In addition, since you can edit directly on the remote system there will be no immediate synchronization/merge issues. However, this can lead to problems with update conflicts if the directories on the remote system are shared with others and are quite active. The disadvantages are what you would expect: that you can run into quite slow refreshes of the workspace. Since EFS maps the remote directory tree anytime Eclipse wants to do a refresh it may take several hours. Tools that are not EFS-aware may force these refreshes to happen at odd times which can lead to unpredictable performance.
-</p>
-
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tworkssl.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tworkssl.html
deleted file mode 100644
index bb6661380..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tworkssl.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title> Working with SSL </title> 
-</head>
-<body>
-<h1>Working with SSL</h1>
-<h2>SSL Overview</h2> 
-<p>
-Secure-Sockets Layer (SSL) is a communications facility that encrypts all communications
-between a client and a target system. The DStore communications protocol in RSE supports SSL.
-</p>
-<p>
-SSL achieves its security by using <em>certificates</em> to authenticate each side of a
-connection made between two parties. The certificates allow for the certain identification of those
-parties and for the negotiation of an encrypted channel for communication. The certificates
-themselves are files whose alteration can be easily detected and whose origin is verified by a
-trusted <em>certificate authority</em>.
-</p>
-<p>
-Web browsers use SSL and request SSL certificates from their servers to communicate with
-on-line stores, banks, and other service providers. These are the same kind of certificates, but are
-used for a different purpose. A web browser will typically be verifying the identity of the server
-and will be contacting a certificate authority to do so. RSE users, on the other hand, will
-typically trust the target system to provide certificates to client systems so that the
-communications can be encrypted.
-</p>
-<h2>Using SSL</h2> 
-<p>
-Certificates are usually manufactured by a service provider (such as a target system) in concert
-with a certificate authority. The authority can be any entity that the target system trusts including
-itself. Certificates are delivered to a client system by the target system when the two are negotiating
-an SSL connection. When starting a connection to a server, DStore first attempts an SSL connection
-and then falls back to non-SSL if the SSL one fails. As a client, you don't need to be concerned
-with the handling of certificates at all, but you can use the RSE SSL preferences
-page to manage all your certificates that you have received from the target systems you have
-connected to in the past.
-</p>
-<p>
-You reach the RSE preferences page by opening the <code>Preferences</code> for the workbench,
-expanding the <code>Remote Systems</code> category and selecting the <code>SSL</code> subcategory.
-There you will see operations that allow you to add certificates, rename them to make them easier to
-manage, remove them once they have expired, and view their contents. You would typically see one
-certificate for each target system that you have connected to using SSL.
-</p>
-<h2>Setting Up The Server</h2> 
-<p>
-You set up the DStore server to use SSL by editing the <code>ssl.properties</code> file in the
-server location. This server names the keystore and its password used for holding certificates
-generated using the <code>keytool</code> utility from the Java SDK.
-These certificates are then given to the client during SSL
-startup so that communications can be encrypted.
-</p>
-<p>
-The keystore file referenced by <code>ssl.properties</code> can contain several entries but only one is 
-used when a client connects. The entries in the keystore may themselves have passwords, but dstore assumes 
-that these are all the same as the keystore password. It makes sense, therefore, to maintain only
-one keystore for the dstore server, that it have only one entry, and that it exist in the same
-directory as the dstore server. That entry can be a self-signed certificate.
-</p>
-<p>
-The following command will create a keystore and add a single self-signed certificate to it.
-</p>
-<pre><code>
-keytool -genkey -keystore keystore_file -alias entry_name -storepass d98kMn50sV
-   -dname "CN=dstore server, OU=division, O=company, L=city, ST=state, C=country"
-</code></pre>
-<p>
-The command would be entered on a single line. It appears here on multiple lines for readability.
-</p>
-<p>
-After entering this command you will be prompted to supply a password for the entry itself.
-You should press enter to take the default which is the keystore password. 
-</p>
-<p>
-One would then edit the ssl.properties file to use this as follows:
-</p>
-<pre><code>
-daemon_keystore_file=keystore_file
-daemon_keystore_password=d98kMn50sV
-</code></pre>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tworkuseract.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tworkuseract.html
deleted file mode 100755
index c3d49d81d..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tworkuseract.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page."/>
-<link rel="stylesheet" type="text/css" href="../book.css"/>
-<title>Managing user actions (user options)</title>
-</head>
-
-<body id="tworkuseract">
-<a name="tworkuseract"></a>
-<h1 class="topictitle1">Managing user actions (user options)</h1>
-<div>
-<div class="p">To create a new action or change an existing action:</div>
-<ol>
-<li><span>In the Remote Systems view, expand the connection
-containing the kinds of resources you want to act on,
-navigate to the subsystem that would contain those resources, and
-select <b>Work with &gt; User actions</b>.
-You can also right-click on a file in one of your filters, and select <b>User
-Actions</b>.</span></li>
-<li><span>Type the text to display in the <b>Action Name</b> field.
-This is a brief label for the action.</span></li>
-<li><span>Type a longer, more descriptive text for the action in the <b>Comment</b>
-field.</span></li>
-<li><span>Type the actual command string to run when
-a user selects this action. This command can use action substitution
-variables when your action is run. These variables are used when defining the
-command string to run for a particular action. Substitution variables keep you
-from having to explicitly code command parameter values. Click <b>Insert
-variable</b> to see and select valid variables.</span></li>
-</ol>
-<div class="p"><b>Additional parameters</b>
-<ul>
-<li>Select <b>Browse</b> to search for and select command
-files (for example, .exe, .bat or .cmd files). The file name you select
-is reflected in the Command field when you return. </li>
-<li>Select <b>Prompt</b> to prompt the command currently entered
-in the Command area.</li>
-<li>Select <b>Prompt first</b> to indicate that Remote System
-Explorer should prompt the command when it is run.</li>
-<li>Select <b>Refresh after</b> to have Remote System Explorer
-refresh the selected files after the action's command is run. This is
-useful if your command affects the information displayed in the file list
-window for the selected files, for example, if your command changes the type
-of a file.</li>
-<li>Select <b>Show action</b>.</li>
-<li>Select <b>Single selection only</b> if you want to show
-this action only when a single object is selected.</li>
-<li>Select <b>Invoke once </b> to collect the full names of
-all selected resources into the file name parameter and run the command
-only once for all resources that are selected..</li>
-<li>Select any currently defined named types from the <b>Defined
-Types</b> list
-and click <b>Add</b> to include them in the <b>Selected
-Types</b> list. The action will only appear if a file matching one
-of these types is selected.</li>
-</ul>
-<p>You can choose to view user actions by active profile for remote
-objects
-on the <b>User Actions</b> cascade menu. You can see both
-team-shared and private user actions. To enable this, select <b>Cascade
-user actions by profile</b> on the <b>Remote Systems Preferences</b>
-page.</p>
-</div>
-</div>
-<div>
-<p><b class="relconceptshd">Related concepts</b><br/>
-<a href="../concepts/cuseractions.html" title="">User actions (user options)</a><br/>
-</p>
-</div>
-</body>
-</html>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/twrkcmdshl.html b/rse/doc/org.eclipse.rse.doc.user/tasks/twrkcmdshl.html
deleted file mode 100755
index d1d2ca7fb..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/twrkcmdshl.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
-<!-- David Dykstal (IBM) - [193725] fix up description of work with command to match current UI -->
-<link rel="stylesheet" type="text/css" href="../book.css" />
-<title>Working with command shells</title>
-</head>
-
-<body id="twrkcmdshl">
-<h1 class="topictitle1">Working with command shells</h1>
-<div>
-<p>In the Remote Systems view, you can launch a shell to perform commands
-in a specific directory or folder of a remote file system.</p>
-<div class="p">
-To launch a new shell from the Remote Systems view:
-<ol>
-<li>Expand a connection.</li>
-<li>Right-click on a file subsystem that supports shells and select <b>Launch Shell</b>.</li>
-<li>Enter shell commands, such as "ls" or "pwd", in the <b>Command</b> field (just beneath the shell itself).</li>
-</ol>
-</div>
-<div class="p">
-You can also run commands from locations further down in the remote file system
-tree, so that you do not need to navigate there from your home directory each time.
-This option takes the default shell, sets the current directory to the folder that was selected,
-and invokes a command in that directory.
-</div>
-<div class="note">
-<span class="notetitle">Note: </span>
-Each new shell shows up in a separate tab. If more than one
-shell is running on the same connection, each subsequent shell has a number
-appended to the connection name.
-</div>
-</div>
-<div>
-<p>
-<b class="relconceptshd">Related concepts</b><br />
-<a href="../concepts/crunremcmds.html" title="">Shells and commands in the Remote Systems view</a><br />
-</p>
-<p>
-<b class="reltaskshd">Related tasks</b><br />
-<a href="truncmdsview.html" title="">Running and viewing commands using the Remote Shell view</a><br />
-</p>
-</div>
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/doc/org.eclipse.rse.doc.user/toc.xml b/rse/doc/org.eclipse.rse.doc.user/toc.xml
deleted file mode 100755
index 07d4fa25d..000000000
--- a/rse/doc/org.eclipse.rse.doc.user/toc.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!--
-    Copyright (c) 2006, 2009 IBM Corporation and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-    
-    Initial Contributors:
-    The following IBM employees contributed to the Remote System Explorer
-    component that contains this file: David McKnight, Kushal Munir,
-    Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
-    Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-    
-    Contributors:
-    IBM Corporation - initial API and implementation
-    Martin Oberhuber (Wind River) - [158529] contribute remotecdt docs
- -->
-<toc label="RSE User Guide">
-   <topic label="Getting Started" href="gettingstarted/g_start.html">
-      <topic label="Installing the Remote System Explorer" href="gettingstarted/g1installing.html"/>
-      <topic label="First Steps with the Remote System Explorer" href="gettingstarted/g2firststeps.html"/>
-      <topic label="Setting up a dstore server" href="tasks/tbegindstore.html"/>
-      <topic label="Using Remote Connections" href="gettingstarted/gusing.html"/>
-      <topic label="Extending Remote System Explorer" href="gettingstarted/gxtending.html"/>
-   </topic>
-   <topic label="Remote System Explorer Connections" href="concepts/cbegin.html">
-      <topic label="Universal Systems" href="concepts/cuniversal.html"/>
-      <topic label="Connecting to a remote Linux or UNIX server" href="tasks/tbeginlinux.html"/>
-      <topic label="Connecting to a remote Windows server" href="tasks/tbeginwindows.html"/>
-      <topic label="Disconnecting from a remote server" href="tasks/tbegindiscon.html"/>
-      <topic label="Creating a second connection to a remote server" href="tasks/tbeginsecond.html"/>
-      <topic label="Deleting a connection" href="tasks/tbegindelete.html"/>
-      <topic label="Configuring environment variable support for connections" href="tasks/tbeginenv.html"/>
-   </topic>
-   <topic label="Remote System Explorer filters, filter pools, and filter pool references" href="concepts/cfilters.html">
-      <topic label="Creating filters" href="tasks/tmanagemem.html"/>
-      <topic label="Changing filters" href="tasks/tmanageedit.html"/>
-      <topic label="Deleting filters" href="tasks/tmanagedel.html"/>
-      <topic label="Configuring filter pools" href="tasks/tmanagepools.html"/>
-      <topic label="Configuring filter pool references" href="tasks/tmanagepoolsref.html"/>
-   </topic>
-   <topic label="Remote System Explorer Profiles" href="concepts/cprofile.html">
-     <topic label="Creating a second profile" href="tasks/tbeginsecprofile.html"/>
-     <topic label="Deleting a profile" href="tasks/tbegindeleteprofile.html"/>
-   </topic>
-   <!-- TODO rework needed
-   <topic label="Team support" href="concepts/cteam.html">
-      <topic label="Using team support" href="tasks/tteamsup.html"/>
-      <topic label="Working with profiles and team support" href="tasks/tteamsup1.html"/>
-   </topic>
-   -->
-   <topic label="Shells and commands in the Remote Systems view" href="concepts/crunremcmds.html">
-      <topic label="Running and viewing commands using the Remote Shell view" href="tasks/truncmdsview.html"/>
-      <topic label="Working with command shells" href="tasks/twrkcmdshl.html"/>
-   </topic>
-   <!-- TODODeferred after RSE 1.0
-   <topic label="User actions" href="concepts/cuseractions.html">
-      <topic label="Managing user actions" href="tasks/tworkuseract.html"/>
-      <topic label="Editing an existing type" href="tasks/tedittype.html"/>
-      <topic label="Removing an existing type" href="tasks/tremtype.html"/>
-   </topic>
-   -->
-   <topic label="Search for text and files on remote servers" href="tasks/tmanagesearch.html">
-      <topic label="Using search parameters with special characters" href="ref/rsearch.html"/>
-   </topic>
-   <!-- TODODeferred after RSE 1.0
-   <topic label="Compiling programs" href="concepts/cremcompile.html"/>
-   -->
-   <topic label="Managing archived files" href="tasks/tarchive.html"/>
-   <!-- TODODeferred after RSE 1.0
-   <topic label="Importing resources from a remote file system" href="tasks/tremoimp.html" /> 
-   <topic label="Exporting resources to a remote file system" href="tasks/tremoexp.html" />
-   <topic label="Building programs on a remote system" href="tasks/tbuild.html" />
-   -->
-   <topic label="Accessing Remote System Explorer preferences" href="ref/rrsepref.html"/>
-   <topic label="Saving User IDs and passwords" href="tasks/tbeginpass.html"/>
-   <topic label="Working with SSL" href="tasks/tworkssl.html"/>
-   <topic href="tasks/tusingefs.html" label="Using RSE and EFS">
-   </topic>
-   <anchor id="rse_user_extensions" />
-<topic label="Legal" href="notices.html"/>
-</toc>
diff --git a/rse/doc/readme.txt b/rse/doc/readme.txt
deleted file mode 100644
index 4b45b5127..000000000
--- a/rse/doc/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the "doc" folder for plugin projects containing documentation.
-All projects should be named "org.eclipse.rse.doc.*".
-\ No newline at end of file
diff --git a/rse/examples/readme.txt b/rse/examples/readme.txt
deleted file mode 100644
index 5193a00e2..000000000
--- a/rse/examples/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the "examples" folder for plugin projects containing examples.
-All projects should be named "org.eclipse.rse.examples.*".
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse-feature/.project b/rse/features/org.eclipse.rse-feature/.project
deleted file mode 100644
index fc4435d95..000000000
--- a/rse/features/org.eclipse.rse-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse-feature/build.properties b/rse/features/org.eclipse.rse-feature/build.properties
deleted file mode 100644
index e0c4ed859..000000000
--- a/rse/features/org.eclipse.rse-feature/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2007 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-#generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core
-#generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
-#generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
-#generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
-#generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
diff --git a/rse/features/org.eclipse.rse-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/rse/features/org.eclipse.rse-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse-feature/epl-v10.html b/rse/features/org.eclipse.rse-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse-feature/feature.properties b/rse/features/org.eclipse.rse-feature/feature.properties
deleted file mode 100644
index 976b7913f..000000000
--- a/rse/features/org.eclipse.rse-feature/feature.properties
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - ongoing maintenance
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=Remote System Explorer End-User Runtime
-
-# "description" property - description of the feature
-description=An integrated framework and toolkit for seamless working \
-on remote systems through SSH, FTP or dstore protocols.
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2011 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-This product includes software developed by the\n\
-Apache Software Foundation http://www.apache.org/
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
deleted file mode 100644
index d6ee9d68a..000000000
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2011 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-<feature
-      id="org.eclipse.rse"
-      label="%featureName"
-      version="3.2.3.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rse.core"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.dstore"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.ftp"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.local"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.ssh"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.telnet"
-         version="0.0.0"
-         search-location="both"/>
-
-   <includes
-         id="org.eclipse.rse.terminals"
-         version="0.0.0"
-         search-location="both"/>
-
-   <plugin
-         id="org.eclipse.rse"
-         download-size="7"
-         install-size="8"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse-feature/license.html b/rse/features/org.eclipse.rse-feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/rse/features/org.eclipse.rse-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.core-feature/.project b/rse/features/org.eclipse.rse.core-feature/.project
deleted file mode 100644
index 5e404d986..000000000
--- a/rse/features/org.eclipse.rse.core-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.core-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse.core-feature/build.properties b/rse/features/org.eclipse.rse.core-feature/build.properties
deleted file mode 100644
index 92101e808..000000000
--- a/rse/features/org.eclipse.rse.core-feature/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/rse/features/org.eclipse.rse.core-feature/epl-v10.html b/rse/features/org.eclipse.rse.core-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.core-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.properties b/rse/features/org.eclipse.rse.core-feature/feature.properties
deleted file mode 100644
index 48f166e6a..000000000
--- a/rse/features/org.eclipse.rse.core-feature/feature.properties
+++ /dev/null
@@ -1,167 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=RSE Core
-
-# "description" property - description of the feature
-description=Remote System Explorer (RSE) core including \
-system and subsystem definition, basic service APIs, and \
-user documentation.
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved.\n\
-\n\
-This program and the accompanying materials are made available under the terms\n\
-of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
-available at http://www.eclipse.org/legal/epl-v10.html\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
deleted file mode 100644
index face89400..000000000
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2011 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-<feature
-      id="org.eclipse.rse.core"
-      label="%featureName"
-      version="3.2.3.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.core">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.core"
-         download-size="41"
-         install-size="133"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.doc.user"
-         download-size="159"
-         install-size="193"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.efs"
-         download-size="7"
-         install-size="14"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.efs.ui"
-         download-size="7"
-         install-size="14"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.importexport"
-         download-size="51"
-         install-size="147"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.files.ui"
-         download-size="111"
-         install-size="407"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.processes.ui"
-         download-size="22"
-         install-size="61"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.services"
-         download-size="57"
-         install-size="183"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.shells.ui"
-         download-size="40"
-         install-size="135"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.files.core"
-         download-size="32"
-         install-size="98"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.processes.core"
-         download-size="7"
-         install-size="21"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.processes.shell.linux"
-         download-size="8"
-         install-size="22"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.shells.core"
-         download-size="16"
-         install-size="56"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.ui"
-         download-size="548"
-         install-size="1677"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.core-feature/license.html b/rse/features/org.eclipse.rse.core-feature/license.html
deleted file mode 100644
index f5a16251a..000000000
--- a/rse/features/org.eclipse.rse.core-feature/license.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-(&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-	
-<ul>
-	<li>The top-level (root) directory</li>
-
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-	
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 7f31de052..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=RSE Core Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "description" property - description of the feature
-description=Remote System Explorer (RSE) core including \
-system and subsystem definition, \
-basic service APIs, and \
-user documentation.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved.\n\
-\n\
-This program and the accompanying materials are made available under the terms\n\
-of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
-available at http://www.eclipse.org/legal/epl-v10.html\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index e7b57cfff..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fbbb9f83d..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 8e3efa7b0..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=RSE Core Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation and others 2000, 2011.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 368ee86fb..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-#     Martin Oberhuber (Wind River) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/dsdp32.png b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/dsdp32.png
deleted file mode 100644
index 3077b1220..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/dsdp32.png
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 1ef61415d..000000000
--- a/rse/features/org.eclipse.rse.core-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=RSE Core Source
-providerName=Eclipse TM Project
diff --git a/rse/features/org.eclipse.rse.dstore-feature/.project b/rse/features/org.eclipse.rse.dstore-feature/.project
deleted file mode 100644
index 06a332465..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.dstore-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/build.properties b/rse/features/org.eclipse.rse.dstore-feature/build.properties
deleted file mode 100644
index 92101e808..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/rse/features/org.eclipse.rse.dstore-feature/epl-v10.html b/rse/features/org.eclipse.rse.dstore-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/feature.properties
deleted file mode 100644
index a40e7063f..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.properties
+++ /dev/null
@@ -1,165 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=RSE DStore Services
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "description" property - description of the feature
-description=RSE DStore is an extensible tooling communication layer.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved.\n\
-\n\
-This program and the accompanying materials are made available under the terms\n\
-of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
-available at http://www.eclipse.org/legal/epl-v10.html\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
deleted file mode 100644
index 978430ac1..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2006, 2011 IBM Corporation and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-    
-    Initial Contributors:
-    The following IBM employees contributed to the Remote System Explorer
-    component that contains this file: David McKnight, Kushal Munir,
-    Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
-    Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-    
-    Contributors:
-    IBM Corporation - initial API and implementation
-    Martin Oberhuber (Wind River) - [189269] add version range specifiers
- -->
-<feature
-      id="org.eclipse.rse.dstore"
-      label="%featureName"
-      version="3.2.3.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.services.dstore">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.services" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.processes.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.dstore.core"
-         download-size="52"
-         install-size="154"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.dstore.extra"
-         download-size="4"
-         install-size="13"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.connectorservice.dstore"
-         download-size="16"
-         install-size="40"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.services.dstore"
-         download-size="59"
-         install-size="156"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.files.dstore"
-         download-size="14"
-         install-size="42"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.processes.dstore"
-         download-size="5"
-         install-size="10"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.shells.dstore"
-         download-size="5"
-         install-size="10"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.dstore.security"
-         download-size="20"
-         install-size="56"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/license.html b/rse/features/org.eclipse.rse.dstore-feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 08a2a7d49..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,167 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=RSE DStore Services Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "description" property - description of the feature
-description=RSE DStore is an extensible tooling communication layer.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2011 IBM Corporation and others. All rights reserved.\n\
-\n\
-This program and the accompanying materials are made available under the terms\n\
-of the Eclipse Public License v1.0 which accompanies this distribution, and is\n\
-available at http://www.eclipse.org/legal/epl-v10.html\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index e7b57cfff..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fbbb9f83d..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index dc8194e8e..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=RSE DStore Services Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation and others 2000, 2011.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 368ee86fb..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-#     Martin Oberhuber (Wind River) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/dsdp32.png b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/dsdp32.png
deleted file mode 100644
index 3077b1220..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/dsdp32.png
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 14efda547..000000000
--- a/rse/features/org.eclipse.rse.dstore-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=RSE DStore Services Source
-providerName=Eclipse TM Project
diff --git a/rse/features/org.eclipse.rse.local-feature/.project b/rse/features/org.eclipse.rse.local-feature/.project
deleted file mode 100644
index ff8964653..000000000
--- a/rse/features/org.eclipse.rse.local-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.local-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse.local-feature/build.properties b/rse/features/org.eclipse.rse.local-feature/build.properties
deleted file mode 100644
index 8ed560ec8..000000000
--- a/rse/features/org.eclipse.rse.local-feature/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html
diff --git a/rse/features/org.eclipse.rse.local-feature/epl-v10.html b/rse/features/org.eclipse.rse.local-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.local-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.properties b/rse/features/org.eclipse.rse.local-feature/feature.properties
deleted file mode 100644
index 6e395245a..000000000
--- a/rse/features/org.eclipse.rse.local-feature/feature.properties
+++ /dev/null
@@ -1,167 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=RSE Local Services
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "description" property - description of the feature
-description=Remote System Explorer (RSE) Local Services provides an \
-implementation of the basic services defined by the RSE API that \
-accesses local resources.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2011 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
deleted file mode 100644
index eea1ee8cb..000000000
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2011 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-<feature
-      id="org.eclipse.rse.local"
-      label="%featureName"
-      version="2.1.203.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.services.local">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.rse.services" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.processes.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.subsystems.shells.core" version="3.0.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.services.local"
-         download-size="21"
-         install-size="45"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.files.local"
-         download-size="7"
-         install-size="17"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.processes.local"
-         download-size="5"
-         install-size="10"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.shells.local"
-         download-size="5"
-         install-size="10"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.connectorservice.local"
-         download-size="3"
-         install-size="8"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.local-feature/license.html b/rse/features/org.eclipse.rse.local-feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/rse/features/org.eclipse.rse.local-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 0b580b95c..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,169 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=RSE Local Services Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "description" property - description of the feature
-description=Remote System Explorer (RSE) Local Services provides an \
-implementation of the basic services defined by the RSE API that \
-accesses local resources.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2011 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index e7b57cfff..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fbbb9f83d..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index ff689e4a6..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=RSE Local Services Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation and others 2000, 2011.  All rights reserved.\n\
-Visit http://www.eclipse.org/tm
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 368ee86fb..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-#     Martin Oberhuber (Wind River) - Use eclipse32.png feature image
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/dsdp32.png b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/dsdp32.png
deleted file mode 100644
index 3077b1220..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/dsdp32.png
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 508065406..000000000
--- a/rse/features/org.eclipse.rse.local-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=RSE Local Services Source
-providerName=Eclipse TM Project
diff --git a/rse/features/org.eclipse.rse.sdk-feature/.project b/rse/features/org.eclipse.rse.sdk-feature/.project
deleted file mode 100644
index 18a5f73e2..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.sdk-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse.sdk-feature/build.properties b/rse/features/org.eclipse.rse.sdk-feature/build.properties
deleted file mode 100644
index 4e25b4191..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core,exclude@org.eclipse.rse.doc.user
-generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
-generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
-generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
-generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
-generate.feature@org.eclipse.rse.telnet.source=org.eclipse.rse.telnet
-generate.feature@org.eclipse.rse.terminals.source=org.eclipse.rse.terminals
diff --git a/rse/features/org.eclipse.rse.sdk-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse.sdk-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html b/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.properties b/rse/features/org.eclipse.rse.sdk-feature/feature.properties
deleted file mode 100644
index ef06962d5..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.properties
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=Remote System Explorer Extender SDK
-
-# "description" property - description of the feature
-description=Install this if you plan to develop applications or tools \
-based on RSE. This SDK contains runtimes, documentation and sources \
-for the core RSE frameworks, SSH, FTP or dstore protocols. 
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2011 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-This product includes software developed by the\n\
-Apache Software Foundation http://www.apache.org/
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
deleted file mode 100644
index 65f50d89d..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2011 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-<feature
-      id="org.eclipse.rse.sdk"
-      label="%featureName"
-      version="3.2.3.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-   </url>
-
-   <includes
-         id="org.eclipse.rse"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.core.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.dstore.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.ftp.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.local.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.ssh.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.telnet.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.rse.terminals.source"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.rse.sdk"
-         download-size="7"
-         install-size="8"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.doc.isv"
-         download-size="6630"
-         install-size="11610"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.dstore.doc.isv"
-         download-size="339"
-         install-size="684"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.sdk-feature/license.html b/rse/features/org.eclipse.rse.sdk-feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/rse/features/org.eclipse.rse.sdk-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/.project b/rse/features/org.eclipse.rse.terminals-feature/.project
deleted file mode 100644
index 568aec99d..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.terminals-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/build.properties b/rse/features/org.eclipse.rse.terminals-feature/build.properties
deleted file mode 100644
index 45ee56b37..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
-             
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/eclipse_update_120.jpg b/rse/features/org.eclipse.rse.terminals-feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.terminals-feature/epl-v10.html b/rse/features/org.eclipse.rse.terminals-feature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/feature.properties
deleted file mode 100644
index 4a6c6e943..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.properties
+++ /dev/null
@@ -1,165 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# "featureName" property - name of the feature
-featureName=RSE Terminals UI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "description" property - description of the feature
-description=A Terminal View Integration for RSE Shell and Terminal Services. Includes Source.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2002, 2011 MontaVista Software, Inc. and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
deleted file mode 100644
index 2eb10091e..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-     Copyright (c) 2005, 2011 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-<feature
-      id="org.eclipse.rse.terminals"
-      label="%featureName"
-      version="1.0.103.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.rse.terminals.ui"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.2"/>
-   </url>
-
-   <includes
-         id="org.eclipse.tm.terminal"
-         version="0.0.0"
-         search-location="self"/>
-
-   <requires>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.rse.services" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.services.ssh" version="3.0.0" match="equivalent"/>
-      <import plugin="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.ui" version="3.1.0" match="compatible"/>
-      <import plugin="org.eclipse.rse.connectorservice.ssh" version="2.1.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.terminals.core"
-         download-size="7"
-         install-size="15"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.subsystems.terminals.ssh"
-         download-size="7"
-         install-size="11"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.rse.terminals.ui"
-         download-size="24"
-         install-size="51"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/license.html b/rse/features/org.eclipse.rse.terminals-feature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/epl-v10.html b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 9321f4082..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,256 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Eclipse Public License - Version 1.0</title>
-
-<style type="text/css">
-  body {
-    size: 8.5in 11.0in;
-    margin: 0.25in 0.5in 0.25in 0.5in;
-    tab-interval: 0.5in;
-    }
-  p {  	
-    margin-left: auto;
-    margin-top:  0.5em;
-    margin-bottom: 0.5em;
-    }
-  p.list {
-  	margin-left: 0.5in;
-    margin-top:  0.05em;
-    margin-bottom: 0.05em;
-    }
-  </style></head><body lang="EN-US">
-
-<p align="center"><b>Eclipse Public License - v 1.0</b></p>
-
-<p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR
-DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS
-AGREEMENT.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">where such changes and/or additions to the Program
-originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the
-Program by such Contributor itself or anyone acting on such
-Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii)
-are not derivative works of the Program.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"Licensed Patents" mean patent claims licensable by a
-Contributor which are necessarily infringed by the use or sale of its
-Contribution alone or when combined with the Program.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works
-of, publicly display, publicly perform, distribute and sublicense the
-Contribution of such Contributor, if any, and such derivative works, in
-source code and object code form.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell,
-offer to sell, import and otherwise transfer the Contribution of such
-Contributor, if any, in source code and object code form. This patent
-license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor,
-such addition of the Contribution causes such combination to be covered
-by the Licensed Patents. The patent license shall not apply to any other
-combinations which include the Contribution. No hardware per se is
-licensed hereunder.</p>
-
-<p class="list">c) Recipient understands that although each Contributor
-grants the licenses to its Contributions set forth herein, no assurances
-are provided by any Contributor that the Program does not infringe the
-patent or other intellectual property rights of any other entity. Each
-Contributor disclaims any liability to Recipient for claims brought by
-any other entity based on infringement of intellectual property rights
-or otherwise. As a condition to exercising the rights and licenses
-granted hereunder, each Recipient hereby assumes sole responsibility to
-secure any other intellectual property rights needed, if any. For
-example, if a third party patent license is required to allow Recipient
-to distribute the Program, it is Recipient's responsibility to acquire
-that license before distributing the Program.</p>
-
-<p class="list">d) Each Contributor represents that to its knowledge it
-has sufficient copyright rights in its Contribution, if any, to grant
-the copyright license set forth in this Agreement.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">i) effectively disclaims on behalf of all Contributors
-all warranties and conditions, express and implied, including warranties
-or conditions of title and non-infringement, and implied warranties or
-conditions of merchantability and fitness for a particular purpose;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">iv) states that source code for the Program is available
-from such Contributor, and informs licensees how to obtain it in a
-reasonable manner on or through a medium customarily used for software
-exchange.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>Each Contributor must identify itself as the originator of its
-Contribution, if any, in a manner that reasonably allows subsequent
-Recipients to identify the originator of the Contribution.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>Commercial distributors of software may accept certain
-responsibilities with respect to end users, business partners and the
-like. While this license is intended to facilitate the commercial use of
-the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create
-potential liability for other Contributors. Therefore, if a Contributor
-includes the Program in a commercial product offering, such Contributor
-("Commercial Contributor") hereby agrees to defend and
-indemnify every other Contributor ("Indemnified Contributor")
-against any losses, damages and costs (collectively "Losses")
-arising from claims, lawsuits and other legal actions brought by a third
-party against the Indemnified Contributor to the extent caused by the
-acts or omissions of such Commercial Contributor in connection with its
-distribution of the Program in a commercial product offering. The
-obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In
-order to qualify, an Indemnified Contributor must: a) promptly notify
-the Commercial Contributor in writing of such claim, and b) allow the
-Commercial Contributor to control, and cooperate with the Commercial
-Contributor in, the defense and any related settlement negotiations. The
-Indemnified Contributor may participate in any such claim at its own
-expense.</p>
-
-<p>For example, a Contributor might include the Program in a commercial
-product offering, Product X. That Contributor is then a Commercial
-Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance
-claims and warranties are such Commercial Contributor's responsibility
-alone. Under this section, the Commercial Contributor would have to
-defend claims against the other Contributors related to those
-performance claims and warranties, and if a court requires any other
-Contributor to pay any damages as a result, the Commercial Contributor
-must pay those damages.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS
-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION,
-ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY
-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to
-the risks and costs of program errors, compliance with applicable laws,
-damage to or loss of data, programs or equipment, and unavailability or
-interruption of operations.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT
-NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR
-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED
-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this Agreement, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.</p>
-
-<p>If Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other
-software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the
-date such litigation is filed.</p>
-
-<p>All Recipient's rights under this Agreement shall terminate if it
-fails to comply with any of the material terms or conditions of this
-Agreement and does not cure such failure in a reasonable period of time
-after becoming aware of such noncompliance. If all Recipient's rights
-under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive.</p>
-
-<p>Everyone is permitted to copy and distribute copies of this
-Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The
-Agreement Steward reserves the right to publish new versions (including
-revisions) of this Agreement from time to time. No one other than the
-Agreement Steward has the right to modify this Agreement. The Eclipse
-Foundation is the initial Agreement Steward. The Eclipse Foundation may
-assign the responsibility to serve as the Agreement Steward to a
-suitable separate entity. Each new version of the Agreement will be
-given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version
-of the Agreement is published, Contributor may elect to distribute the
-Program (including its Contributions) under the new version. Except as
-expressly stated in Sections 2(a) and 2(b) above, Recipient receives no
-rights or licenses to the intellectual property of any Contributor under
-this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this
-Agreement are reserved.</p>
-
-<p>This Agreement is governed by the laws of the State of New York and
-the intellectual property laws of the United States of America. No party
-to this Agreement will bring a legal action under this Agreement more
-than one year after the cause of action arose. Each party waives its
-rights to a jury trial in any resulting litigation.</p>
-
-</body></html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 78a54be3e..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,171 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=RSE Terminals UI Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse TM Project
-
-# "tmUpdateSiteName" property - label for the update site
-tmUpdateSiteName=Target Management 3.2 Updates
-
-# "description" property - description of the feature
-description=A Terminal View Integration for RSE Shell and Terminal Services.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2002, 2011 MontaVista Software, Inc. and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/license.html b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca36a..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index aa029c699..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>March 27, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fbbb9f83d..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.mappings b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
-\ No newline at end of file
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index f66fc07d7..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2011 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=RSE Terminals UI Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright MontaVista Software, Inc. and others 2002, 2011.  All rights reserved.\n\
-Visit http://www.eclipse.org/tm
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 377be2b46..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Martin Oberhuber (Wind River) - initial API and implementation
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, dsdp32.png, plugin.properties, plugin.xml, src/, META-INF/
-sourcePlugin = true
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/dsdp32.png b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/dsdp32.png
deleted file mode 100644
index 3077b1220..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/dsdp32.png
+++ /dev/null
diff --git a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties b/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 69c3e8c52..000000000
--- a/rse/features/org.eclipse.rse.terminals-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0 
-# which accompanies this distribution, and is available at 
-# http://www.eclipse.org/legal/epl-v10.html 
-# 
-# Contributors: 
-# Martin Oberhuber - initial API and implementation 
-################################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName=RSE Terminals UI Source
-providerName=Eclipse TM Project
diff --git a/rse/features/readme.txt b/rse/features/readme.txt
deleted file mode 100644
index b1491292b..000000000
--- a/rse/features/readme.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Use the "features" folder for feature projects.
-All projects should be named "org.eclipse.rse.**-feature".
diff --git a/rse/plugins/org.eclipse.dstore.core/.classpath b/rse/plugins/org.eclipse.dstore.core/.classpath
deleted file mode 100644
index 045b0fcb3..000000000
--- a/rse/plugins/org.eclipse.dstore.core/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/dstore/**"/>
-			<accessrule kind="discouraged" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rse/plugins/org.eclipse.dstore.core/.cvsignore b/rse/plugins/org.eclipse.dstore.core/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/plugins/org.eclipse.dstore.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/plugins/org.eclipse.dstore.core/.project b/rse/plugins/org.eclipse.dstore.core/.project
deleted file mode 100644
index 5c7cd5c8a..000000000
--- a/rse/plugins/org.eclipse.dstore.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.dstore.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/plugins/org.eclipse.dstore.core/.settings/.api_filters b/rse/plugins/org.eclipse.dstore.core/.settings/.api_filters
deleted file mode 100644
index bd3a94ef7..000000000
--- a/rse/plugins/org.eclipse.dstore.core/.settings/.api_filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.dstore.core" version="2">
-    <resource path="src/org/eclipse/dstore/core/server/IServerLogger.java" type="org.eclipse.dstore.core.server.IServerLogger">
-        <filter id="403853384">
-            <message_arguments>
-                <message_argument value="org.eclipse.dstore.core.server.IServerLogger"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/dstore/core/server/ServerLogger.java" type="org.eclipse.dstore.core.server.ServerLogger">
-        <filter id="388055101">
-            <message_arguments>
-                <message_argument value="org.eclipse.dstore.core.server.ServerLogger"/>
-                <message_argument value="DEBUG"/>
-            </message_arguments>
-        </filter>
-        <filter id="389242988">
-            <message_arguments>
-                <message_argument value="org.eclipse.dstore.core.server.ServerLogger"/>
-                <message_argument value="DEBUG"/>
-                <message_argument value="0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/rse/plugins/org.eclipse.dstore.core/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.dstore.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 381fc6eb0..000000000
--- a/rse/plugins/org.eclipse.dstore.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
deleted file mode 100644
index f08b4fee7..000000000
--- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.dstore.core
-Bundle-Version: 3.2.4.qualifier
-Bundle-Activator: org.eclipse.dstore.core.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.dstore.extra;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.ui.views
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.dstore.core,
- org.eclipse.dstore.core.client,
- org.eclipse.dstore.core.java,
- org.eclipse.dstore.core.miners,
- org.eclipse.dstore.core.model,
- org.eclipse.dstore.core.server,
- org.eclipse.dstore.core.util,
- org.eclipse.dstore.core.util.ssl,
- org.eclipse.dstore.internal.core.client;x-internal:=true,
- org.eclipse.dstore.internal.core.model;x-internal:=true,
- org.eclipse.dstore.internal.core.server;x-internal:=true,
- org.eclipse.dstore.internal.core.util;x-internal:=true,
- org.eclipse.dstore.internal.core.util.ssl;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.dstore.core/about.html b/rse/plugins/org.eclipse.dstore.core/about.html
deleted file mode 100644
index d4cc693f9..000000000
--- a/rse/plugins/org.eclipse.dstore.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/build.properties b/rse/plugins/org.eclipse.dstore.core/build.properties
deleted file mode 100644
index 501100bf1..000000000
--- a/rse/plugins/org.eclipse.dstore.core/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = .,\
-               dstore_core.jar,\
-               plugin.properties,\
-               about.html,\
-               META-INF/
-source.. = src/
-output.. = bin/
-source.dstore_core.jar = src/
-output.dstore_core.jar = dstore_core.bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.dstore.core/export.jardesc b/rse/plugins/org.eclipse.dstore.core/export.jardesc
deleted file mode 100644
index 6eebacfac..000000000
--- a/rse/plugins/org.eclipse.dstore.core/export.jardesc
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jardesc>
-    <jar path="D:/servers/800/dstore_core.jar"/>
-    <options buildIfNeeded="true" compress="true" descriptionLocation="/org.eclipse.dstore.core/export.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
-    <refactoring deprecationInfo="true" structuralOnly="true"/>
-    <selectedProjects>
-        <project name="org.eclipse.dstore.core"/>
-    </selectedProjects>
-    <manifest generateManifest="true" manifestLocation="" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
-        <sealing sealJar="false">
-            <packagesToSeal/>
-            <packagesToUnSeal/>
-        </sealing>
-    </manifest>
-    <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
-        <javaElement handleIdentifier="=org.eclipse.dstore.core/src"/>
-    </selectedElements>
-</jardesc>
diff --git a/rse/plugins/org.eclipse.dstore.core/plugin.properties b/rse/plugins/org.eclipse.dstore.core/plugin.properties
deleted file mode 100644
index 702f8526b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE DStore Core
-providerName = Eclipse TM Project
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/Activator.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/Activator.java
deleted file mode 100644
index df9339903..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/Activator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.dstore.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class Activator extends Plugin {
-
-	//The shared instance.
-	private static Activator plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
deleted file mode 100644
index d80abec63..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
+++ /dev/null
@@ -1,929 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight  (IBM) - [205986] daemon handshake needs a timeout
- * David McKnight  (IBM) - [218685] [dstore] Unable to connect when using SSL.
- * Martin Oberhuber (Wind River) - [219260][dstore][regression] Cannot connect to dstore daemon
- * David McKnight  (IBM)   [220123][dstore] Configurable timeout on irresponsiveness
- * David McKnight   (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) [235284] Cancel password change causes problem
- * David McKnight   (IBM) - [257321] [dstore] "Error binding socket" should include port of the failed socket
- *******************************************************************************/
-
-package org.eclipse.dstore.core.client;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.InterruptedIOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.eclipse.dstore.core.model.CommandHandler;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreAttributes;
-import org.eclipse.dstore.core.model.IDataStoreCompatibilityHandler;
-import org.eclipse.dstore.core.model.IDataStoreConstants;
-import org.eclipse.dstore.core.model.IExternalLoader;
-import org.eclipse.dstore.core.model.ISSLProperties;
-import org.eclipse.dstore.core.server.ServerLauncher;
-import org.eclipse.dstore.core.util.ssl.IDataStoreTrustManager;
-import org.eclipse.dstore.extra.IDomainNotifier;
-import org.eclipse.dstore.internal.core.client.ClientAttributes;
-import org.eclipse.dstore.internal.core.client.ClientCommandHandler;
-import org.eclipse.dstore.internal.core.client.ClientReceiver;
-import org.eclipse.dstore.internal.core.client.ClientUpdateHandler;
-import org.eclipse.dstore.internal.core.server.ServerCommandHandler;
-import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
-import org.eclipse.dstore.internal.core.util.ExternalLoader;
-import org.eclipse.dstore.internal.core.util.Sender;
-import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext;
-import org.eclipse.dstore.internal.core.util.ssl.DataStoreTrustManager;
-import org.eclipse.dstore.internal.extra.DomainNotifier;
-
-
-
-/**
- * ClientConnection provides the standard means of creating a new connection to
- * a DataStore.
- *
- * <li>
- * If a connection is local, then a DataStore is instantiated
- * in the same process to be used by the client to communicate with miners (tools).
- * </li>
- *
- * <li>
- * If a connection is not local, then a virtual DataStore is instantiated in the
- * current process to communicate with the remote DataStore.  If the client wishes
- * to instantiate a remote DataStore through a daemon, then ClientConnection first connects
- * to the daemon requesting a DataStore at a given port, and then connects to the
- * newly launched DataStore.  Otherwise, a DataStore is expected to be running on
- * the remote machine under the same port that the client tries to connect to.
- * </li>
- *
- * @noextend This class is not intended to be subclassed by clients.
- *
- */
-public class ClientConnection
-{
-	private ClientAttributes _clientAttributes;
-
-	private Socket _theSocket;
-	private boolean _isConnected = false;
-	private boolean _isRemote = false;
-	private DataStore _dataStore;
-	private IDomainNotifier _domainNotifier;
-	private Sender _sender;
-	private ClientReceiver _receiver;
-	private ClientUpdateHandler _updateHandler;
-	private CommandHandler _commandHandler;
-
-	private int _clientVersion;
-	private int _clientMinor;
-
-
-	private String _name;
-	private String _host;
-	private String _port;
-	private String _hostDirectory;
-	private Socket _launchSocket;
-
-	private DataStoreTrustManager _trustManager;
-
-	private ArrayList _loaders;
-
-	// changed these to final since they are constants (that don't change)
-	public final static String INCOMPATIBLE_SERVER_UPDATE = "Incompatible DataStore."; //$NON-NLS-1$
-	public final static String INCOMPATIBLE_CLIENT_UPDATE = "Incompatible DataStore."; //$NON-NLS-1$
-	public final static String SERVER_OLDER = "Older DataStore Server."; //$NON-NLS-1$
-	public final static String CLIENT_OLDER = "Older DataStore Client."; //$NON-NLS-1$
-	public final static String INCOMPATIBLE_PROTOCOL = "Incompatible Protocol."; //$NON-NLS-1$
-	public final static String CANNOT_CONNECT = "Cannot connect to server."; //$NON-NLS-1$
-
-	// TODO: should probably make this a public constant in 3.1
-	private final static String INVALID_DAEMON_PORT_NUMBER = "Invalid daemon port number."; //$NON-NLS-1$
-
-	/**
-	 * Creates a new ClientConnection instance
-	 *
-	 * @param name an identifier for this connection
-	 */
-	public ClientConnection(String name)
-	{
-		_domainNotifier = new DomainNotifier();
-		_name = name;
-		init();
-	}
-
-	/**
-	 * Creates a new ClientConnection instance
-	 *
-	 * @param name an identifier for this connection
-	 * @param initialSize the number of elements to preallocate in the DataStore
-	 */
-	public ClientConnection(String name, int initialSize)
-	{
-		_domainNotifier = new DomainNotifier();
-		_name = name;
-		init(initialSize);
-	}
-
-	/**
-	 * Creates a new ClientConnection instance
-	 *
-	 * @param name an identifier for this connection
-	 * @param notifier the notifier used to keep the user interface in synch
-	 *            with the DataStore
-	 * @since 3.0 changed DomainNotifier into IDomainNotifier
-	 */
-	public ClientConnection(String name, IDomainNotifier notifier)
-	{
-		_domainNotifier = notifier;
-		_name = name;
-		init();
-	}
-
-	/**
-	 * Creates a new ClientConnection instance
-	 *
-	 * @param name an identifier for this connection
-	 * @param notifier the notifier used to keep the user interface in synch
-	 *            with the DataStore
-	 * @param initialSize the number of elements to preallocate in the DataStore
-	 * @since 3.0 changed DomainNotifier into IDomainNotifier
-	 */
-	public ClientConnection(String name, IDomainNotifier notifier, int initialSize)
-	{
-		_domainNotifier = notifier;
-		_name = name;
-		init(initialSize);
-	}
-
-
-	public int getClientVersion()
-	{
-		return _clientVersion;
-	}
-
-	public int getClientMinor()
-	{
-		return _clientMinor;
-	}
-
-	public int getServerVersion()
-	{
-		return _dataStore.getServerVersion();
-	}
-
-	public int getServerMinor()
-	{
-		return _dataStore.getServerMinor();
-	}
-
-	public void setSSLProperties(ISSLProperties properties)
-	{
-		_dataStore.setSSLProperties(properties);
-	}
-
-	/**
-	 * @since 3.0 changed DataStoreCompatibilityHandler into
-	 *        IDataStoreCompatibilityHandler
-	 */
-	public void setCompatibilityHandler(IDataStoreCompatibilityHandler handler){
-		_dataStore.setCompatibilityHandler(handler);
-	}
-
-	/**
-	 * @since 3.0 changed DataStoreCompatibilityHandler into
-	 *        IDataStoreCompatibilityHandler
-	 */
-	public IDataStoreCompatibilityHandler getCompatibilityHandler(){
-		return _dataStore.getCompatibilityHandler();
-	}
-
-	/**
-	 * Specifies the loaders used to instantiate the miners
-	 *
-	 * @param loaders the loaders
-	 */
-	public void setLoaders(ArrayList loaders)
-	{
-		_loaders = loaders;
-	}
-
-	/**
-	 * Adds a loader to be used to instantiate the miners
-	 *
-	 * @param loader the loader
-	 * @since 3.0 changed ExternalLoader into IExternalLoader
-	 */
-	public void addLoader(IExternalLoader loader)
-	{
-		if (_loaders == null)
-		{
-			_loaders = new ArrayList();
-		}
-		_loaders.add(loader);
-	}
-
-	/**
-	 * Specifies the hostname or IP of the host to connect to
-	 *
-	 * @param host the hostname or IP of the machine to connect to
-	 */
-	public void setHost(String host)
-	{
-		_host = host;
-		_clientAttributes.setAttribute(DataStoreAttributes.A_HOST_NAME, _host);
-	}
-
-	/**
-	 * Specifies the number of the socket port to connect to
-	 *
-	 * @param port the number of the socket port to connect to
-	 */
-	public void setPort(String port)
-	{
-		if (port == null || port.length() == 0)
-		{
-			port = "0"; //$NON-NLS-1$
-		}
-
-		_port = port;
-		_clientAttributes.setAttribute(DataStoreAttributes.A_HOST_PORT, _port);
-	}
-
-	/**
-	 * Specifies the default working directory on the remote machine
-	 *
-	 * @param directory the remote working directory
-	 */
-	public void setHostDirectory(String directory)
-	{
-		_hostDirectory = directory;
-		_clientAttributes.setAttribute(DataStoreAttributes.A_HOST_PATH, _hostDirectory);
-	}
-
-	/**
-	 * Returns the hostname/IP of the host to connect to
-	 *
-	 * @return the hostname/IP
-	 */
-	public String getHost()
-	{
-		return _host;
-	}
-
-	/**
-	 * Returns the number of the socket port to connect to
-	 *
-	 * @return the number of the socket port to connect to
-	 */
-	public String getPort()
-	{
-		return _port;
-	}
-
-	/**
-	 * Returns the default working directory on the host machine
-	 *
-	 * @return the working directory on the host
-	 */
-	public String getHostDirectory()
-	{
-		return _hostDirectory;
-	}
-
-	/**
-	 * Indicates whether the client is connected to the DataStore
-	 *
-	 * @return whether the client is connected
-	 */
-	public boolean isConnected()
-	{
-		if (_isConnected)
-		{
-			return _dataStore.isConnected();
-		}
-
-		return _isConnected;
-	}
-
-	/**
-	 * Disconnects from the DataStore and cleans up DataStore meta-information
-	 */
-	public void disconnect()
-	{
-		if (_isConnected)
-		{
-			_dataStore.removeDataStorePreferenceListener(_receiver);
-			_dataStore.setConnected(false);
-
-			if (_isRemote)
-			{
-				_commandHandler.command(
-						_dataStore.find(_dataStore.getRoot(), DE.A_NAME, "Exit"), //$NON-NLS-1$
-						_dataStore.getHostRoot(),
-						false);
-				_receiver.finish();
-			}
-
-			_commandHandler.finish();
-
-
-			try
-			{
-				Thread.sleep(200);
-			}
-			catch (InterruptedException e)
-			{
-				System.out.println(e);
-			}
-
-			_updateHandler.finish();
-			_dataStore.finish();
-
-			_isConnected = false;
-		}
-	}
-
-	/**
-	 * Creates and connects to a local DataStore to work with in the current process.
-	 *
-	 * @return the status of the DataStore connection
-	 */
-	public ConnectionStatus localConnect()
-	{
-		_updateHandler = new ClientUpdateHandler();
-		_updateHandler.start();
-
-		if (_loaders == null)
-		{
-			_loaders = new ArrayList();
-			_loaders.add(new ExternalLoader(getClass().getClassLoader(), "*")); //$NON-NLS-1$
-		}
-
-		_commandHandler = new ServerCommandHandler(_loaders);
-		_commandHandler.start();
-
-		_dataStore.setCommandHandler(_commandHandler);
-		_dataStore.setUpdateHandler(_updateHandler);
-		_dataStore.setConnected(true);
-		_dataStore.setLoaders(_loaders);
-		_dataStore.getDomainNotifier().enable(true);
-
-		_commandHandler.setDataStore(_dataStore);
-		_updateHandler.setDataStore(_dataStore);
-		((ServerCommandHandler) _commandHandler).loadMiners();
-
-		_clientAttributes.setAttribute(
-				DataStoreAttributes.A_LOCAL_NAME,
-				_clientAttributes.getAttribute(DataStoreAttributes.A_HOST_NAME));
-		_clientAttributes.setAttribute(
-				DataStoreAttributes.A_LOCAL_PATH,
-				_clientAttributes.getAttribute(DataStoreAttributes.A_HOST_PATH));
-
-		_isConnected = true;
-
-		DataElement ticket = _dataStore.getTicket();
-		ticket.setAttribute(DE.A_NAME, "null"); //$NON-NLS-1$
-
-		ConnectionStatus result = new ConnectionStatus(_isConnected);
-		result.setTicket(ticket.getName());
-
-		return result;
-	}
-
-	/**
-	 * Connects to a remote DataStore by first communicating with a remote daemon and then
-	 * connecting to the DataStore.
-	 *
-	 * @param launchServer an indication of whether to launch a DataStore on the daemon on not
-	 * @param user the user ID of the current user on the remote machine
-	 * @param password the password of the current user on the remote machine
-	 * @return the status of the connection
-	 */
-	public ConnectionStatus connect(boolean launchServer, String user, String password)
-	{
-		ConnectionStatus launchStatus = null;
-		if (launchServer)
-		{
-			launchStatus = launchServer(user, password);
-			if (!launchStatus.isConnected())
-			{
-				return launchStatus;
-			}
-		}
-		else
-		{
-			launchStatus = new ConnectionStatus(true);
-			launchStatus.setTicket("null"); //$NON-NLS-1$
-		}
-
-		return connect(launchStatus.getTicket());
-	}
-
-	/**
-	 * @since 3.0 changed DataStoreTrustManager into IDataStoreTrustManager
-	 */
-	public IDataStoreTrustManager getTrustManager()
-	{
-		if (_trustManager == null)
-		{
-			_trustManager = new DataStoreTrustManager();
-		}
-		return _trustManager;
-	}
-
-	/**
-	 * Connects to a remote DataStore.
-	 * A socket is created and the virtual DataStore is initialized with an update handler, command handler,
-	 * socket sender and socket receiver.
-	 *
-	 * @param ticket the ticket required to be granted access to the remote DataStore
-	 * @return the status of the connection
-	 */
-	public ConnectionStatus connect(String ticket)
-	{
-		return connect(ticket, 0);
-	}
-
-	public ConnectionStatus connect(String ticket, int timeout)
-	{
-		boolean doTimeOut = (timeout > 0);
-		ConnectionStatus result = null;
-		try
-		{
-			int port = 0;
-			if (_port != null && _port.length() > 0)
-			{
-				port = Integer.parseInt(_port);
-			}
-
-			if (!_dataStore.usingSSL())
-			{
-				_theSocket = new Socket(_host, port);
-				if (doTimeOut && (_theSocket != null))
-					_theSocket.setSoTimeout(timeout);
-			}
-			else
-			{
-				String location = _dataStore.getKeyStoreLocation();
-				String pw = _dataStore.getKeyStorePassword();
-				IDataStoreTrustManager mgr = getTrustManager();
-				SSLContext context = DStoreSSLContext.getClientSSLContext(location, pw, mgr);
-				SSLSocketFactory factory = context.getSocketFactory();
-
-				_theSocket = factory.createSocket(_host, port);
-				if (doTimeOut && (_theSocket != null))
-					_theSocket.setSoTimeout(timeout);
-				try
-				{
-
-					((SSLSocket) _theSocket).startHandshake();
-					((SSLSocket) _theSocket).getSession();
-
-				}
-				catch (SSLHandshakeException e)
-				{
-					result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts());
-					return result;
-				}
-				catch (Exception e)
-				{
-					e.printStackTrace();
-					_theSocket.close();
-					result = new ConnectionStatus(false, e);
-					return result;
-				}
-			}
-
-			String msg = null;
-			int handshakeResult = doHandShake();
-			switch (handshakeResult)
-			{
-			case IDataStoreCompatibilityHandler.HANDSHAKE_CORRECT:
-				result = doConnect(ticket);
-				break;
-			case IDataStoreCompatibilityHandler.HANDSHAKE_SERVER_RECENT_NEWER:
-				result = doConnect(ticket);
-				result.setMessage(CLIENT_OLDER);
-				break;
-			case IDataStoreCompatibilityHandler.HANDSHAKE_SERVER_RECENT_OLDER:
-				result = doConnect(ticket);
-				result.setMessage(SERVER_OLDER);
-				break;
-			case IDataStoreCompatibilityHandler.HANDSHAKE_SERVER_NEWER:
-			{
-				msg = INCOMPATIBLE_CLIENT_UPDATE;
-				msg += "\nThe server running on " //$NON-NLS-1$
-					+ _host
-					+ " under port " //$NON-NLS-1$
-					+ _port
-					+ " is a newer DataStore server."; //$NON-NLS-1$
-				break;
-			}
-			case IDataStoreCompatibilityHandler.HANDSHAKE_SERVER_OLDER:
-			{
-				msg = INCOMPATIBLE_SERVER_UPDATE;
-				msg += "\nThe server running on " //$NON-NLS-1$
-					+ _host
-					+ " under port " //$NON-NLS-1$
-					+ _port
-					+ " is an older DataStore server."; //$NON-NLS-1$
-				break;
-			}
-			case IDataStoreCompatibilityHandler.HANDSHAKE_INCORRECT:
-			{
-				msg = CANNOT_CONNECT;
-				msg += INCOMPATIBLE_PROTOCOL;
-				msg += "\nThe server running on " //$NON-NLS-1$
-					+ _host
-					+ " under port " //$NON-NLS-1$
-					+ _port
-					+ " is not a valid DataStore server."; //$NON-NLS-1$
-				break;
-			}
-			case IDataStoreCompatibilityHandler.HANDSHAKE_UNEXPECTED:
-			{
-				msg = CANNOT_CONNECT;
-				msg += "Unexpected exception."; //$NON-NLS-1$
-				break;
-			}
-			case IDataStoreCompatibilityHandler.HANDSHAKE_TIMEOUT:
-			{
-				msg = CANNOT_CONNECT;
-				msg += "Timeout waiting for socket activity."; //$NON-NLS-1$
-				break;
-			}
-			default:
-				break;
-			}
-
-			if (result == null && msg != null)
-			{
-				result = new ConnectionStatus(false, msg);
-				_isConnected = false;
-				_theSocket.close();
-			}
-		}
-		catch (java.net.ConnectException e)
-		{
-			String msg = "Connection Refused."; //$NON-NLS-1$
-			msg += "\nMake sure that the DataStore server is running on " + _host + " under port " + _port + "."; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			result = new ConnectionStatus(false, msg);
-		}
-		catch (UnknownHostException uhe)
-		{
-			_isConnected = false;
-			result = new ConnectionStatus(_isConnected, uhe);
-		}
-		catch (IOException ioe)
-		{
-			_isConnected = false;
-			result = new ConnectionStatus(_isConnected, ioe);
-		}
-		return result;
-	}
-
-	protected ConnectionStatus doConnect(String ticket)
-	{
-		_sender = new Sender(_theSocket, _dataStore);
-		_updateHandler = new ClientUpdateHandler();
-		_updateHandler.start();
-
-		_commandHandler = new ClientCommandHandler(_sender);
-		_commandHandler.start();
-
-		_dataStore.setCommandHandler(_commandHandler);
-		_dataStore.setUpdateHandler(_updateHandler);
-		_dataStore.setConnected(true);
-		_dataStore.getDomainNotifier().enable(true);
-
-		_commandHandler.setDataStore(_dataStore);
-		_updateHandler.setDataStore(_dataStore);
-
-		_receiver = new ClientReceiver(_theSocket, _dataStore);
-		_dataStore.addDataStorePreferenceListener(_receiver);
-		_receiver.start();
-
-		_isConnected = true;
-		_isRemote = true;
-		ConnectionStatus result = new ConnectionStatus(_isConnected);
-		result.setTicket(ticket);
-		return result;
-	}
-
-	/**
-	 * Connects to a remote daemon and tells the daemon to launch
-	 * a DataStore server.
-	 *
-	 * @param user the user ID of the current user on the remote machine
-	 * @param password the password of the current user on the remote machine
-	 * @return the status of the connection
-	 */
-	public ConnectionStatus launchServer(String user, String password)
-	{
-		// default daemon port is 4075
-		return launchServer(user, password, ServerLauncher.DEFAULT_DAEMON_PORT);
-	}
-
-	/**
-	 * Connects to a remote daemon and tells the daemon to launch
-	 * a DataStore server.
-	 *
-	 * @param user the user ID of the current user on the remote machine
-	 * @param password the password of the current user on the remote machine
-	 * @param daemonPort the port of the daemon
-	 * @return the status of the connection
-	 */
-	public ConnectionStatus launchServer(String user, String password, int daemonPort)
-	{
-		return launchServer(user, password, daemonPort, 0);
-	}
-
-	public ConnectionStatus launchServer(String user, String password, int daemonPort, int timeout)
-	{
-		if (timeout<=0) {
-			//bug 219260: default timeout 10 sec if not specified
-			timeout = 10000;
-		}
-		ConnectionStatus result = connectDaemon(daemonPort, timeout);
-		if (!result.isConnected()) {
-			return result;
-		}
-		try
-		{
-			PrintWriter writer = null;
-			BufferedReader reader = null;
-
-			// create output stream for server launcher
-			try
-			{
-				writer = new PrintWriter(new OutputStreamWriter(_launchSocket.getOutputStream(), DE.ENCODING_UTF_8));
-				writer.println(user);
-				writer.println(password);
-				writer.println(_port);
-				writer.flush();
-
-				reader = new BufferedReader(new InputStreamReader(_launchSocket.getInputStream(), DE.ENCODING_UTF_8));
-				String status = null;
-
-				try
-				{
-					status = reader.readLine();
-				}
-				catch (InterruptedIOException e)
-				{
-					result = new ConnectionStatus(false, e);
-				}
-
-
-				if (status != null && !status.equals(IDataStoreConstants.CONNECTED))
-				{
-					result = new ConnectionStatus(false, status);
-				}
-				else if (status == null)
-				{
-					Exception e = new Exception("no status returned"); //$NON-NLS-1$
-					result = new ConnectionStatus(false, e);
-				}
-				else
-				{
-					result = new ConnectionStatus(true);
-
-					_port = reader.readLine();
-					String ticket = reader.readLine();
-					result.setTicket(ticket);
-				}
-			}
-			catch (java.io.IOException e)
-			{
-				e.printStackTrace();
-				result = new ConnectionStatus(false, e);
-			}
-
-			if (reader != null)
-				reader.close();
-
-			if (writer != null)
-				writer.close();
-			_launchSocket.close();
-		}
-		catch (IOException ioe)
-		{
-			System.out.println(ioe);
-			ioe.printStackTrace();
-			result = new ConnectionStatus(false, ioe);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Connect to a remote daemon
-	 *
-	 * @param daemonPort the port of the daemon
-	 * @return the status of the connection
-	 * @since 3.0
-	 */
-	public ConnectionStatus connectDaemon(int daemonPort, int timeout) {
-		ConnectionStatus result = new ConnectionStatus(true);
-		try
-		{
-			_launchSocket = null;
-			if (_dataStore.usingSSL())
-			{
-				try
-				{
-					String location = _dataStore.getKeyStoreLocation();
-					String pw = _dataStore.getKeyStorePassword();
-					IDataStoreTrustManager mgr = getTrustManager();
-					SSLContext context = DStoreSSLContext.getClientSSLContext(location, pw, mgr);
-
-					try
-					{
-						SocketFactory factory = context.getSocketFactory();
-						SSLSocket lSocket = (SSLSocket) factory.createSocket(_host, daemonPort);
-						_launchSocket = lSocket;
-
-						if (timeout > 0) {
-							_launchSocket.setSoTimeout(timeout);
-						}
-						lSocket.startHandshake();
-
-						SSLSession session = lSocket.getSession();
-						if (session == null)
-						{
-							lSocket.close();
-						}
-					}
-					catch (SSLHandshakeException e)
-					{
-						result = new ConnectionStatus(false, e, true, mgr.getUntrustedCerts());
-						return result;
-					}
-					catch (Exception e)
-					{
-						if (_launchSocket != null)
-						{
-							_launchSocket.close();
-						}
-						if (daemonPort <= 0 || daemonPort > 65535) {
-							result = new ConnectionStatus(false, INVALID_DAEMON_PORT_NUMBER);
-						} else {
-							result = new ConnectionStatus(false, e);
-						}
-						return result;
-					}
-				}
-				catch (Exception e)
-				{
-					result = new ConnectionStatus(false, e);
-					return result;
-				}
-			}
-			else
-			{
-				_launchSocket = new Socket(_host, daemonPort);
-				if (timeout > 0) {
-					_launchSocket.setSoTimeout(timeout);
-				}
-			}
-		}
-		catch (java.net.ConnectException e)
-		{
-			String msg = "Connection Refused."; //$NON-NLS-1$
-			msg += "\nMake sure that the DataStore daemon is running on " + _host + "."; //$NON-NLS-1$ //$NON-NLS-2$
-			result = new ConnectionStatus(false, msg);
-		}
-		catch (UnknownHostException uhe)
-		{
-			result = new ConnectionStatus(false, uhe);
-		}
-		catch (IllegalArgumentException e) {
-			result = new ConnectionStatus(false, INVALID_DAEMON_PORT_NUMBER);
-		}
-		catch (IOException ioe)
-		{
-			result = new ConnectionStatus(false, ioe);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Reeturns the launch socket
-	 *
-	 * @return the launch socket
-	 */
-	public Socket getLaunchSocket() {
-		return _launchSocket;
-	}
-
-	/**
-	 * Returns the DataStore that the client is connected to.
-	 * @return the DataStore
-	 */
-	public DataStore getDataStore()
-	{
-		return _dataStore;
-	}
-
-	private void init()
-	{
-		init(10000);
-	}
-
-	private void init(int initialSize)
-	{
-		_clientAttributes = new ClientAttributes();
-		_clientAttributes.setAttribute(DataStoreAttributes.A_ROOT_NAME, _name);
-
-
-		_dataStore = new DataStore(_clientAttributes, initialSize);
-		_dataStore.setDomainNotifier(_domainNotifier);
-		_dataStore.createRoot();
-
-		_host = _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_NAME);
-		_hostDirectory = _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_PATH);
-		_port = _clientAttributes.getAttribute(DataStoreAttributes.A_HOST_PORT);
-	}
-
-
-	private int doHandShake()
-	{
-		try
-		{
-			BufferedReader reader = new BufferedReader(new InputStreamReader(_theSocket.getInputStream(), DE.ENCODING_UTF_8));
-			PrintWriter writer = new PrintWriter(new OutputStreamWriter(_theSocket.getOutputStream(), DE.ENCODING_UTF_8));
-			writer.println(""); //$NON-NLS-1$
-			writer.println(""); //$NON-NLS-1$
-			writer.println(""); //$NON-NLS-1$
-			writer.flush();
-
-			String handshake = null;
-			try
-			{
-				handshake = reader.readLine();
-			}
-			catch (InterruptedIOException e)
-			{
-				return IDataStoreCompatibilityHandler.HANDSHAKE_TIMEOUT;
-			}
-			_theSocket.setSoTimeout(0);
-
-			String[] serverVersionStr = handshake.split("\\."); //$NON-NLS-1$
-			int serverVersion = Integer.parseInt(serverVersionStr[IDataStoreCompatibilityHandler.VERSION_INDEX_VERSION]);
-			_dataStore.setServerVersion(serverVersion);
-			_dataStore.setServerMinor(Integer.parseInt(serverVersionStr[IDataStoreCompatibilityHandler.VERSION_INDEX_MINOR]));
-
-			return getCompatibilityHandler().checkCompatibility(handshake);
-		}
-		catch (Exception e)
-		{
-			return IDataStoreCompatibilityHandler.HANDSHAKE_UNEXPECTED;
-		}
-
-	}
-
-	public boolean isKnownStatus(String status)
-	{
-		boolean known = status.equals(IDataStoreConstants.CONNECTED) ||
-		status.equals(IDataStoreConstants.AUTHENTICATION_FAILED) ||
-		status.equals(IDataStoreConstants.UNKNOWN_PROBLEM) ||
-		status.startsWith(IDataStoreConstants.SERVER_FAILURE) ||
-		status.equals(IDataStoreConstants.PASSWORD_EXPIRED) ||
-		status.equals(IDataStoreConstants.NEW_PASSWORD_INVALID);
-		
-		if (!known){ // check for bind error
-			known = status.startsWith(ServerReturnCodes.RC_BIND_ERROR);
-		}
-		return known;
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ConnectionStatus.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ConnectionStatus.java
deleted file mode 100644
index a0659b544..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ConnectionStatus.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- *******************************************************************************/
-
-package org.eclipse.dstore.core.client;
-
-import java.util.List;
-
-/**
- * ConnectionStatus represents the state of a connection.  This class is
- * used for feedback, when a client attempts to connect to a server.
- * 
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients. 
- */
-public class ConnectionStatus
-{
-
-	private boolean _connected;
-	private Throwable _exception;
-	private String _message;
-	private String _ticket;
-	private boolean _SSLProblem = false;
-	private List _untrustedCertificates;
-
-	/**
-	 * Constructor
-	 * @param connected indicates whether a connection has been made
-	 */
-	public ConnectionStatus(boolean connected)
-	{
-		_connected = connected;
-	}
-
-	/**
-	 * Constructor
-	 * @param connected indicates whether a connection has been made
-	 * @param e the exception that occurred when attempting to connect
-	 */
-	public ConnectionStatus(boolean connected, Throwable e)
-	{
-		_connected = connected;
-		_exception = e;
-		_message = e.toString();
-	}
-
-	/**
-	 * Constructor
-	 * @param connected indicates whether a connection has been made
-	 * @param msg a connection error message
-	 */
-	public ConnectionStatus(boolean connected, String msg)
-	{
-		_connected = connected;
-		_message = msg;
-	}
-	
-	public ConnectionStatus(boolean connected, Throwable e, boolean sslProblem, List untrustedCerts)
-	{
-		_connected = connected;
-		_exception = e;
-		_message = e.toString();
-		_SSLProblem = sslProblem;
-		_untrustedCertificates = untrustedCerts;
-	}
-
-	/**
-	 * Sets whether the connection is successful or not
-	 * @param flag indication of whether the connection is successful
-	 */
-	public void setConnected(boolean flag)
-	{
-		_connected = flag;
-	}
-
-	/**
-	 * Sets the connection error message
-	 * @param message the error message
-	 */
-	public void setMessage(String message)
-	{
-		_message = message;
-	}
-
-	/**
-	 * Sets the ticket to use when connecting to a server.  Typically,
-	 * a ticket gets sent back from a server daemon so that the client
-	 * can be granted access to the launched server DataStore
-	 * @param ticket the ticket
-	 */
-	public void setTicket(String ticket)
-	{
-		_ticket = ticket;
-	}
-
-	/**
-	 * Indicates whether the connection was successful or not
-	 * @return whether the connection was successful or not
-	 */
-	public boolean isConnected()
-	{
-		return _connected;
-	}
-
-	/**
-	 * Returns the error message for a connection attempt
-	 * @return the error message
-	 */
-	public String getMessage()
-	{
-		return _message;
-	}
-
-	/**
-	 * Returns the ticket required for connecting to a server
-	 * @return the ticket
-	 */
-	public String getTicket()
-	{
-		return _ticket;
-	}
-	
-	/*
-	 * Returns the exception if there is one
-	 * @return the exception
-	 */
-	public Throwable getException()
-	{
-		return _exception;
-	}
-	
-	public boolean isSLLProblem()
-	{
-		return _SSLProblem;
-	}
-	
-	public List getUntrustedCertificates()
-	{
-		return _untrustedCertificates;
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandler.java
deleted file mode 100644
index 907c64e8b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandler.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * David McKnight  (IBM)   [360847] [dstore] need to add tracing and fixes to enable remote class transfer
- ********************************************************************************/
-
-package org.eclipse.dstore.core.java;
-
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-
-
-/**
- * <p>
- * The ClassByteStreamHandler class is used to abstract classfile read and write operations
- * across the network.  By default this is used for sending and receiving class files
- * on the client and the server.  The class can be extended if the default byte stream
- * implementations are not sufficient for a particular platform or use.  
- * </p>
- * <p>
- * If ClassByteStreamHandler is extended, you need to tell the DataStore to use the
- * extended implementation.  To do that, call <code>DataStore.setClassByteStreamHandler(ClassByteStreamHandler)</code>.
- * </p>
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients. 
- */
-public class ClassByteStreamHandler implements IClassByteStreamHandler
-{
-
-	protected DataStore _dataStore;
-	protected DataElement _log;
-	protected static final String FILEMSG_REMOTE_SAVE_FAILED = "RSEF5006"; //$NON-NLS-1$
-
-	/**
-	 * Contructor
-	 * @param dataStore the DataStore instance
-	 * @param log the log in which to log status and messages
-	 */
-	public ClassByteStreamHandler(DataStore dataStore, DataElement log)
-	{
-		_dataStore = dataStore;
-		_log = log;
-	}
-	
-	public String getIdentifier()
-	{
-		return getClass().getName();
-	}
-	
-	/**
-	 * Receive a class and load it.  This method is called by the
-	 * DataStore when the communication layer receives a class file transfer
-	 * This method kicks off a new thread so that the receiver thread can be free
-	 * to receive other data.
-	 *
-	 * @param className the name of the class to receive
-	 * @param buffer the bytes that comprise the class
-	 * @param size the number of bytes in the class
-	 */
-	public void receiveBytes(String className, byte[] buffer, int size)
-	{
-		ReceiveClassThread rct = new ReceiveClassThread(className, buffer, size);
-		rct.start();
-	}
-	
-	
-	/**
-	 * Receive a class instance and load it.  This method is called by the
-	 * DataStore when the communication layer receives a class file transfer
-	 * This method kicks off a new thread so that the receiver thread can be free
-	 * to receive other data.
-	 *
-	 * @param buffer the bytes that comprise the class instance
-	 * @param size the number of bytes in the class instance
-	 */
-	public void receiveInstanceBytes(byte[] buffer, int size)
-	{
-		ReceiveClassInstanceThread rct = new ReceiveClassInstanceThread(buffer, size);
-		rct.start();
-	}
-	
-	protected DataElement findStatusFor(String remotePath)
-	{
-		if (_log != null)
-		{
-			for (int i = 0; i < _log.getNestedSize(); i++)
-			{
-				DataElement child = _log.get(i);
-				if (child.getName().equals(remotePath))
-				{
-					return child;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * A new thread that can be spawned to receive the class
-	 *
-	 */
-	protected class ReceiveClassThread extends Thread
-	{
-		private String _className;
-		private byte[] _buffer;
-		private int _size;
-		
-		public ReceiveClassThread(String className, byte[] buffer, int size)
-		{
-			_className = className;
-			_buffer = buffer;
-			_size = size;
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Thread#run()
-		 */
-		public void run()
-		{
-			RemoteClassLoader remoteLoader = new RemoteClassLoader(_dataStore);
-			remoteLoader.receiveClass(_className, _buffer, _size);
-		}
-		
-	}
-	
-	/**
-	 * A new thread that can be spawned to receive the class
-	 *
-	 */
-	protected class ReceiveClassInstanceThread extends Thread
-	{
-		private byte[] _buffer;
-		private int _size;
-		
-		public ReceiveClassInstanceThread(byte[] buffer, int size)
-		{
-			_buffer = buffer;
-			_size = size;	
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Thread#run()
-		 */
-		public void run()
-		{
-			_dataStore.trace("receiving class bytes"); //$NON-NLS-1$
-			_dataStore.trace("\tsize="+_size); //$NON-NLS-1$
-			_dataStore.trace("\tbuffer="+_buffer); //$NON-NLS-1$
-			try
-			{
-				PipedInputStream ins = new PipedInputStream();
-				
-				PipedOutputStream outStream = new PipedOutputStream(ins);
-				outStream.write(_buffer, 0, _size);
-				outStream.flush();
-				outStream.close();				
-
-				IRemoteClassInstance instance = loadInstance(ins);
-				if (instance != null){
-					_dataStore.trace("running class instance "+instance); //$NON-NLS-1$
-					runInstance(instance);
-				}
-				
-			}
-			catch (Exception e)
-			{			
-				e.printStackTrace();
-			}
-		}
-		
-		protected IRemoteClassInstance loadInstance(InputStream ins)
-		{
-			ObjectInputStream inStream = null;
-			try
-			{
-				inStream = new RemoteObjectInputStream(ins, _dataStore.getRemoteClassLoader());		
-			
-				return (IRemoteClassInstance)inStream.readObject();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			return null;
-		}
-	
-		protected void runInstance(IRemoteClassInstance instance) 
-		{
-			
-			if (_dataStore.isVirtual())
-			{
-				// on client notify
-				instance.updatedOnClient();
-			}
-			else
-			{
-				// on server run and update client
-				_dataStore.trace("calling arrived on server"); //$NON-NLS-1$
-				try {
-					instance.arrivedOnServer();			
-				}
-				catch (Exception e){
-					_dataStore.trace(e);
-				}
-				_dataStore.updateRemoteClassInstance(instance, getIdentifier());
-			}
-		}
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandlerRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandlerRegistry.java
deleted file mode 100644
index 8930b41bf..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassByteStreamHandlerRegistry.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.dstore.core.java;
-
-import java.util.HashMap;
-
-import org.eclipse.dstore.core.model.DataStoreResources;
-
-/**
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients. 
- */
-public class ClassByteStreamHandlerRegistry 
-{
-	private HashMap _map;
-	private IClassByteStreamHandler _default;
-	public ClassByteStreamHandlerRegistry()
-	{
-		_map = new HashMap();
-	}
-	
-	/**
-	 * Registers the default class byte stream handler
-	 * @param handler the default byte stream handler
-	 */
-	public void setDefaultClassByteStreamHandler(IClassByteStreamHandler handler)
-	{
-		_default = handler; 
-		_map.put(DataStoreResources.DEFAULT_CLASSBYTESTREAMHANDLER, handler);
-		registerClassByteStreamHandler(handler);
-	}
-	
-	/**
-	 * Registers a class byte stream handler. 
-	 * @param handler the handler to register
-	 */
-	public void registerClassByteStreamHandler(IClassByteStreamHandler handler)
-	{
-		_map.put(handler.getIdentifier(), handler);
-	}
-	
-	/**
-	 * Returns the class byte stream handler with the specified id.
-	 * If "default" is specified or no such id has been registered, 
-	 * the default byte stream handler is returned.
-	 * @param id the id of the byte stream handler
-	 * @return the byte stream handler
-	 */
-	public IClassByteStreamHandler getClassByteStreamHandler(String id)
-	{
-		IClassByteStreamHandler handler = (IClassByteStreamHandler)_map.get(id);
-		if (handler == null)
-		{
-			handler = _default;
-		}
-		return handler;
-	}
-	
-	/**
-	 * Returns the default class byte stream handler
-	 * @return the default
-	 */
-	public IClassByteStreamHandler getDefault()
-	{
-		return _default;
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassInstanceOutputStream.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassInstanceOutputStream.java
deleted file mode 100644
index 42796543b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassInstanceOutputStream.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.dstore.core.java;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.  
- */
-public class ClassInstanceOutputStream extends OutputStream {
-
-	public void write(int b) throws IOException {
-		// TODO Auto-generated method stub
-
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassRequest.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassRequest.java
deleted file mode 100644
index 9c586cc16..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/ClassRequest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.dstore.core.java;
-
-/**
- * Represents a remote class request in the RemoteClassLoader. Contains
- * methods for getting the status of the request, as well as getting the
- * actual class after it has been loaded.
- * @author mjberger
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients. 
- */
-public class ClassRequest
-{
-	private boolean _requested;
-	private boolean _loaded;
-	private boolean _synchronous;
-	private String _className;
-	private Class _class = null;
-	
-	/**
-	 * Constructs a new ClassRequest
-	 * @param className The name of the class requested
-	 * @param synchronous whether or not the request is synchronous
-	 */
-	public ClassRequest(String className, boolean synchronous)
-	{
-		_synchronous = synchronous;
-		_className = className;
-		_requested = false;
-		_loaded = false;
-	}
-
-	/**
-	 * Causes the current thread to wait until this class request has been
-	 * fulfilled.
-	 */
-	public synchronized void waitForResponse()
-	{
-		try
-		{
-			if (!_loaded) wait();		
-		}
-		catch (InterruptedException e)
-		{
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * Causes all threads waiting for this class request to be filled
-	 * to wake up.
-	 */
-	public synchronized void notifyResponse()
-	{
-		notifyAll();
-	}
-	
-	/**
-	 * Returns the class loaded, or null if it has not been loaded yet.
-	 */
-	public Class getLoadedClass()
-	{
-		return _class;
-	}
-	
-	/**
-	 * Returns whether or not the class has been loaded yet.
-	 */
-	public boolean isLoaded()
-	{
-		return _loaded;
-	}
-	
-	/**
-	 * Returns the name of the class requested/loaded.
-	 */
-	public String getClassName()
-	{
-		return _className;
-	}
-	
-	/**
-	 * Returns whether or not the class has been requested yet.
-	 */
-	public boolean isRequested()
-	{
-		return _requested;
-	}
-	
-	/**
-	 * Returns whether or not the class request is synchronous.
-	 */
-	public boolean isSynchronous()
-	{
-		return _synchronous;
-	}
-	
-	/**
-	 * Call this method when the request for the class has been sent.
-	 */
-	public void setRequested(boolean requested)
-	{
-		_requested = requested;
-	}
-	
-	/**
-	 * Call this method when the class has been received and loaded.
-	 */
-	public void setLoaded(boolean loaded)
-	{
-		_loaded = loaded;
-	}
-	
-	/**
-	 * Sets the class represented by this object after it has been loaded.
-	 * (Sets loaded to be true and requested to be false). Notifies all threads
-	 * waiting on this class request that the class has been loaded.
-	 */
-	public synchronized void setLoadedClass(Class loadedClass)
-	{
-		_class = loadedClass;
-		setRequested(false);
-		setLoaded(true);
-		notifyAll();
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IClassByteStreamHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IClassByteStreamHandler.java
deleted file mode 100644
index 6c7be3436..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IClassByteStreamHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-
-package org.eclipse.dstore.core.java;
-
-/**
- * <p>
- * The IClassByteStreamHandler interface is used to abstract file read and write
- * operations across the network.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IClassByteStreamHandler
-{
-
-	/**
-	 * Returns the unique ID for this bytestream handler
-	 * @return the unique id
-	 */
-	public String getIdentifier();
-
-	/**
-	 * Receive a class and load it.  This method is called by the
-	 * DataStore when the communication layer receives a class file transfer
-	 * This method kicks off a new thread so that the receiver thread can be free
-	 * to receive other data.
-	 *
-	 * @param className the name of the class to receive
-	 * @param buffer the bytes that comprise the class
-	 * @param size the number of bytes in the class
-	 */
-	public void receiveBytes(String className, byte[] buffer, int size);
-
-	/**
-	 * Save a class instance in the specified location. Invokes the operation in a new thread.  This method is called by the
-	 * DataStore when the communication layer receives a class file transfer
-	 *
-	 * @param buffer the bytes to insert in the class instance
-	 * @param size the number of bytes to insert
-	 */
-	public void receiveInstanceBytes(byte[] buffer, int size);
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IRemoteClassInstance.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IRemoteClassInstance.java
deleted file mode 100644
index 76b5890bc..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/IRemoteClassInstance.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-
-package org.eclipse.dstore.core.java;
-
-import java.io.Serializable;
-
-/**
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRemoteClassInstance extends Serializable
-{
-	public void arrivedOnServer();
-	public void updatedOnClient();
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/LocalObjectInputStream.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/LocalObjectInputStream.java
deleted file mode 100644
index 5f85891df..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/LocalObjectInputStream.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.dstore.core.java;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-import java.util.List;
-
-/**
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients. 
- */
-public class LocalObjectInputStream extends ObjectInputStream {
-
-	private List _localLoaders;
-	public LocalObjectInputStream(InputStream in, List localLoaders) throws IOException 
-	{
-		super(in);
-		_localLoaders = localLoaders;
-	}
-
-	  protected Class resolveClass(ObjectStreamClass desc)
-		throws IOException, ClassNotFoundException
-	    {
-		  ClassNotFoundException ex = null;
-		  String name = desc.getName();
-		  for (int i = 0; i < _localLoaders.size(); i++)
-		  {
-			  ClassLoader cl = (ClassLoader)_localLoaders.get(i);
-			  try
-			  {
-				  return cl.loadClass(name);
-			  }
-			  catch (ClassNotFoundException e)
-			  {			
-				  ex = e;
-			  }
-		  }
-		  throw ex;
-	    }
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteClassLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteClassLoader.java
deleted file mode 100644
index f176ff17e..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteClassLoader.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * David McKnight   (IBM) - [244388] [dstore] Connection hangs when a miner not installed
- * David McKnight  (IBM)   [360847] [dstore] need to add tracing and fixes to enable remote class transfer
- * David McKnight   (IBM) - [367264] [dstore] Trace should be written when load miner is failed.
- *******************************************************************************/
-
-package org.eclipse.dstore.core.java;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.model.DataStore;
-
-
-
-/**
- * This class loads a class from a remote peer.
- * This classloader is used just as any other classloader is used. However,
- * when instantiating the RemoteClassLoader, a DataStore is associated with
- * it. The RemoteClassLoader goes through the following steps when trying to load
- * a class:
- *  1) Attempts to load the class from memory. Any class that had been loaded
- *     already this session would reside here.
- *  2) Attempts to find the class using its parent classloader.
- *  3) If caching preference is turned on:
- *     a) Attempts to find the class from the disk cache.
- *  4) Requests the class, through the DataStore, from the remote peer. Waits for
- *     response.
- *  5) If class cannot be found, throws ClassNotFoundException
- *  6) If class is found, loads the class.
- *  7) If caching preference is turned on:
- *     a) Caches new class in the disk cache for use in the next session.
- *  Notes:
- *  i) If there are one or more classes on which the target class depends,
- *     the RemoteClassLoader will attempt to load those classes too (possibly remotely),
- *     before loading the target class.
- *  ii) Since most implementations of Java use lazy classloading, the JVM may not
- *      attempt to load all required classes for the target class during class definition
- *      or instantiation. However, if the RemoteClassLoader was used to load the target
- *      class, then at any time, any additional classes required by the target class will
- *      be loaded using the RemoteClassLoader. Clients should be aware that this could trigger
- *      class requests and class transfers during the operation of objects of the target class,
- *      not just during definition and instantiation of it.
- *  iii) On the remote peer side, if you wish a class to be a candidate for transfer using the
- *       RemoteClassLoader on the opposite side of the connection, you MUST register the classloader
- *       for that class with the DataStore corresponding to the DataStore with which the RemoteClassLoader
- *       was instantiated. For example, in a client-server connection there is a "client" DataStore and a
- *       corresponding "server" DataStore. Suppose the server wishes to use the RemoteClassLoader to load
- *       class A from the client. Suppose A is loaded on the client using ClassLoaderForA. On the client
- *       side, ClassLoaderForA must be registered with the "client" DataStore so that when the
- *       class request for A comes in from the server, the client DataStore know how to load class A.
- *
- *  Caching:
- *   To set your preference for caching, on either the client or server DataStore, use the following command:
- *    _dataStore.setPreference(RemoteClassLoader.CACHING_PREFERENCE, "true");
- *   The cache of classes is kept in a jar in the following directory:
- *   $HOME/.eclipse/RSE/rmt_classloader_cache.jar
- *   To clear the cache, you must delete the jar.
- *
- *  Threading Issues:
- *   It's safest to use the RemoteClassLoader on a separate thread, and preferably not
- *   from the CommandHandler or UpdateHandler threads. The RemoteClassLoader uses those
- *   threads to request and send the class. However, DataStore commands can be structured such that
- *   safe use of the RemoteClassLoader on these threads is possible. See below for an
- *   example.
- *
- *  Using the RemoteClassLoader in your subsystem miner:
- *   Suppose you want the client to be able to kick off a class request in your host subsystem
- *   miner. In order to accomplish this, you would take the following steps:
- *   1) Add a command to your miner in the extendSchema() method.
- *   2) Add logic in the handleCommand() method to route command to another method when handleCommand
- *      receives your new command.
- *   3) In your command handling method, get the name of the class to load from the subject
- *      DataElement.
- *   4) Load the class using the RemoteClassLoader.
- *   5) Make sure the class you are attempting to load exists on the client and that class's
- *      ClassLoader is registered with the DataStore!
- *
- * @author mjberger
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class RemoteClassLoader extends ClassLoader
-{
-	public final static String CACHING_PREFERENCE = "Class.Caching"; //$NON-NLS-1$
-	private DataStore _dataStore;
-	private boolean _useCaching = false;
-	private CacheClassLoader _urlClassLoader;
-
-	private class CacheClassLoader extends URLClassLoader
-	{
-		public CacheClassLoader(URL[] urls, ClassLoader parent)
-		{
-			super(urls, parent);
-		}
-
-		public Class findCachedClass(String className) throws ClassNotFoundException
-		{
-			return super.findClass(className);
-		}
-	}
-
-	/**
-	 * Constructor
-	 * @param dataStore A reference to the datastore to be used by this
-	 * RemoteClassLoader.
-	 */
-	public RemoteClassLoader(DataStore dataStore)
-	{
-		super(dataStore.getClass().getClassLoader());
-		//_urlClassLoader = new URLClassLoader(new URL[0]);
-		_dataStore = dataStore;
-		useCaching();
-	}
-
-	public boolean useCaching()
-	{
-		boolean useCaching = false;
-		String pref = _dataStore.getPreference(CACHING_PREFERENCE);
-		if (pref != null && pref.equals("true")) //$NON-NLS-1$
-		{
-			useCaching = true;
-		}
-		if (useCaching != _useCaching)
-		{
-			if (useCaching && _dataStore.getRemoteClassLoaderCache() != null)
-			{
-				try
-				{
-					URL cache = _dataStore.getRemoteClassLoaderCache().toURL();
-					URL[] urls = new URL[] { cache };
-					_urlClassLoader = new CacheClassLoader(urls, this);
-				}
-				catch (MalformedURLException e)
-				{
-					e.printStackTrace();
-				}
-			}
-		}
-		_useCaching = useCaching;
-		return _useCaching;
-	}
-
-	/**
-	 * Finds the specified class. If the class cannot be found locally,
-	 * a synchronous request for the class is sent to the client, and the calling thread
-	 * waits for a response. If the client can find the class, it sends it back to
-	 * the server. The server receives the class in a new thread, defines it, and
-	 * then notifies this thread. The class is then returned by this method. If the class
-	 * cannot be found, the client notifies the server, and this method throws a
-	 * ClassNotFoundException.
-	 * @param className the fully qualified classname to find
-	 * @return the loaded class
-	 * @throws ClassNotFoundException if the class cannot be found on either the client or the server.
-	 *
-	 */
-	protected Class findClass(String className) throws ClassNotFoundException
-	{
-		_dataStore.trace("findClass "+className); //$NON-NLS-1$
-		
-		// first try using the datastore's local classloaders
-		ArrayList localLoaders = _dataStore.getLocalClassLoaders();
-		if (localLoaders != null)
-		{
-			Class theClass = null;
-			for (int i = 0; i < localLoaders.size(); i++)
-			{
-				try
-				{
-					theClass = ((ClassLoader)localLoaders.get(i)).loadClass(className);
-					if (theClass != null) return theClass;
-				}
-				catch (Exception e)
-				{
-					_dataStore.trace(e);
-				}
-			}
-		}
-
-		// next delegate the search to the superclass's find method.
-		try
-		{
-			Class theClass = super.findClass(className);
-			if (theClass != null)
-			{
-				return theClass;
-			}
-		}
-		catch (Exception e)
-		{
-			if (!_useCaching){
-				// no remote loading in this case
-				throw new ClassNotFoundException(className);
-			}
-		}
-
-		// DKM
-		// only do lookup if the classname looks valid
-		// don't want to be requesting rsecomm from client
-		if (className.indexOf('.') == -1)
-		{
-			throw new ClassNotFoundException(className);
-		}
-
-		// if it cannot be found:
-
-		// search the class request repository to see if the class has been requested
-		// already
-		ClassRequest request;
-		_dataStore.trace("checking class repository..."); //$NON-NLS-1$
-		request = (ClassRequest) _dataStore.getClassRequestRepository().get(className);
-
-		if (request == null)
-		{
-			// the class has not been requested before
-			// try to look in the disk cache first
-			if (useCaching())
-			{
-				try
-				{
-					_dataStore.trace("checking cache"); //$NON-NLS-1$
-					Class theClass = _urlClassLoader.findCachedClass(className);
-
-					//System.out.println("Using cached: " + className);
-					return theClass;
-				}
-				catch (Throwable e)
-				{
-					// its not in the disk cache, so request it synchronously
-					return requestClass(className);
-				}
-			}
-			else
-			{
-				return requestClass(className);
-			}
-		}
-		else if (!request.isLoaded())
-		{
-			// the class has been requested before, but it has not yet been received
-			request.waitForResponse(); // just wait until the class is received
-			
-			// after the class is received, get it from the repository and return it
-			// or if the class failed to be received, throw an exception
-			if (request.isLoaded()) return request.getLoadedClass();
-			else throw new ClassNotFoundException(className);
-		}
-		else if (request.isLoaded())
-		{
-			// the class has been requested before, and has already been received and loaded,
-			// so just return it.
-			return request.getLoadedClass();
-		}
-		// if we ever get to this point, the class has not been found,
-		// throw the exception
-		else {			
-			throw new ClassNotFoundException(className);
-		}
-	}
-
-
-	/**
-	 * Receives a class sent by a remote agent and loads it.
-	 * Notifies all threads waiting for this class to load that the
-	 * class has been loaded.
-	 * @param className the name of the class to receive
-	 * @param bytes the bytes in the class
-	 * @param size the size of the class
-	 */
-	public synchronized void receiveClass(String className, byte[] bytes, int size)
-	{
-		_dataStore.trace("receiving "+className); //$NON-NLS-1$
-		// check the class request repository to see if the class is there
-		ClassRequest request = (ClassRequest) _dataStore.getClassRequestRepository().get(className);
-		if (request != null)
-		{
-			if (request.isLoaded()) return; // do not attempt to reload the class
-		}
-		if (size == 0)
-		{
-			// this is the signal that the class could not be found on the client
-		//	System.out.println("Empty class/class not found: "+className);
-		//	System.out.println("notifying requester");
-			if (request != null)
-				request.notifyResponse(); // wake up the threads waiting for the class
-			return;
-		}
-		Class receivedClass = null;
-		try
-		{
-			_dataStore.trace("defining "+className+"..."); //$NON-NLS-2$
-			// try to define the class. If any dependent classes cannot be
-			// found the JRE implementation will call findClass to look for them.
-			// Thus we could end up with a stack of requests all waiting until the
-			// classes with no dependent classes load.
-			receivedClass = defineClass(className, bytes, 0, size);
-			if (receivedClass == null){
-				try {
-					receivedClass = findClass(className);
-				}
-				catch (Exception e){					
-				}
-			}
-
-		_dataStore.trace("...finished defining "+className); //$NON-NLS-1$
-		}
-		catch (NoClassDefFoundError e)
-		{
-			// the JRE implementation could not find a dependent class.
-			// (even after requesting it from the client). We must fail,
-			// but wake up the threads waiting for this class.
-			e.printStackTrace();
-			if (request != null)
-				request.notifyResponse();
-			return;
-		}
-		catch (LinkageError e)
-		{
-			// this happens when the system tries to redefine a class.
-			// dont try to redefine the class, just reload it.
-			e.printStackTrace();
-			try
-			{
-				receivedClass = loadClass(className);
-			}
-			catch (NoClassDefFoundError err)
-			{
-				// we shouldn't really get here unless it has tried
-				// already to find the class on the client but couldnt,
-				// so we might as well just fail here and notify threads waiting
-				// for this class to load.
-				err.printStackTrace();
-				if (request != null)
-					request.notifyResponse();
-				return;
-			}
-			catch (ClassNotFoundException ee)
-			{
-				// we definitely shouldnt get here
-				if (request != null)
-					request.notifyResponse();
-				return;
-			}
-
-			// if after trying to define or trying to load the class
-			// we still dont have it, notify the threads and fail.
-			if (receivedClass == null)
-			{
-				if (request != null)
-					request.notifyResponse();
-				return;
-			}
-		}
-		if (request == null)
-		{
-			// not used right now, this is the case where a class was sent by
-			// the client without us requesting it.
-			request = new ClassRequest(className, false);
-			request.setLoadedClass(receivedClass);
-			_dataStore.getClassRequestRepository().put(className, request);
-			return;
-		}
-		else
-		{
-			// SUCCESS! The class has been received, and defined, so just
-			// load it into the class request object. This action will
-			// also notify threads waiting for the class
-			_dataStore.trace("notifying requesters");
-			request.setLoadedClass(receivedClass);
-			if (useCaching())
-			{
-				_dataStore.cacheClass(className, bytes, size);
-			}
-		}
-	}
-
-	/**
-	 * Kicks off a separate thread in which to request the class,
-	 * rather than doing it synchronously.
-	 * @param className The fully qualified name of the class to request.
-	 */
-	protected void requestClassInThread(String className)
-	{
-		_dataStore.trace("requesting (in thread)"+className);
-		LoadClassThread thread = new LoadClassThread(className);
-		thread.start();
-	}
-
-	/**
-	 * Requests a class (synchronously) from the client
-	 * @param className The fully qualified name of the class to request.
-	 * @return the requested class
-	 * @throws ClassNotFoundException if the class was not found on the client
-	 */
-	public Class requestClass(String className) throws ClassNotFoundException
-	{
-		// first check to see if the class has been requested before
-		ClassRequest request;
-		request = (ClassRequest) _dataStore.getClassRequestRepository().get(className);
-		if (request == null)
-		{
-			// the class has not been requested yet, create a new ClassRequest
-			// object to represent it
-			request = new ClassRequest(className, true);
-			_dataStore.getClassRequestRepository().put(className, request);
-			request.setRequested(true);
-
-			// put in the request for the class
-			_dataStore.requestClass(className);
-
-			// wait for a response
-			_dataStore.trace("thread to wait: "+Thread.currentThread().getName());
-			if (!request.isLoaded()) request.waitForResponse();
-			_dataStore.trace("thread finished waiting: "+Thread.currentThread().getName());
-			if (request.isLoaded()) return request.getLoadedClass();
-			else {
-				// remove the request so that if another one comes in for the
-				// same thing it doesn't hang waiting for a response
-				_dataStore.getClassRequestRepository().remove(className);
-				
-				throw new ClassNotFoundException(className);
-			}
-		}
-		else if (!request.isLoaded())
-		{
-			// class has already been requested, wait for it to load
-	_dataStore.trace("requested elsewhere, thread to wait: "+Thread.currentThread().getName());
-			if (!request.isLoaded()) request.waitForResponse();
-	_dataStore.trace("requested elsewhere, thread finished waiting: "+Thread.currentThread().getName());
-			if (request.isLoaded()) return request.getLoadedClass();
-			else throw new ClassNotFoundException(className);
-		}
-		else if (request.isLoaded())
-		{
-			// class has already been requested and loaded, just return it
-			return request.getLoadedClass();
-		}
-		// we shouldnt really get to this point, but if we do, it means the class
-		// was not found.
-		throw new ClassNotFoundException(className);
-	}
-
-	/**
-	 * Causes a new thread to start in which the specified class is loaded
-	 * into the repository. This method usually returns before the class has been
-	 * loaded.
-	 * @param className The fully qualified name of the class to load
-	 */
-	public synchronized void loadClassInThread(String className)
-	{
-		//System.out.println("remote load of "+className);
-		// check if the class has been requested before
-		ClassRequest request;
-		request = (ClassRequest) _dataStore.getClassRequestRepository().get(className);
-		if (request == null)
-		{
-			// class has not been requested, request it in a thread
-			request = new ClassRequest(className, false);
-			_dataStore.getClassRequestRepository().put(className, request);
-			request.setRequested(true);
-			requestClassInThread(className);
-			return;
-		}
-		else if (!request.isLoaded())
-		{
-			// class has been requested already, but not loaded. Just return.
-			return;
-		}
-		else if (request.isLoaded())
-		{
-			// class has been requested already and already loaded. Just return.
-			return;
-		}
-	}
-
-	/**
-	 * A new thread for loading classes in.
-	 * @author mjberger
-	 *
-	 */
-	protected class LoadClassThread extends Thread
-	{
-		private String _className;
-
-		public LoadClassThread(String className)
-		{
-			_className = className;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.lang.Thread#run()
-		 */
-		public void run()
-		{
-			_dataStore.requestClass(_className);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteObjectInputStream.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteObjectInputStream.java
deleted file mode 100644
index 6dcb0697b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteObjectInputStream.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.dstore.core.java;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-
-/**
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class RemoteObjectInputStream extends ObjectInputStream {
-
-	private RemoteClassLoader _loader;
-	public RemoteObjectInputStream(InputStream in, RemoteClassLoader loader) throws IOException
-	{
-		super(in);
-		_loader = loader;
-	}
-
-	  protected Class resolveClass(ObjectStreamClass desc)
-		throws IOException, ClassNotFoundException
-	    {
-		  String name = desc.getName();
-		    return _loader.loadClass(name);
-	    }
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java
deleted file mode 100644
index 0f3cb7a01..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/Miner.java
+++ /dev/null
@@ -1,704 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Noriaki Takatsu    (IBM)   [220126] [dstore][api][breaking] Single process server for multiple clients
- * David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
- * Noriaki Takatsu    (IBM)   [229146] [multithread] changes to stop Miner threads when clients disconnect
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * Martin Oberhuber (Wind River) - [199854][api] Improve error reporting for archive handlers
- * David McKnight    (IBM)  - [232004] [dstore][multithread] some miner finish() is not terminated sometimes
- * David McKnight    (IBM)  - [328060] [dstore] command queue in Miner should be synchronized
- * David McKnight    (IBM)  - [358301] [DSTORE] Hang during debug source look up
- *******************************************************************************/
-
-package org.eclipse.dstore.core.miners;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreResources;
-import org.eclipse.dstore.core.model.DataStoreSchema;
-import org.eclipse.dstore.core.model.Handler;
-import org.eclipse.dstore.core.model.IExternalLoader;
-import org.eclipse.dstore.core.model.ISchemaExtender;
-import org.eclipse.dstore.core.server.SystemServiceManager;
-
-/**
- * Miner is the abstract base class of all DataStore extensions). The DataStore
- * framework knows how to load and route commands to miners because it
- * interfaces miners through the restricted set of interfaces declared here. To
- * add a new miner, developers must extend this class and implement the abstract
- * methods declared here.
- * 
- * This class and its subclasses are not intended to be instantiated by clients.
- * The dstore server infrastructure will take care of loading the Miner.
- */
-public abstract class Miner extends Handler
-implements ISchemaExtender
-{
-
-	public DataElement _minerElement;
-	public DataElement _minerData;
-	public DataElement _minerTransient;
-
-
-
-	private boolean _initialized;
-	private boolean _connected;
-	private IExternalLoader _loader;
-
-	protected String _name = null;
-	protected String _value = null;
-	protected ArrayList _dependencies;
-	protected List _commandQueue;
-
-	protected ResourceBundle _resourceBundle = null;
-
-	/**
-	 * Creates a new Miner
-	 */
-	protected Miner()
-	{
-		_initialized = false;
-		_connected = false;
-		_commandQueue = new ArrayList();
-	}
-
-	/**
-	 * Returns the qualified names of all miners that
-	 * this miner depends on.  A miner depends on another
-	 * miner if it's schema extends or uses another's schema.
-	 * By default it returns an empty list.
-	 * @return a list of miner dependencies, each represented as a qualified name
-	 */
-	public final ArrayList getMinerDependencies()
-	{
-		if (_dependencies == null)
-		{
-			_dependencies = getDependencies();
-		}
-		return _dependencies;
-	}
-
-
-	protected ArrayList getDependencies()
-	{
-		return new ArrayList();
-	}
-
-	/**
-	 * Indicates whether the miner has been initialized yet
-	 * @return whether the miner has been initialized
-	 */
-	public final boolean isInitialized()
-	{
-		return _initialized;
-	}
-
-	/**
-	 * Indicates whether the miner has been connected to
-	 * the DataStore yet.
-	 * @return whether the miner has been connected to the DataStore
-	 */
-	public final boolean isConnected()
-	{
-		return _connected;
-	}
-
-	/**
-	 * Shuts down the miner and cleans up it's meta-information. Override this
-	 * function to do your own cleanup.
-	 * <p>
-	 * Subclasses may override this method but must call
-	 * <code>super.finish()</code> at the end of their overriding method.
-	 */
-	public void finish()
-	{
-		DataElement root = _dataStore.getMinerRoot();
-
-		_minerData.removeNestedData();
-		_minerElement.removeNestedData();
-		_dataStore.update(_minerElement);
-
-		if (root.getNestedData() != null)
-		{
-			root.getNestedData().remove(_minerElement);
-		}
-		root.setExpanded(false);
-		root.setUpdated(false);
-
-		_dataStore.update(root);
-
-		super.finish();
-	}
-
-	/**
-	 * Interface to retrieve an NL enabled resource bundle.
-	 * Override this function to get access to a real resource bundle.
-	 */
-	public ResourceBundle getResourceBundle()
-	{
-		return null;
-	}
-
-	/**
-	 * Default method that gets called on a Miner when it is loaded.
-	 * Override this function to perform some initialization at miner loading time.
-	 */
-	protected void load()
-	{
-	}
-
-	/**
-	 * Default method that gets called on a Miner when it is loaded.
-	 * Override this function to perform some initialization at miner loading time.
-	 * If loading the miner can result in some failure, set that status to incomplete
-	 *
-	 * @param status the status of the initialize miner command
-	 */
-	protected void load(DataElement status)
-	{
-		load();
-	}
-
-	/**
-	 * This gets called after a miner is initialized.
-	 * If you need to update element information at that time, override this method.
-	 */
-	protected void updateMinerInfo()
-	{
-	}
-
-	/**
-	 * Returns the qualified name of this miner
-	 *
-	 * @return the qualified name of this miner
-	 */
-	public final String getMinerName()
-	{
-		if (_name == null)
-			_name = getClass().getName();
-		return _name;
-	}
-
-	/**
-	 * Returns the name of this miner
-	 *
-	 * @return the name of this miner
-	 */
-	public final String getValue()
-	{
-		if (_value == null)
-		{
-			String name = getMinerName();
-			int indexOfValue = name.lastIndexOf(".");  //$NON-NLS-1$
-			_value = name.substring(indexOfValue + 1, name.length());
-		}
-		return _value;
-	}
-
-	public final void handle()
-	{
-		while (!_commandQueue.isEmpty())
-		{
-			try
-			{
-				DataElement cmd = null;
-				synchronized (_commandQueue){
-					cmd = (DataElement)_commandQueue.remove(0);
-				}
-				if (cmd != null){
-					command(cmd);
-				}
-			}
-			catch (Exception e){
-				e.printStackTrace();
-			}
-		}
-	}
-
-	public final void requestCommand(DataElement command)
-	{
-		synchronized (_commandQueue){
-			_commandQueue.add(command);
-		}
-		notifyInput();
-	}
-
-	public final void initMiner(DataElement status)
-	{
-		try
-		{
-		//	System.out.println("initMiner:"+getMinerName());
-		if (!_initialized)
-		{
-			load(status);
-			_initialized = true;
-		}
-		updateMinerInfo();
-
-		DataElement minerRoot = _dataStore.getMinerRoot();
-		_dataStore.refresh(minerRoot);
-		if (status.getAttribute(DE.A_VALUE).equals(DataStoreResources.model_incomplete))
-		{
-			_dataStore.refresh(status);
-		}
-		else
-		{
-
-			status.setAttribute(DE.A_VALUE, DataStoreResources.model_done);
-		}
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-
-
-
-	}
-
-	/**
-	 * Issues a specified command on this miner from the DataStore framework.
-	 * The base class handles "C_INIT_MINERS" but other commands are delegated to
-	 * the concrete miner implementations through handleCommand()
-	 *
-	 * @param command the command that has been sent to this miner
-	 * @return the status of the command
-	 */
-	protected final DataElement command(DataElement command)
-	{
-		String name = getCommandName(command);
-		DataElement status = getCommandStatus(command);
-
-		if (status == null)
-		{
-			_dataStore.trace("bad command: "); //$NON-NLS-1$
-			_dataStore.trace("\tcmd=" + command); //$NON-NLS-1$
-			_dataStore.trace("\tparent=" + command.getParent()); //$NON-NLS-1$
-			return null;
-		}
-
-		if (status.getAttribute(DE.A_NAME).equals("start")) //$NON-NLS-1$
-		{
-			status.setAttribute(DE.A_NAME, DataStoreResources.model_working);
-		}
-
-		if (name.equals(DataStoreSchema.C_INIT_MINERS))
-		{
-			initMiner(status);
-		}
-		else
-		{
-			try
-			{
-				status = handleCommand(command);
-			}
-			catch (Exception e)
-			{
-				//e.printStackTrace();
-				_dataStore.trace(e);
-				status.setAttribute(DE.A_VALUE, "Failed with Exception:"+getStack(e)); //$NON-NLS-1$
-				status.setAttribute(DE.A_NAME, DataStoreResources.model_done);
-				//status.setAttribute(DE.A_SOURCE, getStack(e));
-				_dataStore.refresh(status);
-
-				String exc = null;
-				if (e.getMessage() != null)
-					exc = e.getMessage();
-				else
-					exc = "Exception"; //$NON-NLS-1$
-				_dataStore.createObject(status, DataStoreResources.model_error, exc);
-			}
-			catch (OutOfMemoryError e){
-				System.exit(-1);
-			}
-			catch (Error er)
-			{
-			    er.printStackTrace();
-				_dataStore.trace(er);
-				_dataStore.finish();
-
-				if (SystemServiceManager.getInstance().getSystemService() == null)
-					System.exit(-1);
-			}
-		}
-
-		_dataStore.refresh(status);
-		return status;
-	}
-
-	private String getStack(Throwable e)
-	{
-		StringBuffer buf = new StringBuffer();
-		StackTraceElement[] stack = e.getStackTrace();
-		for (int i = 0; i < stack.length; i++)
-		{
-			buf.append(stack[i].getClassName() + ":" + stack[i].getMethodName() + ":" + stack[i].getLineNumber()); //$NON-NLS-1$ //$NON-NLS-2$
-			buf.append(","); //$NON-NLS-1$
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * Sets the DataStore and performs some fundamental initialization for this miner.
-	 * The framework calls this method on a miner before any commands are issued.
-	 * The extendSchema() is called on the miner.
-	 *
-	 * @param dataStore the DataStore that owns this miner
-	 */
-	public final void setDataStore(DataStore dataStore)
-	{
-		super.setDataStore(dataStore);
-		_dataStore = dataStore;
-
-		DataElement root = _dataStore.getMinerRoot();
-		String name = getMinerName();
-		String value = getValue();
-
-		_resourceBundle = getResourceBundle();
-
-		// yantzi: Reuse existing miner root if found
-		_minerElement = _dataStore.find(root, DE.A_NAME, name, 1);
-		if (_minerElement == null || _minerElement.isDeleted())
-		{
-			// Create new child for this miner
-			_minerElement   = _dataStore.createObject(root, DataStoreResources.model_miner, name, name);
-			_minerElement.setAttribute(DE.A_VALUE, value);
-			_minerElement.setAttribute(DE.A_SOURCE, getVersion());
-
-			_minerData      = _dataStore.createObject(_minerElement, DataStoreResources.model_data, DataStoreResources.model_Data, name);
-			_minerTransient = _dataStore.createObject(_minerElement, DataStoreResources.model_transient, DataStoreResources.model_Transient_Objects, name);
-		}
-		else
-		{
-			// Reuse existing miner node
-			_minerData = _dataStore.find(_minerElement, DE.A_NAME, DataStoreResources.model_Data, 1);
-			if (_minerData == null || _minerData.isDeleted())
-			{
-				_minerData = _dataStore.createObject(_minerElement, DataStoreResources.model_data, DataStoreResources.model_Data, name);
-			}
-
-			_minerTransient = _dataStore.find(_minerElement, DE.A_NAME, DataStoreResources.model_Transient_Objects, 1);
-			if (_minerTransient == null || _minerData.isDeleted())
-			{
-				_minerTransient = _dataStore.createObject(_minerElement, DataStoreResources.model_transient, DataStoreResources.model_Transient_Objects, name);
-			}
-		}
-
-		_dataStore.refresh(root, true);
-		_dataStore.refresh(_minerElement);
-
-		_connected = true;
-	}
-
-	/**
-	 * Creates an abstract command descriptor.  This is a helper method that miner may call
-	 * when it creates or updates the schema for it's tool domain
-	 *
-	 * @param descriptor the parent descriptor for the new descriptor
-	 * @param name the name of the command
-	 * @param value the identifier for this command
-	 * @return the new command descriptor
-	 */
-	public final DataElement createAbstractCommandDescriptor(DataElement descriptor, String name, String value)
-	{
-		return _dataStore.createAbstractCommandDescriptor(descriptor, name, getMinerName(), value);
-	}
-
-	/**
-	 * Creates a command descriptor.  This is a helper method that miner may call
-	 * when it creates or updates the schema for it's tool domain
-	 *
-	 * @param descriptor the parent descriptor for the new descriptor
-	 * @param name the name of the command
-	 * @param value the identifier for this command
-	 * @return the new command descriptor
-	 */
-	public final DataElement createCommandDescriptor(DataElement descriptor, String name, String value)
-	{
-		return createCommandDescriptor(descriptor, name, value, true);
-	}
-
-	/**
-	 * Creates a command descriptor.  This is a helper method that miner may call
-	 * when it creates or updates the schema for it's tool domain
-	 *
-	 * @param descriptor the parent descriptor for the new descriptor
-	 * @param name the name of the command
-	 * @param value the identifier for this command
-	 * @param visible an indication whether this command descriptor should be visible to an end-user
-	 * @return the new command descriptor
-	 */
-	public final DataElement createCommandDescriptor(DataElement descriptor, String name, String value, boolean visible)
-	{
-		DataElement cmdD = _dataStore.createCommandDescriptor(descriptor, name, getMinerName(), value);
-		if (!visible)
-		{
-			cmdD.setDepth(0);
-		}
-
-		return cmdD;
-	}
-
-	/**
-	 * Creates an abstract object descriptor.  This is a helper method that miner may call
-	 * when it creates or updates the schema for it's tool domain
-	 *
-	 * @param descriptor the parent descriptor for the new descriptor
-	 * @param name the name of the object type
-	 * @return the new object descriptor
-	 */
-	public final DataElement createAbstractObjectDescriptor(DataElement descriptor, String name)
-	{
-		return _dataStore.createAbstractObjectDescriptor(descriptor, name);
-	}
-
-	/**
-	 * Creates an abstract object descriptor.  This is a helper method that miner may call
-	 * when it creates or updates the schema for it's tool domain
-	 *
-	 * @param descriptor the parent descriptor for the new descriptor
-	 * @param name the name of the object type
-	 * @param source the plugin location of the miner that owns this object type
-	 * @return the new object descriptor
-	 */
-	public final DataElement createAbstractObjectDescriptor(DataElement descriptor, String name, String source)
-	{
-		return _dataStore.createAbstractObjectDescriptor(descriptor, name, source);
-	}
-
-	/**
-	 * Creates a object descriptor.  This is a helper method that miner may call
-	 * when it creates or updates the schema for it's tool domain
-	 *
-	 * @param descriptor the parent descriptor for the new descriptor
-	 * @param name the name of the object type
-	 * @return the new object descriptor
-	 */
-	public final DataElement createObjectDescriptor(DataElement descriptor, String name)
-	{
-		return _dataStore.createObjectDescriptor(descriptor, name);
-	}
-
-	/**
-	 * Creates a object descriptor.  This is a helper method that miner may call
-	 * when it creates or updates the schema for it's tool domain
-	 *
-	 * @param descriptor the parent descriptor for the new descriptor
-	 * @param name the name of the object type
-	 * @param source the plugin location of the miner that owns this object type
-	 * @return the new object descriptor
-	 */
-	public final DataElement createObjectDescriptor(DataElement descriptor, String name, String source)
-	{
-		return _dataStore.createObjectDescriptor(descriptor, name, source);
-	}
-
-	/**
-	 * Creates a new type of relationship descriptor.  This is a helper method that miner may call
-	 * when it creates or updates the schema for it's tool domain
-	 *
-	 * @param descriptor the parent descriptor for the new descriptor
-	 * @param name the name of the relationship type
-	 * @return the new relationship descriptor
-	 */
-	public final DataElement createRelationDescriptor(DataElement descriptor, String name)
-	{
-		return _dataStore.createRelationDescriptor(descriptor, name);
-	}
-
-	/**
-	 * Creates an abstract relationship between two descriptors.  An abstract relationship between two descriptors
-	 * indicates that the first descriptor abstracts the second, while the second inherits the
-	 * properties of the first. This is a helper method that miner may call
-	 * when it creates or updates the schema for it's tool domain.
-	 *
-	 * @param from the abstacting descriptor
-	 * @param to the descriptor that is abstracted
-	 * @return the new relationship descriptor
-	 */
-	public final DataElement createAbstractRelationship(DataElement from, DataElement to)
-	{
-		return _dataStore.createReference(from, to, "abstracts", "abstracted by"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * Creates a contents relationship between any two elements.
-	 *
-	 * @param from the containing element
-	 * @param to the element that is contained
-	 * @return the new relationship
-	 */
-	public final DataElement createReference(DataElement from, DataElement to)
-	{
-		return _dataStore.createReference(from, to);
-	}
-
-
-
-	/**
-	 * Returns the element that represents this miner.
-	 *
-	 * @return the miner element
-	 */
-	public final DataElement getMinerElement()
-	{
-		return _minerElement;
-	}
-
-	/**
-	 * Returns the element that contains this miners meta-information.
-	 *
-	 * @return the miner data element
-	 */
-	public final DataElement getMinerData()
-	{
-		return _minerData;
-	}
-
-	/**
-	 * Returns the transient object container for this element.
-	 *
-	 * @return the transient element
-	 */
-	public final DataElement getMinerTransient()
-	{
-		return _minerTransient;
-	}
-
-	/**
-	 * Identifies a give object descriptor type to be transient in this miner.
-	 *
-	 * @param objectDescriptor the object descriptor type that is transient
-	 */
-	public final void makeTransient(DataElement objectDescriptor)
-	{
-		_dataStore.createReference(_minerTransient, objectDescriptor);
-	}
-
-	/**
-	 * Returns the name of a command.
-	 * This is a helper method to be used inside handleCommand().
-	 *
-	 * @param command a tree of elements representing a command
-	 * @return the name of the command
-	 */
-	public final String getCommandName(DataElement command)
-	{
-		return command.getAttribute(DE.A_NAME);
-	}
-
-	/**
-	 * Returns the status of a command.
-	 * This is a helper method to be used inside handleCommand().
-	 *
-	 * @param command a tree of elements representing a command
-	 * @return the status element for the command
-	 */
-	public final DataElement getCommandStatus(DataElement command)
-	{
-	    //DKM - status is always last
-		return command.get(command.getNestedSize() - 1);
-		//_dataStore.find(command, DE.A_TYPE, DataStoreResources.model_status"), 1);
-	}
-
-
-
-	/**
-	 * Returns the number of arguments for this command.
-	 * This is a helper method to be used inside handleCommand().
-	 *
-	 * @param command a tree of elements representing a command
-	 * @return the number of arguments for this command
-	 */
-	public final int getNumberOfCommandArguments(DataElement command)
-	{
-		return command.getNestedSize();
-	}
-
-	/**
-	 * Returns the argument of a command specified at a given index.
-	 * This is a helper method to be used inside handleCommand().
-	 *
-	 * @param command a tree of elements representing a command
-	 * @param arg the index into the commands children
-	 * @return the argument of the command
-	 */
-	public final DataElement getCommandArgument(DataElement command, int arg)
-	{
-		if (command.getNestedSize() > 0)
-		{
-			DataElement argument = command.get(arg);
-			if (argument != null)
-			{
-				return argument.dereference();
-			}
-		}
-
-		return null;
-	}
-
-
-
-	/**
-	 * Returns the descriptor root for the DataStore schema
-	 *
-	 * @return the descriptor root
-	 */
-	public final DataElement getSchemaRoot()
-	{
-		return _dataStore.getDescriptorRoot();
-	}
-
-	public void setExternalLoader(IExternalLoader loader)
-	{
-		_loader = loader;
-	}
-
-	public IExternalLoader getExternalLoader()
-	{
-		return _loader;
-	}
-
-	public synchronized void waitForInput()
-	{
-		if (_commandQueue.size() == 0)
-		{
-			super.waitForInput();
-		}
-	}
-
-
-
-	/**
-	 * Handle commands that are routed to this miner.
-	 * This interface must be implemented by each miner in order to
-	 * perform tool actions driven from user interface interaction.
-	 *
-	 * @param theCommand an instance of a command containing a tree of arguments
-	 */
-	public abstract DataElement handleCommand(DataElement theCommand) throws Exception;
-
-
-	/**
-	 * Returns the version of this miner
-	 * The expected format for this is "<version>.<major>.<minor>"
-	 */
-	public abstract String getVersion();
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/MinerThread.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/MinerThread.java
deleted file mode 100644
index 21c920e9c..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/miners/MinerThread.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- *   Noriaki Takatsu    (IBM)   [220126] [dstore][api][breaking] Single process server for multiple clients
- *   Noriaki Takatsu    (IBM)   [283656] [dstore][multithread] Serviceability issue   
- *******************************************************************************/
-
-package org.eclipse.dstore.core.miners;
-
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.server.SecuredThread;
-
-/**
- * MinerThread is a utility class used for doing threaded operations in a miner.
- */
-public abstract class MinerThread extends SecuredThread
-{
-
-	private volatile Thread minerThread;
-	protected boolean _isCancelled;
-
-	/**
-	 * Constructor
-	 */
-	public MinerThread()
-	{
-		_isCancelled = false;
-	}
-
-	
-	/**
-	 * Constructor with dataStore.
-	 * 
-	 * @since 3.0
-	 */
-	public MinerThread(DataStore dataStore)
-	{
-		super(dataStore);
-		_isCancelled = false;
-	}
-
-	/**
-	 * stops the thread
-	 */
-	public synchronized void stopThread()
-	{
-		if (minerThread != null)
-		{
-			_isCancelled = true;
-
-			try
-			{
-				minerThread = null;
-			}
-			catch (Exception e)
-			{
-				if (_dataStore.getClient() != null) {
-					_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
-				}
-				System.out.println(e);
-			}
-
-		}
-		notify();
-	}
-
-	/**
-	 * runs the thread
-	 */
-	public void run()
-	{
-		super.run();
-		Thread thisThread = Thread.currentThread();
-		minerThread = thisThread;
-		//thisThread.setPriority(thisThread.getPriority()+1);
-
-		//This function lets derived classes do some initialization
-		initializeThread();
-
-		while (minerThread != null && minerThread == thisThread && minerThread.isAlive() && !_isCancelled)
-		{
-			try
-			{
-				sleep(100);
-				// yield();
-			}
-			catch (InterruptedException e)
-			{
-				if (_dataStore.getClient() != null) {
-					_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
-				}
-				System.out.println(e);
-			}
-
-			//This function is where the Threads do real work, and return false when finished
-			if (!doThreadedWork())
-			{
-				try
-				{
-					minerThread = null;
-				}
-				catch (Exception e)
-				{
-					if (_dataStore.getClient() != null) {
-						_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
-					}
-					System.out.println(e);
-				}
-			}
-		}
-
-		//This function lets derived classes cleanup or whatever
-		cleanupThread();
-	}
-
-	/**
-	 * Implement this method to provide initialization of this thread.
-	 */
-	public abstract void initializeThread();
-
-	/**
-	 * Implement this method to provide the work implementation of this thread.
-	 * This method gets called periodically by the miner thread so te work done
-	 * here must be atomic.  Each time this is called a incremental unit of
-	 * work should be done.  Once all the work is done, <b>true</b> should be
-	 * returned.
-	 *
-	 * @return <b>true</b> if all the work is done.
-	 */
-	public abstract boolean doThreadedWork();
-
-	/**
-	 * Implement this method to provide any cleanup that is required after
-	 * all the work is done.
-	 */
-	public abstract void cleanupThread();
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java
deleted file mode 100644
index 7c27f864b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandler.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- *  David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
- *  David McKnight     (IBM)   [281712] [dstore] Warning message is needed when disk is full
- *  David McKnight     (IBM)   [367424] [dstore] upload mechanism should provide backups of files
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * <p>
- * The ByteStreamHandler class is used to abstract file read and write operations
- * across the network.  By default this is used for sending and receiving files
- * on the client and the server.  The class can be extended if the default byte stream
- * implementations are not sufficient for a particular platform or use.  
- * </p>
- * <p>
- * If ByteStreamHandler is extended, you need to tell the DataStore to use the
- * extended implementation.  To do that, call <code>DataStore.setByteStreamHandler(ByteStreamHandler)</code>.
- * </p>
- * 
- */
-public class ByteStreamHandler implements IByteStreamHandler
-{
-
-	protected DataStore _dataStore;
-	protected DataElement _log;
-	protected static final String FILEMSG_REMOTE_SAVE_FAILED = "RSEF5006"; //$NON-NLS-1$
-
-	/**
-	 * Contructor
-	 * @param dataStore the DataStore instance
-	 */
-	public ByteStreamHandler(DataStore dataStore, DataElement log)
-	{
-		_dataStore = dataStore;
-		_log = log;
-	}
-
-	public String getId()
-	{
-		return getClass().getName();
-	}
-	
-	/**
-	 * Save a file in the specified location.  This method is called by the
-	 * DataStore when the communication layer receives a file transfer    
-	 *
-	 * @param remotePath the path where to save the file
-	 * @param buffer the bytes to insert in the file
-	 * @param size the number of bytes to insert
-	 * @param binary indicates whether to save the bytes as binary or text
-	 */
-	public void receiveBytes(String remotePath, byte[] buffer, int size, boolean binary)
-	{
-		remotePath = new String(remotePath.replace('\\', '/'));
-		DataElement status = findStatusFor(remotePath);
-		String fileName = _dataStore.mapToLocalPath(remotePath);
-	
-		if (fileName != null)
-		{
-			_dataStore.trace("Receiving Bytes for " + fileName); //$NON-NLS-1$
-			try
-			{
-				// need to create directories as well
-				File file = new File(fileName);
-				if (!file.exists())
-				{
-					File parent = new File(file.getParent());
-					parent.mkdirs();
-				}
-				else
-				{
-					// backup file on upload by default
-					String doBackups = System.getProperty("backupfiles"); //$NON-NLS-1$
-					if (doBackups == null || doBackups.equals("true")){ //$NON-NLS-1$
-						// backup the file first					
-						file.renameTo(new File(fileName+"~")); //$NON-NLS-1$
-					}				}
-				
-				File newFile = new File(fileName);				
-				FileOutputStream fileStream = new FileOutputStream(newFile);
-
-				if (binary)
-				{
-					fileStream.write(buffer, 0, size);
-				}
-				else
-				{
-					IByteConverter byteConverter = _dataStore.getByteConverter();
-					byteConverter.setContext(file);
-					byte[] convertedBytes = byteConverter.convertClientBytesToHostBytes(buffer, 0, size);
-					fileStream.write(convertedBytes, 0, convertedBytes.length);
-				}
-
-				fileStream.close();
-				if (status == null)
-					return;
-				status.setAttribute(DE.A_SOURCE, "success"); //$NON-NLS-1$
-				_dataStore.refresh(status.getParent());
-			}
-			catch (IOException e)
-			{
-				_dataStore.trace(e);
-				if (status == null)
-					return;
-				status.setAttribute(DE.A_VALUE, FILEMSG_REMOTE_SAVE_FAILED);
-				status.setAttribute(DE.A_SOURCE, "failed"); //$NON-NLS-1$
-				_dataStore.refresh(status.getParent());
-			}
-			catch (Exception e)
-			{
-				_dataStore.trace(e);
-				if (status == null)
-					return;
-				status.setAttribute(DE.A_VALUE, FILEMSG_REMOTE_SAVE_FAILED);
-				status.setAttribute(DE.A_SOURCE, "failed"); //$NON-NLS-1$
-				_dataStore.refresh(status.getParent());
-			}
-		}
-	}
-
-	/**
-	 * Append a bytes to a file at a specified location. This method is called by the
-	 * DataStore when the communication layer receives a file transfer append.      
-	 *
-	 * @param remotePath the path where to save the file
-	 * @param buffer the bytes to append in the file
-	 * @param size the number of bytes to append in the file
-	 * @param binary indicates whether to save the bytes as binary or text
-	 */
-	public void receiveAppendedBytes(String remotePath, byte[] buffer, int size, boolean binary)
-	{
-		remotePath = new String(remotePath.replace('\\', '/'));
-		DataElement status = findStatusFor(remotePath);
-		String fileName = _dataStore.mapToLocalPath(remotePath);
-
-		if (fileName != null)
-		{
-			_dataStore.trace("Receiving Appended Bytes for " + fileName); //$NON-NLS-1$
-			try
-			{
-				// need to create directories as well
-				File file = new File(fileName);
-				if (!file.exists())
-				{
-					File parent = new File(file.getParent());
-					parent.mkdirs();
-
-					File newFile = new File(fileName);
-					FileOutputStream fileStream = new FileOutputStream(newFile);
-
-					if (binary)
-					{
-						fileStream.write(buffer, 0, size);
-					}
-					else
-					{
-						IByteConverter byteConverter = _dataStore.getByteConverter();
-						byteConverter.setContext(file);
-					
-						byte[] convertedBytes = byteConverter.convertClientBytesToHostBytes(buffer, 0, size);
-						fileStream.write(convertedBytes, 0, convertedBytes.length);
-					}
-
-					fileStream.close();
-				}
-				else
-				{
-					FileOutputStream outStream = new FileOutputStream(fileName, true);
-					
-					if (binary) 
-					{
-						outStream.write(buffer, 0, size);
-					}
-					else 
-					{
-						IByteConverter byteConverter = _dataStore.getByteConverter();
-						byteConverter.setContext(file);
-						byte[] convertedBytes = byteConverter.convertClientBytesToHostBytes(buffer, 0, size);
-						outStream.write(convertedBytes, 0, convertedBytes.length);
-					}
-					
-					outStream.close();
-
-				}
-				if (status == null)
-					return;
-				status.setAttribute(DE.A_SOURCE, "success"); //$NON-NLS-1$
-				_dataStore.refresh(status.getParent());
-			}
-			catch (IOException e)
-			{
-				_dataStore.trace(e);
-				if (status == null)
-					return;
-				status.setAttribute(DE.A_VALUE, FILEMSG_REMOTE_SAVE_FAILED);
-				status.setAttribute(DE.A_SOURCE, "failed"); //$NON-NLS-1$
-				_dataStore.refresh(status.getParent());
-			}
-		}
-	}
-
-	
-
-	/**
-	 * Called by <code>sendBytes</code> to either save the bytes to a local file or transmit
-	 * them to a remote file.
-	 * @param path the path of the file
-	 * @param bytes the bytes of the file
-	 * @param size the size of the file
-	 * @param binary indicates whether the bytes are to be sent as binary or text
-	 */
-	protected void internalSendBytes(String path, byte[] bytes, int size, boolean binary)
-	{
-		if (_dataStore.isVirtual())
-		{
-			_dataStore.replaceFile(path, bytes, size, binary);
-		}
-		else
-		{
-			_dataStore.updateFile(path, bytes, size, binary);
-		}
-	}
-
-	/**
-	 * Called by <code>sendBytes</code> to either append the bytes to a local file or transmit
-	 * them and append them to a remote file.
-	 * @param path the path of the file
-	 * @param bytes the bytes of the file
-	 * @param size the size of the file
-	 * @param binary indicates whether the bytes are to be sent as binary or text
-	 */
-	protected void internalSendAppendBytes(String path, byte[] bytes, int size, boolean binary)
-	{
-		if (_dataStore.isVirtual())
-		{
-			_dataStore.replaceAppendFile(path, bytes, size, binary);
-		}
-		else
-		{
-			_dataStore.updateAppendFile(path, bytes, size, binary);
-		}
-	}
-
-	protected DataElement findStatusFor(String remotePath)
-	{
-		if (_log != null)
-		{
-			for (int i = 0; i < _log.getNestedSize(); i++)
-			{
-				DataElement child = _log.get(i);
-				if (child.getName().equals(remotePath))
-				{
-					return child;
-				}
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandlerRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandlerRegistry.java
deleted file mode 100644
index 4ac32787b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ByteStreamHandlerRegistry.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-import java.util.HashMap;
-
-/**
- * Stores the set of registered byte stream handlers using the handler id
- * as the key.  Whenever a bytestream operation is required (i.e. for a save of bytes)
- * The appropriate byte stream handler is retrieved via the specified id.
- * If no such handler exists, then the default byte stream handler is returned.
- * 
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class ByteStreamHandlerRegistry
-{
-	private HashMap _map;
-	private IByteStreamHandler _default;
-	public ByteStreamHandlerRegistry()
-	{
-		_map = new HashMap();
-	}
-	
-	/**
-	 * Registers the default byte stream handler
-	 * @param handler the default byte stream handler
-	 */
-	public void setDefaultByteStreamHandler(IByteStreamHandler handler)
-	{
-		_default = handler;
-		_map.put(DataStoreResources.DEFAULT_BYTESTREAMHANDLER, handler);
-		registerByteStreamHandler(handler);
-	}
-	
-	/**
-	 * Registers a byte stream handler. 
-	 * @param handler the handler to register
-	 */
-	public void registerByteStreamHandler(IByteStreamHandler handler)
-	{
-		_map.put(handler.getId(), handler);
-	}
-	
-	/**
-	 * Returns the byte stream handler with the specified id.
-	 * If "default" is specified or no such id has been registered, 
-	 * the default byte stream handler is returned.
-	 * @param id the id of the byte stream handler
-	 * @return the byte stream handler
-	 */
-	public IByteStreamHandler getByteStreamHandler(String id)
-	{
-		IByteStreamHandler handler = (IByteStreamHandler)_map.get(id);
-		if (handler == null)
-		{
-			handler = _default;
-		}
-		return handler;
-	}
-	
-	/**
-	 * Returns the default byte stream handler
-	 * @return the default
-	 */
-	public IByteStreamHandler getDefault()
-	{
-		return _default;
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Client.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Client.java
deleted file mode 100644
index 9c7ffee94..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Client.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: Noriaki Takatsu and Masao Nishimoto
- *
- * Contributors:
- *  Noriaki Takatsu    (IBM)   [220126] [dstore][api][breaking] Single process server for multiple clients
- *  Jacob Garcowski    (IBM)   [225175] [dstore] [dstore] error handling change for Client
- *  David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- *  David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-import org.eclipse.dstore.core.server.IServerLogger;
-import org.eclipse.dstore.core.server.ServerReceiver;
-
-/**
- * A DStore Client representing a user's connection in the multi-process
- * dstore server.
- * @noextend This class is not intended to be subclassed by clients.
- * @since 3.0
- */
-public class Client
-{
-	public  String _userid;
-	private IServerLogger _logger;
-	protected ServerReceiver _receiver;
-
-	public void setUserid(String userid)
-    {
-    	_userid = userid;
-    }
-
-	public String getUserid()
-	{
-		return _userid;
-	}
-
-	public void setLogger(IServerLogger logger)
-	{
-		_logger = logger;
-	}
-
-	public IServerLogger getLogger()
-	{
-		return _logger;
-	}
-
-	public String getProperty(String key)
-	{
-		return System.getProperty(key);
-	}
-
-	 public void disconnectServerReceiver()
-	 {
-	  if (_receiver != null)
-	   _receiver.finish();
-	 }
-
-	 public void setServerReceiver(ServerReceiver receiver)
-	 {
-	  _receiver = receiver;
-	 }
-}
-
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java
deleted file mode 100644
index 3a9e72e9d..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/CommandHandler.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.util.CommandGenerator;
-
-/**
- * <p>
- * Abstract class for handling commands. A <code>CommandHandler</code> is a
- * <code>Handler</code> that contains a queue of commands to be sent to miners.
- * Each DataStore instance uses a single command handler that periodically sends
- * it's queue either to a server or directly to miners.
- * </p>
- * <p>
- * The CommandHandler is the means by which the DataStore sends information or
- * files from the client to the remote tools.
- * </p>
- *
- * @noextend This class is not intended to be subclassed by clients.
- */
-public abstract class CommandHandler extends Handler
-{
-
-	protected ArrayList _commands;
-	protected ArrayList _classesToSend;
-
-	private CommandGenerator _commandGenerator;
-
-	/**
-	 * Constructor
-	 */
-	public CommandHandler()
-	{
-		super();
-		 setName("DStore CommandHandler"+getName()); //$NON-NLS-1$
-		_commands = new ArrayList();
-		_classesToSend = new ArrayList();
-		_commandGenerator = new CommandGenerator();
-	}
-
-	/**
-	 * Sets the associated DataStore
-	 */
-	public void setDataStore(DataStore dataStore)
-	{
-		super.setDataStore(dataStore);
-		_commandGenerator.setDataStore(dataStore);
-	}
-
-	/**
-	 * Returns the associated DataStore
-	 * @return the associated DataStore
-	 */
-	public DataStore getDataStore()
-	{
-		return _dataStore;
-	}
-
-	/**
-	 * Adds a command object to the queue
-	 * @param command the command to add to the queue
-	 * @param immediate indicates whether the command should be inserted first in the queue
-	 * 			or whether it should be appended.
-	 */
-	public void addCommand(DataElement command, boolean immediate)
-	{
-		synchronized (_commands)
-		{
-			if (!_commands.contains(command))
-			{
-				if (immediate)
-				{
-					_commands.add(0, command);
-				}
-				else
-				{
-					_commands.add(command);
-				}
-			}
-		}
-		notifyInput();
-	}
-
-	/**
-	 * Periodically called to send commands from the queue.
-	 */
-	public void handle()
-	{
-		if (!_commands.isEmpty() || !_classesToSend.isEmpty())
-		{
-			sendCommands();
-		}
-	}
-
-	/**
-	 * Create and add a new command object to the command queue.
-	 *
-	 * @param commandDescriptor the descriptor for the new command
-	 * @param arguments the arguments for the command
-	 * @param object the subject of the command
-	 * @param refArg indicates whether the subject should be represented in the command as a
-	 * 			reference to the subject or the actual subject, itself
-	 * @param immediate indicates whether the command should be first in the queue or appended to it
-	 * @return the status object of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, ArrayList arguments, DataElement object, boolean refArg, boolean immediate)
-	{
-		DataElement command = _commandGenerator.generateCommand(commandDescriptor, arguments, object, refArg);
-		return command(command, immediate);
-	}
-
-	/**
-	 * Create and add a new command object to the command queue.
-	 *
-	 * @param commandDescriptor the descriptor for the new command
-	 * @param arg the arg for the command
-	 * @param object the subject of the command
-	 * @param refArg indicates whether the subject should be represented in the command as a
-	 * 			reference to the subject or the actual subject, itself
-	 * @param immediate indicates whether the command should be first in the queue or appended to it
-	 * @return the status object of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, DataElement arg, DataElement object, boolean refArg, boolean immediate)
-	{
-		DataElement command = _commandGenerator.generateCommand(commandDescriptor, arg, object, refArg);
-		return command(command, immediate);
-	}
-
-	/**
-	 * Create and add a new command object to the command queue.
-	 *
-	 * @param commandDescriptor the descriptor for the new command
-	 * @param object the subject of the command
-	 * @param refArg indicates whether the subject should be represented in the command as a
-	 * 			reference to the subject or the actual subject, itself
-	 * @return the status object of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, DataElement object, boolean refArg)
-	{
-		DataElement command = _commandGenerator.generateCommand(commandDescriptor, object, refArg);
-		return command(command);
-	}
-
-	/**
-	 * Add a command object to the command queue
-	 * @param cmd the command object to add to the queue
-	 * @return the status object of the command
-	 */
-	public DataElement command(DataElement cmd)
-	{
-		return command(cmd, false);
-	}
-
-	/**
-	 * Add a command object to the command queue
-	 * @param cmd the command object to add to the queue
-	 * @param immediate indicates whether the command is to be inserted first in the queue or appended
-	 * @return the status object of the command
-	 */
-	public DataElement command(DataElement cmd, boolean immediate)
-	{
-		DataElement status = null;
-		if ((cmd != null) && _dataStore != null)
-		{
-
-			status = cmd.get(cmd.getNestedSize() -1);
-			if (status != null && !status.getName().equals(DataStoreResources.model_done))
-			{
-				addCommand(cmd, immediate);
-			}
-		}
-
-		return status;
-	}
-
-	/**
-	 * Removes and affectively cancels all commands from the current queue of commands
-	 */
-	public synchronized void cancelAllCommands()
-	{
-		DataElement log = _dataStore.getLogRoot();
-		for (int i = 0; i < _commands.size(); i++)
-		{
-			log.removeNestedData((DataElement) _commands.get(i));
-		}
-
-		_commands.clear();
-	}
-
-	/**
-	 * @since 3.0 CommandGenerator moved from "internal" to API
-	 */
-	public CommandGenerator getCommandGenerator()
-	{
-		return _commandGenerator;
-	}
-
-	/**
-	 * Implemented to provide the means by which commands in the queue are sent
-	 */
-	public abstract void sendCommands();
-
-
-	/**
-	 * Implemented to provide the means by which file bytes are sent
-	 * @param fileName the name of the file to send
-	 * @param bytes to bytes of the file to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or text
-	 */
-	public abstract void sendFile(String fileName, byte[] bytes, int size, boolean binary);
-
-
-	/**
-	 * Implemented to provide the means by which file bytes are sent
-	 * @param fileName the name of the file to send
-	 * @param bytes to bytes of the file to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or text
-	 * @param byteStreamHandlerId indicates which byte stream handler to receive the bytes with
-	 */
-	public abstract void sendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId);
-
-	/**
-	 * Implemented to provide the means by which file bytes are sent and appended
-	 * @param fileName the name of the file to send
-	 * @param bytes to bytes of the file to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or text
-	 */
-	public abstract void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary);
-
-	/**
-	 * Implemented to provide the means by which file bytes are sent and appended
-	 * @param fileName the name of the file to send
-	 * @param bytes to bytes of the file to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or text
-	 * @param byteStreamHandlerId indicates which byte stream handler to receive the bytes with
-	 */
-	public abstract void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId);
-
-	/**
-	 * Implemented to provide the means by which classes are sent
-	 * across the comm channel.
-	 * @param className the name of the class to send
-	 */
-	public abstract void sendClass(String className);
-
-	/**
-	 * Implemented to provide the means by which classes are sent
-	 * across the comm channel.
-	 * @param className the name of the class to send
-	 * @param classByteStreamHandlerId indicates which class byte stream handler to receive the class with
-	 */
-	public abstract void sendClass(String className, String classByteStreamHandlerId);
-
-
-	/**
-	 * Runs the specified class on the remote system
-	 */
-	public abstract void sendClassInstance(IRemoteClassInstance runnable, String classByteStreamHandlerId);
-
-
-	/**
-	 * Causes the current thread to wait until this class request has been
-	 * fulfilled.
-	 */
-	public synchronized void waitForInput()
-	{
-		if (_commands.size() == 0 && _classesToSend.size() == 0)
-		{
-			super.waitForInput();
-		}
-	}
-
-	/**
-	 * Implemented to provide the means by which classes are requested
-	 * across the comm channel.
-	 * @param className the name of the class to request
-	 */
-	public abstract void requestClass(String className);
-
-	public abstract void sendKeepAliveConfirmation();
-
-	public abstract void sendKeepAliveRequest();
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DE.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DE.java
deleted file mode 100644
index 0c9496282..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DE.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-/**
- * DE is a container of <code>DataElement</code> constants.  These constants
- * are used to identify <code>DataElement</code> attributes.
- * 
- * <li>
- * Attributes beginning with "P_" indicate <I>property</I> attribute identifiers.
- * </li>
- * <li>
- * Attributes beginning with "T_" indicate <code>DataElement</code> <I>type</I> attributes.
- * </li>
- * <li>
- * Attributes beginning with "A_" indicate <code>DataElement</code> indexs into <I>attributes</I>.
- * </li>
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class DE 	     
-{
-
-
-    /*
-     * The nested data (children) property identifier of a <code>DataElement</code>.
-     */
-    public static final String P_CHILDREN = "children"; //$NON-NLS-1$
-
-    /*
-     * The image property identifier of a <code>DataElement</code>.  This is the same
-     * as the value property identifier
-     */
-    public static final String P_LABEL = "label"; //$NON-NLS-1$
-
-    /*
-     * The notifier property identifier of a <code>DataElement</code>.
-     */
-    public static final String P_NOTIFIER = "notifier"; //$NON-NLS-1$
-
-    /*
-     * The <code>DataStore</code> property identifier of a <code>DataElement</code>.
-     */
-    public static final String P_DATASTORE       = "dataStore"; //$NON-NLS-1$
-
-    /*
-     * The source name property identifier of a <code>DataElement</code>.  This is the
-     * name of a source location if one exists.
-     */
-    public static final String P_SOURCE_NAME     = "source"; //$NON-NLS-1$
-
-    /*
-     * The source file property identifier of a <code>DataElement</code>.
-     */
-    public static final String P_SOURCE          = "sourcefile"; //$NON-NLS-1$
-
-    /*
-     * The source location property identifier of a <code>DataElement</code>.
-     */
-    public static final String P_SOURCE_LOCATION = "sourcelocation"; //$NON-NLS-1$
-
-    public static final String P_SOURCE_LOCATION_COLUMN = "sourcelocationcolumn"; //$NON-NLS-1$
-
-    /*
-     * The nested data (children) property identifier of a <code>DataElement</code>.  Same as <code>P_CHILDREN</code>.
-     */
-    public static final String P_NESTED          = "nested"; //$NON-NLS-1$
-
-    /*
-     * The buffer property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_BUFFER          = "buffer"; //$NON-NLS-1$
-
-    /*
-     * The type property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_TYPE            = "type"; //$NON-NLS-1$
-
-    /*
-     * The id property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_ID              = "id"; //$NON-NLS-1$
-
-    /*
-     * The name property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_NAME            = "name"; //$NON-NLS-1$
-
-    /*
-     * The value property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_VALUE           = "value"; //$NON-NLS-1$
-
-    /*
-     * The <I>is reference?</I> property identifier of a <code>DataElement</code>. Deprecated. Use P_REF_TYPE.  
-     */
-    public static final String P_ISREF           = "isRef"; //$NON-NLS-1$
-    
-    /*
-     * The <I>is reference?</I> property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_REF_TYPE           = "refType"; //$NON-NLS-1$
-
-    /*
-     * The visibility property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_DEPTH           = "depth"; //$NON-NLS-1$
-
-    /*
-     * The attributes property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_ATTRIBUTES      = "attribute"; //$NON-NLS-1$
-
-    /*
-     * The file property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_FILE            = "file"; //$NON-NLS-1$
-
-    /*
-     * The file property identifier of a <code>DataElement</code>.  
-     */
-    public static final String P_DESCRIPTOR      = "descriptor"; //$NON-NLS-1$
-
-    /*
-     * Reference type.  
-     */
-    public static final String T_REFERENCE          = "reference"; //$NON-NLS-1$
-
-    /*
-     * Command type.  
-     */
-    public static final String T_COMMAND            = "command"; //$NON-NLS-1$
-
-    /*
-     * UI Command Descriptor type.  
-     */
-    public static final String T_UI_COMMAND_DESCRIPTOR  = "ui_commanddescriptor"; //$NON-NLS-1$
-
-    /*
-     * Object Descriptor type.  
-     */
-    public static final String T_OBJECT_DESCRIPTOR  = "objectdescriptor"; //$NON-NLS-1$
-
-    /*
-     * Command Descriptor type.  
-     */
-    public static final String T_COMMAND_DESCRIPTOR = "commanddescriptor"; //$NON-NLS-1$
-
-    /*
-     * Relation Descriptor type.  
-     */
-    public static final String T_RELATION_DESCRIPTOR = "relationdescriptor"; //$NON-NLS-1$
-
-    /*
-     * Abstract Object Descriptor type.  
-     */
-    public static final String T_ABSTRACT_OBJECT_DESCRIPTOR = "abstractobjectdescriptor"; //$NON-NLS-1$
-
-    /*
-     * Abstract Command Descriptor type.  
-     */
-    public static final String T_ABSTRACT_COMMAND_DESCRIPTOR = "abstractcommanddescriptor"; //$NON-NLS-1$
-
-    /*
-     * Abstract Relation Descriptor type.  
-     */
-    public static final String T_ABSTRACT_RELATION_DESCRIPTOR = "abstractrelationdescriptor"; //$NON-NLS-1$
-
-
-    /*
-     * Type attribute index.  
-     */
-    public static final int    A_TYPE       = 0;
-
-    /*
-     * ID attribute index.  
-     */
-    public static final int    A_ID         = 1;
-
-    /*
-     * Name attribute index.  
-     */
-    public static final int    A_NAME       = 2;
-
-    /*
-     * Value attribute index.  
-     */
-    public static final int    A_VALUE      = 3;
-
-    /*
-     * Source attribute index.  
-     */
-    public static final int    A_SOURCE     = 4;
-    
-    /*
-     * Source location attribute index.   
-     */
-    public static final int    A_SOURCE_LOCATION     = 5;
-
-    /*
-     * IsRef attribute index. Deprecated. Use A_REF_TYPE. 
-     */
-    public static final int    A_ISREF      = 6;
-    
-    /*
-     * RefType attribute index.  
-     */
-    public static final int    A_REF_TYPE   = 6;
-
-    /*
-     * Visibility attribute index.  
-     */
-    public static final int    A_DEPTH      = 7;
-
-    /*
-     * Size attribute index.  
-     */
-    public static final int    A_SIZE       = 8;
-    
-    public static final  String ENCODING_UTF_8 = "UTF-8"; //$NON-NLS-1$
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
deleted file mode 100644
index 1feb25abb..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
+++ /dev/null
@@ -1,1687 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.dstore.core.util.StringCompare;
-import org.eclipse.dstore.extra.IDataElement;
-import org.eclipse.dstore.internal.core.util.DataElementRemover;
-import org.eclipse.dstore.internal.extra.DataElementActionFilter;
-import org.eclipse.dstore.internal.extra.DesktopElement;
-import org.eclipse.dstore.internal.extra.PropertySource;
-
-/**
- * <code>DataElement</code> is the unit of information for the <code>DataStore</code>.  All objects including
- * schema descriptors, commands and instance objects are represented by <code>DataElement</code>s.
- * <code>DataElement</code>s should not be constructed directly, rather they are requested via the createObject()
- * method in <code>DataStore</code>
- *
- * @noinstantiate This class is not intended to be instantiated by clients.  DataElements
- * should be created via the DataStore create methods.
- */
-public final class DataElement implements IDataElement
-{
-
-
-	private String _attributes[];
-	private StringBuffer _buffer;
-
-	private boolean _isReference = false;
-	private boolean _isDescriptor = false;
-	private boolean _isExpanded = false;
-	private boolean _isUpdated = false;
-	private boolean _isPendingTransfer = false;
-	private boolean _isSpirit = false;
-	
-	private int _depth = 1;
-
-	private DataStore _dataStore = null;
-	private DataElement _parent = null;
-	private DataElement _descriptor = null;
-
-	private ArrayList _nestedData = null;
-	private DataElement _referencedObject = null;
-
-	private PropertySource _propertySource = null;
-
-
-	/**
-	 * Creates a new <code>DataElement</code> without initializing it.
-	 *
-	 */
-	public DataElement()
-	{
-		_dataStore = null;
-		_parent = null;
-		DataElementRemover.addToCreatedCount();
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code> without initializing it.
-	 *
-	 * @param dataStore the owner <code>DataStore</code> for this element
-	 */
-	protected DataElement(DataStore dataStore)
-	{
-		_dataStore = dataStore;
-		_parent = null;
-		DataElementRemover.addToCreatedCount();
-	}
-	
-	protected void finalize()
-	{
-		DataElementRemover.addToGCedCount();
-	}
-
-	/**
-	 * Initializes a <code>DataElement</code> to be reference to some other <code>DataElement</code>.  
-	 * This method should only be called from the <code>DataStore</code>.
-	 *
-	 * @param parent the element that contains this reference
-	 * @param originalObject the element that gets referenced
-	 * @param refType the type descriptor of the reference
-	 */
-	public void reInit(DataElement parent, DataElement originalObject, DataElement refType)
-	{
-		if ((parent != null) && (originalObject != null))
-		{
-			_parent = parent;
-
-			_attributes = getAttributes();
-			String type = refType.getName();
-			_attributes[DE.A_TYPE] = type;
-			
-			String originalId = originalObject.getId();
-			StringBuffer idBuf = new StringBuffer(parent.getId());
-			idBuf.append(type);
-			idBuf.append(originalId);
-			_attributes[DE.A_ID] = idBuf.toString();
-			_attributes[DE.A_NAME] = originalId;
-			_attributes[DE.A_VALUE] = originalId;
-
-			initialize(refType);
-
-			_referencedObject = originalObject;
-			_isReference = true;
-		}
-	}
-
-	/**
-	 * Initializes a <code>DataElement</code> to be reference to some other <code>DataElement</code> 
-	 * This method should only be called from the <code>DataStore</code>.
-	 *
-	 * @param parent the element that contains this reference
-	 * @param originalObject the element that gets referenced
-	 * @param refType the a string representing the type of reference
-	 */
-	public void reInit(DataElement parent, DataElement originalObject, String refType)
-	{
-		if ((parent != null) && (originalObject != null))
-		{
-			_parent = parent;
-
-			_attributes = getAttributes();
-			_attributes[DE.A_TYPE] = refType;
-			
-			String originalId = originalObject.getId();
-			StringBuffer idBuf = new StringBuffer(parent.getId());
-			idBuf.append(refType);
-			idBuf.append(originalId);
-			
-			_attributes[DE.A_ID] = idBuf.toString();
-			_attributes[DE.A_NAME] = originalId;
-			_attributes[DE.A_VALUE] = originalId;
-
-			initialize();
-
-			_referencedObject = originalObject;
-			_isReference = true;
-		}
-	}
-
-	/**
-	 * Initializes a <code>DataElement</code> 
-	 * This method should only be called from the <code>DataStore</code>.
-	 *
-	 * @param parent the parent of the element
-	 * @param type the type descriptor of the element
-	 * @param id the ID of the element
-	 * @param name the name of the element
-	 * @param source the source location of the element
-	 */
-	public void reInit(DataElement parent, DataElement type, String id, String name, String source)
-	{
-		_parent = parent;
-
-		_attributes = getAttributes();
-		_attributes[DE.A_TYPE] = type.getAttribute(DE.A_NAME);
-		_attributes[DE.A_ID] = id;
-		_attributes[DE.A_NAME] = name;
-		_attributes[DE.A_VALUE] = name;
-		_attributes[DE.A_SOURCE] = source;
-
-		initialize(type);
-	}
-
-	/**
-	 * Initializes a <code>DataElement</code> 
-	 * This method should only be called from the <code>DataStore</code>.
-	 *
-	 * @param parent the parent of the element
-	 * @param type a string representing the type descriptor of the element
-	 * @param id the ID of the element
-	 * @param name the name of the element
-	 * @param source the source location of the element
-	 */
-	public void reInit(DataElement parent, String type, String id, String name, String source)
-	{
-		_parent = parent;
-
-		_attributes = getAttributes();
-		_attributes[DE.A_TYPE] = type;
-		_attributes[DE.A_ID] = id;
-		_attributes[DE.A_NAME] = name;
-		_attributes[DE.A_VALUE] = name;
-		_attributes[DE.A_SOURCE] = source;
-
-		initialize();
-	}
-
-	/**
-	 * Initializes a <code>DataElement</code> 
-	 * This method should only be called from the <code>DataStore</code>.
-	 *
-	 * @param parent the parent of the element
-	 * @param type the type descriptor of the element
-	 * @param id the ID of the element
-	 * @param name the name of the element
-	 * @param source the source location of the element
-	 * @param isRef an indication of whether the element is a reference or not
-	 */
-	public void reInit(DataElement parent, DataElement type, String id, String name, String source, boolean isRef)
-	{
-		_parent = parent;
-
-		_attributes = getAttributes();
-		_attributes[DE.A_TYPE] = type.getAttribute(DE.A_NAME);
-		_attributes[DE.A_ID] = id;
-		_attributes[DE.A_NAME] = name;
-		_attributes[DE.A_VALUE] = name;
-		_attributes[DE.A_SOURCE] = source;
-
-		initialize(type);
-		_isReference = isRef;
-	}
-
-	/**
-	 * Initializes a <code>DataElement</code> 
-	 * This method should only be called from the <code>DataStore</code>.
-	 *
-	 * @param parent the parent of the element
-	 * @param type a string representing the type descriptor of the element
-	 * @param id the ID of the element
-	 * @param name the name of the element
-	 * @param source the source location of the element
-	 * @param isRef an indication of whether the element is a reference or not
-	 */
-	public void reInit(DataElement parent, String type, String id, String name, String source, boolean isRef)
-	{
-		_parent = parent;
-
-		_attributes = getAttributes();
-		_attributes[DE.A_TYPE] = type;
-		_attributes[DE.A_ID] = id;
-		_attributes[DE.A_NAME] = name;
-		_attributes[DE.A_VALUE] = name;
-		_attributes[DE.A_SOURCE] = source;
-
-		initialize();
-		_isReference = isRef;
-	}
-
-	/**
-	 * Initializes a <code>DataElement</code> 
-	 * This method should only be called from the <code>DataStore</code>.
-	 *
-	 * @param parent the parent of the element
-	 * @param type the type descriptor of the element
-	 * @param attributes the attributes for this element (name, source, id, etc.) 
-	 */
-	public void reInit(DataElement parent, DataElement type, String[] attributes)
-	{
-		_parent = parent;
-
-		_attributes = attributes;
-		_attributes[DE.A_TYPE] = type.getName();
-
-		initialize(type);
-	}
-
-	/**
-	 * Initializes a <code>DataElement</code> 
-	 * This method should only be called from the <code>DataStore</code>.
-	 *
-	 * @param parent the parent of the element
-	 * @param attributes the attributes for this element (type, name, source, id, etc.) 
-	 */
-	public void reInit(DataElement parent, String[] attributes)
-	{
-		_parent = parent;
-
-		_attributes = attributes;
-
-		initialize();
-	}
-	
-	public void reInitAsTransient(String attributes[])
-	{
-		_attributes = attributes;
-		
-		_isReference = false;
-		_isDescriptor = false;
-		_depth = 1;
-
-		_referencedObject = null;
-		_isExpanded = false;
-		_isUpdated = false;
-		
-		String depthStr = getAttribute(DE.A_DEPTH);
-		if (depthStr != null && depthStr.length() > 0)
-		{
-			if (!depthStr.equals("1")) //$NON-NLS-1$
-			{
-				try
-				{
-					_depth = Integer.parseInt(depthStr);
-				}
-				catch (Exception e)
-				{
-				}
-			}
-		}
-		
-		if (_nestedData != null)
-			_nestedData.clear();
-	}
-
-	/**
-	 * Indicates whether the <code>DataElement</code> is deleted or not.
-	 *
-	 * @return whehther the element is deleted or not
-	 */
-	public boolean isDeleted()
-	{
-		if (_attributes == null)
-		{
-			return true;
-		}
-
-		String valueAttribute = getAttribute(DE.A_VALUE);
-
-		if (valueAttribute != null && valueAttribute.equals(DataStoreResources.DELETED))
-		{
-			return true;
-		}
-		
-		if (_isSpirit && !_dataStore.isVirtual())
-		{
-			return true; 
-		}
-		
-		return false;
-	}
-
-	/**
-	 * Adds a set of elements as children to this element.
-	 *
-	 * @param nestedData a set of elements to add to this element 
-	 * @param checkUnique whether to prevent duplicates from being added
-	 */
-	public synchronized void addNestedData(List nestedData, boolean checkUnique)
-	{
-		if (nestedData != null)
-		{
-			if (_nestedData == null)
-			{
-				_nestedData = new ArrayList(nestedData.size());
-			}
-
-			for (int i = 0; i < nestedData.size(); i++)
-			{
-				DataElement child = (DataElement) nestedData.get(i);
-				if (child != null && child != this)
-				{
-					addNestedData(child, checkUnique);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Adds another element as a child to this element.
-	 *
-	 * @param obj the element to add 
-	 * @param checkUnique whether to prevent duplicates from being added
-	 */
-	public synchronized void addNestedData(DataElement obj, boolean checkUnique)
-	{
-		if (_nestedData == null)
-		{
-			_nestedData = new ArrayList(4);
-		}
-
-		synchronized (_nestedData)
-		{
-			boolean alreadyThere = false;
-			if (checkUnique)
-			{
-				alreadyThere = _nestedData.contains(obj);
-			}
-
-			if (!checkUnique || !alreadyThere)
-			{
-				if (alreadyThere)
-				{
-					return;
-				}
-				else
-				{
-					_nestedData.add(obj);
-
-					if (obj.getParent() == null)
-						obj.setParent(this);
-				}
-			}
-
-			_isUpdated = false;
-			obj.setUpdated(false);
-		}
-	}
-
-	/**
-	 * Removes a specified child element from this element.
-	 *
-	 * @param object the element to remove 
-	 */
-	public synchronized void removeNestedData(DataElement object)
-	{
-		if (_nestedData != null)
-		{
-			synchronized(_nestedData)
-			{
-				_nestedData.remove(object);				
-			}
-		}
-		_isExpanded = false;
-		_isUpdated = false;
-	}
-
-	/**
-	 * Removes all the children from this element.
-	 */
-	public synchronized void removeNestedData()
-	{
-		if (_nestedData != null)
-		{
-			synchronized (_nestedData)
-			{
-				while (_nestedData.size() > 0)
-				{
-					DataElement nestedObject = (DataElement) _nestedData.get(0);
-					_nestedData.remove(nestedObject);
-				}
-			}
-		}
-
-		_isExpanded = false;
-		_isUpdated = false;
-	}
-
-	/**
-	 * Returns an attribute of this element.
-	 *
-	 * @param attributeIndex the index of the element 
-	 * @return the attribute 
-	 */
-	public String getAttribute(int attributeIndex)
-	{
-		if (_attributes == null)
-			return ""; //$NON-NLS-1$
-		return _attributes[attributeIndex];
-	}
-
-	/**
-	 * Returns the set of attributes for this element.
-	 *
-	 * @return the set of attributes 
-	 */
-	public String[] getAttributes()
-	{
-		if (_attributes == null)
-		{
-			return new String[DE.A_SIZE];
-		}
-		return _attributes;
-	}
-
-	/**
-	 * Returns the type attribute for this element.
-	 *
-	 * @return the type attribute 
-	 */
-	public String getType()
-	{
-		return getAttribute(DE.A_TYPE);
-	}
-
-	/**
-	 * Returns the ID attribute for this element.
-	 *
-	 * @return the ID attribute 
-	 */
-	public String getId()
-	{
-		return getAttribute(DE.A_ID);
-	}
-
-	/**
-	 * Returns the name attribute for this element.
-	 *
-	 * @return the name attribute 
-	 */
-	public String getName()
-	{
-		return getAttribute(DE.A_NAME);
-	}
-
-	/**
-	 * Returns the value attribute for this element.
-	 *
-	 * @return the value attribute 
-	 */
-	public String getValue()
-	{
-		return getAttribute(DE.A_VALUE);
-	}
-
-	/**
-	 * Returns the source attribute for this element.
-	 *
-	 * @return the source attribute 
-	 */
-	public String getSource()
-	{
-		return getAttribute(DE.A_SOURCE);
-	}
-	
-	/**
-	 * Returns the buffer for this element.
-	 *
-	 * @return the buffer 
-	 */
-	public StringBuffer getBuffer()
-	{
-		return _buffer;
-	}
-
-	/**
-	 * Returns the <code>DataStore</code> for this element.
-	 *
-	 * @return the <code>DataStore</code> 
-	 */
-	public DataStore getDataStore()
-	{
-		return _dataStore;
-	}
-
-	/**
-	 * Initializes the children set of this element with a specified size.
-	 *
-	 * @param size the initial size 
-	 */
-	public void initializeNestedData(int size)
-	{
-		if (_nestedData == null)
-		{
-			_nestedData = new ArrayList(size);
-		}
-	}
-
-	/**
-	 * Returns the children of this element.
-	 *
-	 * @return the children of this element 
-	 */
-	public List getNestedData()
-	{
-		return _nestedData;
-	}
-
-	/**
-	 * Returns the child at the specified index.
-	 *
-	 * @param index the index of the child to retrieve 
-	 * @return the child element 
-	 */
-	public DataElement get(int index)
-	{
-		if (_nestedData == null)
-		{
-			return null;
-		}
-		else
-		{
-			if (getNestedSize() > index)
-			{
-				Object obj = _nestedData.get(index);
-				return (DataElement) obj;
-			}
-			else
-			{
-				return null;
-			}
-		}
-	}
-
-	/**
-	 * Returns the number of children this element contains.
-	 *
-	 * @return the number of children 
-	 */
-	public int getNestedSize()
-	{
-		if (_nestedData == null)
-		{
-			return 0;
-		}
-		else
-		{
-			return _nestedData.size();
-		}
-	}
-
-	/**
-	 * Returns the parent of this element.
-	 *
-	 * @return the parent 
-	 */
-	public DataElement getParent()
-	{
-		return _parent;
-	}
-
-	public boolean isDescriptor()
-	{
-		return _isDescriptor;
-	}
-
-	/**
-	 * Explicitly sets the type descriptor for this element.
-	 *
-	 * @param theDescriptor the type descriptor for this element 
-	 */
-	public void setDescriptor(DataElement theDescriptor)
-	{
-		_descriptor = theDescriptor;
-	}
-
-	/**
-	* Returns the type descriptor for this element.
-	*
-	* @return the type descriptor for this element 
-	*/
-	public DataElement getDescriptor()
-	{
-		if (isDeleted())
-		{
-			return null;
-		}
-
-		if (_isReference)
-		{
-			if (_referencedObject == null)
-			{
-				_referencedObject = dereference();
-			}
-			if (this == _referencedObject || _referencedObject.isDeleted())
-			{
-				_referencedObject = null;
-			}
-			else
-			{
-				return _referencedObject.getDescriptor();
-			}
-		}
-		else if ((_descriptor == null) && (_dataStore != null))
-		{
-			if (_isDescriptor)
-			{
-				_descriptor = _dataStore.findDescriptor(getAttribute(DE.A_TYPE), getName());
-			}
-			else
-			{
-				_descriptor = _dataStore.findObjectDescriptor(getAttribute(DE.A_TYPE));
-				if (_descriptor == null)
-				{
-					_descriptor = _dataStore.find(_dataStore.getDescriptorRoot(), DE.A_NAME, getAttribute(DE.A_TYPE), 3);
-				}
-			}
-		}
-
-		return _descriptor;
-	}
-
-
-	/**
-	 * Returns the visibility of this element.
-	 *
-	 * @return the level of visibility for this element 
-	 */
-	public int depth()
-	{
-		return _depth;
-	}
-
-	/**
-	 * Indicates whether this is a reference or not.
-	 *
-	 * @return whether this is a reference or not 
-	 */
-	public boolean isReference()
-	{
-		return _isReference;
-	}
-
-	/**
-	 * Indicates whether this element has been queried for it's children.
-	 *
-	 * @return whether element has been expanded 
-	 */
-	public boolean isExpanded()
-	{
-		return _isExpanded;
-	}
-
-	/**
-	 * Indicates whether this element has been updated yet. 
-	 * On a server, an element is updated if it has been transfered the the client.
-	 * On a client, an element is updated if a notification has been sent out for the ui
-	 *
-	 * @return whether element has been updated yet 
-	 */
-	public boolean isUpdated()
-	{
-		return _isUpdated;
-	}
-
-	/**
-	 * Indicates whether this element is pending a transfer 
-	 * If the element is queued to be sent, the value will be true.  
-	 *
-	 * @return whether element has been updated yet 
-	 */
-	public boolean isPendingTransfer()
-	{
-		return _isPendingTransfer;
-	}
-	
-	/**
-	 * Indicates whether this element is a 'spirit' element. 
-	 * In a client datastore, this means that the element's counterpart on the
-	 * server is either also a spirit (and will be deleted soon) or has already
-	 * been deleted. In a server datastore, this means that the element is
-	 * to be deleted at the next opportunity in order to free memory.
-	 */
-	public boolean isSpirit()
-	{
-		return _isSpirit;
-	}
-	
-	/**
-	 * Sets an attribute of the element. 
-	 *
-	 * @param attributeIndex the index of the attribute to set 
-	 * @param attribute the new value for the specified attribute 
-	 */
-	public void setAttribute(int attributeIndex, String attribute)
-	{
-		String nameAttribute = getAttribute(DE.A_NAME);
-		if ((attributeIndex == DE.A_NAME) && (nameAttribute != null && nameAttribute.equals(getAttribute(DE.A_VALUE))))
-		{
-			_attributes[DE.A_VALUE] = attribute;
-		}
-		else if (attributeIndex == DE.A_DEPTH)
-		{
-			if (attribute != null)					
-				_depth = Integer.parseInt(attribute);
-			else
-				_depth = 0;
-		}
-		else if (attributeIndex == DE.A_TYPE)
-		{
-			_descriptor = null;
-		}
-
-		_attributes[attributeIndex] = attribute;
-		_isUpdated = false;
-	}
-
-	/**
-	 * Sets all of the attributes of the element. 
-	 *
-	 * @param attributes the new set of attributes for the element 
-	 */
-	public void setAttributes(String attributes[])
-	{
-		for (int i = 0; i < DE.A_SIZE; i++)
-		{
-			if (attributes[i] != null)
-			{
-				setAttribute(i, attributes[i]);
-			}
-		}
-
-		_isUpdated = false;
-	}
-
-	/**
-	 * Sets the buffer for this element. 
-	 * The buffer is used if extra temporary information needs to be stored
-	 * with this element
-	 *
-	 * @param buffer the new buffer for this element 
-	 */
-	public void setBuffer(StringBuffer buffer)
-	{
-		_buffer = buffer;
-		if (_depth < 1 && buffer.length() > 0)
-		{
-			setDepth(1);
-		}
-
-		_isUpdated = false;
-	}
-
-	/**
-	 * Appends to the buffer for this element. 
-	 * The buffer is used if extra temporary information needs to be stored
-	 * with this element
-	 *
-	 * @param text text to append to the buffer 
-	 */
-	public void appendToBuffer(String text)
-	{
-		if (_buffer == null)
-		{
-			_buffer = new StringBuffer();
-		}
-		_buffer.append(text);
-		_isUpdated = false;
-	}
-
-	/**
-	 * Sets the expanded indication for this element. 
-	 *
-	 * @param flag whether the element is expanded or not 
-	 */
-	public void setExpanded(boolean flag)
-	{
-		_isExpanded = flag;
-	}
-
-	/**
-	 * Sets the updated indication for this element. 
-	 *
-	 * @param flag whether the element is updated or not 
-	 */
-	public void setUpdated(boolean flag)
-	{
-		_isUpdated = flag;
-	}
-	
-	/**
-	 * Sets indication of whether this element is waiting to be transferred.
-	 * If so, the updated flag should not be set to true
-	 * 
-	 * @param flag whether the element is waiting to be transferred
-	 */
-	public void setPendingTransfer(boolean flag)
-	{
-		_isPendingTransfer = flag;
-	}
-	
-	/**
-	 * Sets indication of whether this element is a 'spirit' element. 
-	 * In a client datastore, this means that the element's counterpart on the
-	 * server is either also a spirit (and will be deleted soon) or has already
-	 * been deleted. In a server datastore, this means that the element is
-	 * to be deleted at the next opportunity in order to free memory.
-	 */
-	public void setSpirit(boolean flag)
-	{
-		_isSpirit = flag;
-	}
-
-	/**
-	 * Sets the parent for this element. 
-	 *
-	 * @param parent the new parent 
-	 */
-	public void setParent(DataElement parent)
-	{
-		_parent = parent;
-	}
-
-	/**
-	 * Sets the <code>DataStore</code> for this element. 
-	 *
-	 * @param dataStore the new dataStore 
-	 */
-	public void setDataStore(DataStore dataStore)
-	{
-		_dataStore = dataStore;
-	}
-
-	/**
-	 * Sets the depth of visibility for this element. 
-	 *
-	 * @param depth the level of visibility 
-	 */
-	public void setDepth(int depth)
-	{
-		_depth = depth;
-		setAttribute(DE.A_DEPTH, "" + _depth); //$NON-NLS-1$
-		_isUpdated = false;
-		//_dataStore.refresh(this);
-	}
-
-	/**
-	 * Tests if this element is of the specified type. 
-	 *
-	 * @param typeStr a string representing the type descriptor to compare with 
-	 * @return whether the element is of the specified type
-	 */
-	public boolean isOfType(String typeStr)
-	{
-		DataElement typeDescriptor = _dataStore.find(_dataStore.getDescriptorRoot(), DE.A_NAME, typeStr, 1);
-		return isOfType(typeDescriptor);
-	}
-
-	/**
-	 * Tests if this element is of the specified type. 
-	 *
-	 * @param typeStr a string representing the type descriptor to compare with 
-	 * @return whether the element is of the specified type
-	 */
-	public boolean isOfType(String typeStr, boolean isDescriptor)
-	{
-		DataElement typeDescriptor = _dataStore.find(_dataStore.getDescriptorRoot(), DE.A_NAME, typeStr, 1);
-		return isOfType(typeDescriptor, isDescriptor);
-	}
-
-	/**
-	 * Tests if this element is of the specified type. 
-	 *
-	 * @param type the type descriptor to compare with 
-	 * @return whether the element is of the specified type
-	 */
-	public boolean isOfType(DataElement type)
-	{
-		return isOfType(type, false);
-	}
-
-	/**
-	 * Tests if this element is of the specified type. 
-	 *
-	 * @param type the type descriptor to compare with 
-	 * @param isDescriptor whehter this element is a descriptor or an instance object 
-	 * @return whether the element is of the specified type
-	 */
-	public boolean isOfType(DataElement type, boolean isDescriptor)
-	{
-		boolean result = false;
-
-		if (type == null)
-		{
-			return result;
-		}
-
-		DataElement descriptor = this;
-		if (!isDescriptor)
-		{
-			descriptor = getDescriptor();
-		}
-
-		if (descriptor == type)
-		{
-			return true;
-		}
-
-		if (descriptor != null && !descriptor.isDeleted())
-		{
-			String typeType = type.getType();
-			String typeName = type.getName();
-			if (typeType.equals(DE.T_OBJECT_DESCRIPTOR) || typeType.equals(DE.T_ABSTRACT_OBJECT_DESCRIPTOR))
-			{
-				if (descriptor.getName().equals(typeName) || (typeName.equals("all"))) //$NON-NLS-1$
-				{
-					result = true;
-					return result;
-				}
-			}
-
-			DataElement relationship = _dataStore.getAbstractedByRelation();
-			List abstracted = null;
-
-			if (relationship != null)
-			{
-				abstracted = descriptor.getAssociated(relationship);
-			}
-			if (abstracted != null)
-			{
-				for (int i = 0;(i < abstracted.size()) && !result; i++)
-				{
-					DataElement superDescriptor = (DataElement) abstracted.get(i);
-					result = superDescriptor.isOfType(type, true);
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests if this element matches the specified patterns. 
-	 *
-	 * @param attributes the attribute indexes to compare with 
-	 * @param patterns the values to compare the specified attributes with 
-	 * @param numAttributes the number of attributes to compare 
-	 * @param ignoreCase whether to ignore case or not 
-	 * @return whether the element matches the patterns
-	 */
-	public boolean patternMatch(int attributes[], String patterns[], int numAttributes, boolean ignoreCase)
-	{
-		int index = 0;
-		while (index < numAttributes)
-		{
-			String attribute = getAttribute(attributes[index]);
-			String pattern = patterns[index];
-
-			if (!StringCompare.compare(pattern, attribute, ignoreCase))
-			{
-				return false;
-			}
-			index++;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Tests if this element contains a specified element in a particular relationship. 
-	 *
-	 * @param object the object to look for 
-	 * @param property relationship under which to find the object 
-	 * @return whether the element is found
-	 */
-	public boolean contains(DataElement object, DataElement property)
-	{
-		return contains(object, property, 1);
-	}
-
-	/**
-	 * Tests if this element contains a specified element in a particular relationship. 
-	 *
-	 * @param object the object to look for 
-	 * @param property relationship under which to find the object 
-	 * @param depth how deep to search for the specified element 
-	 * @return whether the element is found
-	 */
-	public synchronized boolean contains(DataElement object, DataElement property, int depth)
-	{
-		if (depth > 0)
-		{
-			depth--;
-
-			if (object == null)
-			{
-				return false;
-			}
-
-			if (property == null)
-			{
-				property = _dataStore.getContentsRelation();
-			}
-
-			if (getNestedSize() == 0)
-			{
-				return false;
-			}
-
-			if (property != null)
-			{
-				if (property.getType().equals(DE.T_ABSTRACT_RELATION_DESCRIPTOR))
-				{
-					for (int i = 0; i < property.getNestedSize(); i++)
-					{
-						DataElement subProperty = property.get(i).dereference();
-						if (contains(object, subProperty))
-						{
-							return true;
-						}
-					}
-				}
-				else
-				{
-					String type = property.getName();
-					if (type.equals(DataStoreResources.model_parent) && (_parent != null))
-					{
-						if (object == _parent)
-						{
-							return true;
-						}
-						else
-						{
-							return _parent.contains(object, property, depth);
-						}
-					}
-					else if (_nestedData != null)
-					{
-						for (int i = 0; i < _nestedData.size(); i++)
-						{
-							DataElement nestedObject = (DataElement) _nestedData.get(i);
-							if (nestedObject != null)
-							{
-								if (nestedObject.isReference())
-								{
-									String relType = nestedObject.getAttribute(DE.A_TYPE);
-									if (relType.equals(type))
-									{
-										DataElement referenced = nestedObject.dereference();
-
-										if (referenced == object)
-										{
-											return true;
-										}
-										else
-										{
-											return referenced.contains(object, property, depth);
-										}
-									}
-								}
-								else if (type.equals("contents")) //$NON-NLS-1$
-								{
-									if (nestedObject == object)
-									{
-										return true;
-									}
-									else
-									{
-										if (nestedObject.contains(object, property, depth))
-										{
-											return true;
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Tests if this element contains a specified element in the default contents relationship. 
-	 *
-	 * @param object the object to look for 
-	 * @return whether the element is found
-	 */
-	public boolean contains(DataElement object)
-	{
-		return contains(object, 1);
-	}
-
-	/**
-	 * Tests if this element contains a specified element in the default contents relationship. 
-	 *
-	 * @param object the object to look for 
-	 * @param depth how deep to search 
-	 * @return whether the element is found
-	 */
-	public boolean contains(DataElement object, int depth)
-	{
-		boolean result = false;
-		if (_nestedData != null)
-		{
-			depth--;
-			for (int i = 0; i < getNestedSize(); i++)
-			{
-				DataElement child = get(i);
-
-				if (child == object)
-				{
-					return true;
-				}
-				else if (child.dereference() == object)
-				{
-					return true;
-				}
-				else if (depth > 0)
-				{
-					result = child.contains(object, depth);
-					if (result)
-					{
-						return true;
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests if this element is the same as another. 
-	 *
-	 * @param arg the object to compare with 
-	 * @return whether the element is the same
-	 */
-	public boolean equals(Object arg)
-	{
-		if (arg instanceof DataElement)
-		{
-			return arg == this;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Gets the set of elements that are related to this element via a specified relationship. 
-	 *
-	 * @param propertyStr a string representing the relationship that is required  
-	 * @return the set of related elements
-	 */
-	public List getAssociated(String propertyStr)
-	{
-		DataElement property = _dataStore.findObjectDescriptor(propertyStr);
-		if (property == null)
-		{
-		    property = _dataStore.findRelationDescriptor(propertyStr);
-		}
-		if (property != null)
-		{
-			return getAssociated(property);
-		}
-		else
-		{
-			return new ArrayList(1);
-		}
-	}
-
-	/**
-	 * Gets the set of elements that are related to this element via a specified relationship. 
-	 *
-	 * @param property the relationship that is required  
-	 * @return the set of related elements
-	 */
-	public List getAssociated(DataElement property)
-	{
-		ArrayList set = new ArrayList();
-
-		if (property == null || getNestedSize() == 0)
-		{
-			return set;
-		}
-		else
-		{
-			if (property.getType().equals(DE.T_ABSTRACT_RELATION_DESCRIPTOR))
-			{
-				// recursively concat the abstracted matches
-				for (int i = 0; i < property.getNestedSize(); i++)
-				{
-					DataElement subProperty = property.get(i).dereference();
-					List subSet = getAssociated(subProperty);
-					set.addAll(subSet);
-				}
-			}
-			else
-			{
-				String type = property.getName();
-				if (type.equals(DataStoreResources.model_parent) && (_parent != null))
-				{
-					set.add(_parent);
-					return set;
-				}
-				else if (type.equals(DataStoreResources.model_descriptor_for))
-				{
-					getDescriptor();
-					if (_descriptor != null)
-						set.add(_descriptor);
-				}
-				else if (_nestedData != null)
-				{
-					for (int i = 0; i < _nestedData.size(); i++)
-					{
-						DataElement nestedObject = (DataElement) _nestedData.get(i);
-						if (nestedObject != null)
-						{
-							if (nestedObject.isReference())
-							{
-								String relType = nestedObject.getType();
-								if (relType.equals(type))
-								{
-									DataElement referenced = nestedObject.dereference();
-									if ((referenced != null) && !referenced.isDeleted())
-									{
-										set.add(referenced);
-									}
-								}
-							}
-							else if (type.equals(DataStoreResources.model_contents))
-							{
-								if (!nestedObject.isDeleted())
-									set.add(nestedObject);
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return set;
-	}
-
-	/**
-	 * Returns the element that this references.
-	 * If the element is not a reference, itself is returned
-	 *
-	 * @return the element that this references
-	 */
-	public DataElement dereference()
-	{
-		if (_isReference)
-		{
-			String name = getAttribute(DE.A_NAME);
-			if ((_referencedObject != null))
-			{
-				if (_referencedObject.getId().equals(name))
-				{
-					return _referencedObject;
-				}
-				else
-				{
-					_referencedObject = null;
-					delete();
-					return null;
-				}
-			}
-			else
-			{
-				_referencedObject = _dataStore.find(name);
-				if ((_referencedObject != null))
-				{
-					return _referencedObject;
-				}
-				else
-				{
-					return null;
-				}
-			}
-		}
-		else
-		{
-			return this;
-		}
-	}
-
-	/**
-	 * Do the specified command on this element.
-	 * This element becomes the subject of a command that has a value, command
-	 *
-	 * @param command the string representing the command to issue
-	 * @param isSynchronized an indication of whether this command should be synchronized
-	 * @return the status of the command
-	 */
-	public DataElement doCommandOn(String command, boolean isSynchronized)
-	{
-		DataElement status = null;
-		if ((_dataStore != null) && (_dataStore.isConnected()))
-		{
-			DataElement cmdDescriptor = _dataStore.localDescriptorQuery(getDescriptor(), command);
-			if (cmdDescriptor != null)
-			{
-				if (isSynchronized)
-				{
-					status = _dataStore.synchronizedCommand(cmdDescriptor, this);
-				}
-				else
-				{
-					status = _dataStore.command(cmdDescriptor, this);
-				}
-			}
-		}
-		return status;
-	}
-
-	
-
-	/**
-	 * Gets the adapter specified by key for this element
-	 *
-	 * @param key the identifier for this adapter
-	 * @return the adapter
-	 */
-	public Object getAdapter(Class key)
-	{
-		Object adapter = DesktopElement.getPlatformAdapter(this, key);
-		if (adapter != null)
-		{
-			return adapter;
-		}
-		else if (PropertySource.matches(key))
-		{
-			if (_propertySource == null)
-			{
-				_propertySource = new PropertySource(this);
-			}
-
-			return _propertySource;
-		}
-		else if (DataElementActionFilter.matches(key))
-		{
-			return DataElementActionFilter.getInstance();
-		}
-		return null;
-	}
-
-	/**
-	 * Returns a string showing the attributes of this element
-	 *
-	 * @return a printable string
-	 */
-	public String toString()
-	{
-		return "DataElement " //$NON-NLS-1$
-			+ (_isReference ? "reference" : "") //$NON-NLS-1$ //$NON-NLS-2$
-			+ "\n{\n\tType:\t" //$NON-NLS-1$
-			+ getType()
-			+ "\n\tName:\t" //$NON-NLS-1$
-			+ getName()
-			+ "\n\tValue:\t" //$NON-NLS-1$
-			+ getValue()
-			+ "\n\tID:\t" //$NON-NLS-1$
-			+ getId()
-			+ "\n\tSource:\t" //$NON-NLS-1$
-			+ getSource()
-			+ "\n\tDepth:\t" //$NON-NLS-1$
-			+ _depth
-			+ "\n\tDataStore:\t" //$NON-NLS-1$
-			+ _dataStore.getName()
-			+ "\n}\n"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the property identified by name.
-	 *
-	 * @param name a specifier of which property to return
-	 * @return the specified property
-	 */
-	public Object getElementProperty(Object name)
-	{
-		return getElementProperty(name, 3);
-	}
-
-	private Object getElementProperty(Object name, int depth)
-	{
-		if (depth == 0)
-		{
-			return null;
-		}
-
-		if (_isReference)
-		{
-			if (_referencedObject == null)
-			{
-				dereference();
-			}
-
-			if (_referencedObject != null)
-			{
-				return _referencedObject.getElementProperty(name, depth - 1);
-			}
-			else
-			{
-				return null;
-			}
-		}
-		else
-		{
-			if (DE.P_NOTIFIER.equals(name))
-			{
-				return _dataStore.getDomainNotifier();
-			}
-			else if (DE.P_LABEL.equals(name))
-			{
-				return getAttribute(DE.A_NAME);
-			}
-			else if (DE.P_TYPE.equals(name))
-			{
-				return getAttribute(DE.A_TYPE);
-			}
-			else if (DE.P_NAME.equals(name))
-			{
-				return getAttribute(DE.A_NAME);
-			}
-			else if (DE.P_VALUE.equals(name))
-			{
-				return getAttribute(DE.A_VALUE);
-			}
-			else if (DE.P_ID.equals(name))
-			{
-				return getAttribute(DE.A_ID);
-			}
-			else if (DE.P_DESCRIPTOR.equals(name))
-			{
-				return _descriptor;
-			}
-			else if (DE.P_SOURCE_NAME.equals(name))
-			{
-				String source = getAttribute(DE.A_SOURCE);
-				int locationIndex = source.lastIndexOf(":"); //$NON-NLS-1$
-				if (locationIndex > 3)
-				{
-					return source.substring(0, locationIndex);
-				}
-				return source;
-			}
-			else if (DE.P_BUFFER.equals(name))
-			{
-				return _buffer;
-			}
-			else if (DE.P_SOURCE.equals(name))
-			{
-				return getAttribute(DE.A_SOURCE);
-			}
-			else if (DE.P_SOURCE_LOCATION_COLUMN.equals(name))
-			{
-				return null;
-			}
-			else if (DE.P_DATASTORE.equals(name))
-			{
-				return _dataStore.getName();
-			}
-			else if (DE.P_NESTED.equals(name) || DE.P_CHILDREN.equals(name))
-			{
-				return getNestedData();
-			}
-			else
-			{
-				return null;
-			}
-		}
-
-	}
-
-	private void initialize()
-	{
-		initialize(null);
-	}
-
-	private void initialize(DataElement typeDescriptor)
-	{
-		_isReference = false;
-		_isDescriptor = false;
-		_depth = 1;
-
-		_referencedObject = null;
-		_isExpanded = false;
-		_isUpdated = false;
-		_descriptor = typeDescriptor;
-
-		
-		String depthStr = getAttribute(DE.A_DEPTH);
-		if (depthStr != null && depthStr.length() > 0)
-		{
-			if (!depthStr.equals("2")) //$NON-NLS-1$
-			{
-				try
-				{
-					_depth = Integer.parseInt(depthStr);
-				}
-				catch (Exception e)
-				{
-				}
-			}
-		}
-		
-		
-
-		String refType = getAttribute(DE.A_REF_TYPE);
-		if (refType != null)
-		{
-			if (refType.equals(DataStoreResources.TRUE) || refType.equals(DataStoreResources.REFERENCE))
-			{
-				_isReference = true;
-				_isSpirit = false;
-			}
-			else if (refType.equals(DataStoreResources.FALSE) || refType.equals(DataStoreResources.VALUE))
-			{
-				_isReference = false;
-				_isSpirit = false;
-			}
-			else if (refType.equals(DataStoreResources.SPIRIT))
-			{
-				_isReference = false;
-				_isSpirit = true;
-			}
-		}
-
-		String type = getAttribute(DE.A_TYPE);
-		if (type.equals(DE.T_OBJECT_DESCRIPTOR)
-			|| type.equals(DE.T_COMMAND_DESCRIPTOR)
-			|| type.equals(DE.T_RELATION_DESCRIPTOR)
-			|| type.equals(DE.T_ABSTRACT_OBJECT_DESCRIPTOR)
-			|| type.equals(DE.T_ABSTRACT_COMMAND_DESCRIPTOR)
-			|| type.equals(DE.T_ABSTRACT_RELATION_DESCRIPTOR))
-		{
-			_isDescriptor = true;
-		}
-
-		if (_nestedData != null)
-			_nestedData.clear();
-	}
-
-	/**
-	 * Removes all the attributes of a <code>DataElement</code>. 
-	 * This method should only be called from the UpdateHandlers.
-	 */
-	protected synchronized void clear()
-	{
-		if (_attributes != null)
-		{
-			for (int i = 0; i < _attributes.length; i++)
-			{
-				String att = _attributes[i];
-				if (att != null)
-				{
-					att = null;
-				}
-			}
-
-		}
-
-		if (_nestedData != null)
-		{
-			_nestedData.clear();
-		}
-
-		_parent = null;
-		_descriptor = null;
-		_referencedObject = null;
-
-		_propertySource = null;
-		_buffer = null;
-	}
-
-	/**
-	 * Marks a <code>DataElement</code> as deleted.
-	 * This method should only be called from the <code>DataStore</code>
-	 */
-	public synchronized void delete()
-	{
-		if (!isDeleted())
-		{
-			// set delete attribute
-			
-			setAttribute(DE.A_SOURCE, null);
-			setAttribute(DE.A_VALUE, DataStoreResources.DELETED);
-			setAttribute(DE.A_TYPE, null);
-			setAttribute(DE.A_NAME, null);
-			
-			_isUpdated = false;
-			_isExpanded = true;
-			_buffer = null;
-			//_nestedData = null; // commented out this null setting so that the children of this element can be properly deleted
-		}
-	}
-	
-	public synchronized void notifyUpdate()
-	{
-		notify();
-	}
-	
-	public synchronized void waitForUpdate(long timeout)
-	{
-		try
-		{
-			//System.out.println("waiting on:"+this);
-			wait(timeout);
-			//System.out.println("done waiting on:"+this);
-		}
-		catch (Exception e)
-		{			
-			// timeed out
-		//	System.out.println("timeout:"+this);
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
deleted file mode 100644
index 0de15009c..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
+++ /dev/null
@@ -1,4583 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Michael Berger (IBM) - 146326 fixed erroneously disconnected dstore elements.
- * Michael Berger (IBM) - 145799 added refresh() method with depth parameter.
- * David McKnight (IBM) - 202822 findDeleted should not be synchronized
- * David McKnight  (IBM)   [220123][dstore] Configurable timeout on irresponsiveness
- * David McKnight  (IBM)  - [222168][dstore] Buffer in DataElement is not sent
- * Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- * David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * David McKnight   (IBM) - [227881] [dstore][threaded] There is no chance to set client object for getUserPreferencesDirectory()
- * Noriaki Takatsu  (IBM) - [228156] [dstore] DataElementRemover thread doesn't terminate after a client disconnects the server
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * David McKnight   (IBM) - [231639] [dstore] in single-process multi-client mode tracing shouldn't start until the client is set
- * Noriaki Takatsu  (IBM) - [239073] [dstore] [multithread] In multithread, the cache jar should be assigned after the client is set
- * Noriaki Takatsu  (IBM) - [245069] [dstore] dstoreTrace has no timestamp
- * David McKnight   (IBM) - [282634] [dstore] IndexOutOfBoundsException on Disconnect
- * David McKnight   (IBM) - [282599] [dstore] log folder that is not a hidden one
- * David McKnight   (IBM) - [285151] [dstore] Potential threading problem in DataStore (open call)
- * David McKnight   (IBM) - [285301] [dstore] 100% CPU if user does not  have write access to $HOME
- * David McKnight   (IBM) - [287457] [dstore] problems with disconnect when readonly trace file
- * David McKnight   (IBM) - [289891] [dstore] StringIndexOutOfBoundsException in getUserPreferencesDirectory when DSTORE_LOG_DIRECTORY is ""
- * David McKnight   (IBM) - [294933] [dstore] RSE goes into loop
- * David McKnight   (IBM) - [336257] [dstore] leading file.searator in DSTORE_LOG_DIRECTORY not handled
- * David McKnight   (IBM) - [340080] [dstore] empty string should not be allowed as a DataElement ID
- * David McKnight   (IBM) - [351993] [dstore] not able to connect to server if .eclipse folder not available
- * David McKnight   (IBM) - [366070] [dstore] fix for bug 351993 won't allow tracing if .dstoreTrace doesn't exist
- * David McKnight   (IBM) - [367096] [dstore] DataElement.isSpirit() may return true for newly created DStore objects
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.RandomAccessFile;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.dstore.core.java.ClassByteStreamHandler;
-import org.eclipse.dstore.core.java.ClassByteStreamHandlerRegistry;
-import org.eclipse.dstore.core.java.IClassByteStreamHandler;
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.java.RemoteClassLoader;
-import org.eclipse.dstore.core.server.SystemServiceManager;
-import org.eclipse.dstore.core.util.StringCompare;
-import org.eclipse.dstore.extra.IDomainNotifier;
-import org.eclipse.dstore.internal.core.client.ClientCommandHandler;
-import org.eclipse.dstore.internal.core.model.DefaultByteConverter;
-import org.eclipse.dstore.internal.core.server.ServerUpdateHandler;
-import org.eclipse.dstore.internal.core.util.DataElementRemover;
-import org.eclipse.dstore.internal.core.util.XMLgenerator;
-import org.eclipse.dstore.internal.core.util.XMLparser;
-
-/**
- * <code>DataStore</code> is the heart of the <code>DataStore</code> Distributed Tooling Framework.
- * This class is used for creating, deleting and accessing <code>DataElement</code>s and for communicating commands
- * to miners (tools).
- *
- * <p>
- * Every <code>DataStore</code> has both a command handler and an update handler.  The command
- * handler is responsible for sending commands, in the form of <code>DataElement</code> trees, to the appropriate
- * implementer, either directly to the miner, or indirectly over the communication layer through a server
- * <code>DataStore</code>.  The update handler is responsible for notifying listeners about changes in the
- * <code>DataStore</code>, either directly via a <code>IDomainNotifier</code> or indirectly over the communication
- * layer through a client <code>DataStore</code>.
- * </p>
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public final class DataStore
-{
-
-
-	private DataStoreAttributes _dataStoreAttributes;
-
-	private RemoteClassLoader _remoteLoader;
-
-	private DataElement _root;
-	private DataElement _descriptorRoot;
-	private DataElement _logRoot;
-	private DataElement _hostRoot;
-	private DataElement _minerRoot;
-	private DataElement _tempRoot;
-	private DataElement _dummy;
-	private DataElement _externalRoot;
-	private DataElement _status;
-
-	private DataElement _ticket;
-	private String  _remoteIP;
-	private DataStoreSchema _dataStoreSchema;
-	private CommandHandler _commandHandler;
-	private UpdateHandler _updateHandler;
-
-	private IByteConverter _byteConverter;
-	private ByteStreamHandlerRegistry _byteStreamHandlerRegistry;
-	private ClassByteStreamHandlerRegistry _classbyteStreamHandlerRegistry;
-
-	private IDomainNotifier _domainNotifier;
-
-	private ArrayList _loaders;
-	private ArrayList _minersLocations;
-	private ArrayList _localClassLoaders;
-	private HashMap _dataStorePreferences;
-
-	private List _dataStorePreferenceListeners;
-
-
-	private ISSLProperties _sslProperties;
-
-	private boolean _autoRefresh;
-
-	private boolean _isConnected;
-	private boolean _logTimes;
-	private int _timeout;
-
-	private int _serverIdleShutdownTimeout = 0;
-
-	private HashMap _hashMap;
-	private HashMap _objDescriptorMap;
-	private HashMap _cmdDescriptorMap;
-	private HashMap _relDescriptorMap;
-
-	private ArrayList _recycled;
-
-	private Random _random;
-	private int _initialSize;
-
-	private File _traceFileHandle;
-	private RandomAccessFile _traceFile;
-	private boolean _tracingOn;
-
-	private boolean _spiritModeOn = false;
-	private boolean _spiritCommandReceived = false;
-	private File _memLoggingFileHandle;
-	private RandomAccessFile _memLogFile;
-	private boolean _memLoggingOn;
-
-	private ArrayList _waitingStatuses = null;
-
-	private String _userPreferencesDirectory = null;
-	private IDataStoreCompatibilityHandler _compatibilityHandler;
-
-
-	private HashMap _classReqRepository;
-	private File _cacheJar;
-	public static final String REMOTE_CLASS_CACHE_JARFILE_NAME = "rmt_classloader_cache"; //$NON-NLS-1$
-	public static final String JARFILE_EXTENSION = ".jar";	 //$NON-NLS-1$
-	private DataElementRemover _deRemover;
-	public static final int SPIRIT_ON_INITIAL_SIZE = 1000;
-	private String referenceTag = null;
-
-	private int _serverVersion;
-	private int _serverMinor;
-
-	private List _lastCreatedElements;
-	private Client _client;
-
-	/**
-	 * Creates a new <code>DataStore</code> instance
-	 *
-	 * @param attributes the default attributes of the <code>DataStore</code>
-	 */
-	public DataStore(DataStoreAttributes attributes)
-	{
-		_dataStoreAttributes = attributes;
-		_commandHandler = null;
-		_updateHandler = null;
-		_domainNotifier = null;
-		_isConnected = false;
-		_logTimes = false;
-		setSpiritModeOnState();
-		_initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : 100000;
-		initialize();
-	}
-
-	/**
-	 * Creates a new DataStore instance
-	 *
-	 * @param attributes the default attributes of the <code>DataStore</code>
-	 * @param initialSize the initial number of preallocated <code>DataElement</code>s
-	 */
-	public DataStore(DataStoreAttributes attributes, int initialSize)
-	{
-		_dataStoreAttributes = attributes;
-		_commandHandler = null;
-		_updateHandler = null;
-		_domainNotifier = null;
-		_isConnected = false;
-		_logTimes = false;
-		setSpiritModeOnState();
-		_initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : initialSize;
-		initialize();
-	}
-
-	/**
-	 * Creates a new <code>DataStore</code> instance
-	 *
-	 * @param attributes the default attributes of the <code>DataStore</code>
-	 * @param commandHandler the DataStore's handler for sending commands
-	 * @param updateHandler the DataStore's handler for doing updates
-	 * @param domainNotifier the domain notifier
-	 * @since 3.0 replaced DomainNotifier with IDomainNotifier
-	 */
-	public DataStore(DataStoreAttributes attributes, CommandHandler commandHandler, UpdateHandler updateHandler, IDomainNotifier domainNotifier)
-	{
-		_dataStoreAttributes = attributes;
-		_commandHandler = commandHandler;
-		_updateHandler = updateHandler;
-		_domainNotifier = domainNotifier;
-		_isConnected = true;
-		_logTimes = false;
-		setSpiritModeOnState();
-		_initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : 10000;
-		initialize();
-		createRoot();
-	}
-
-	/**
-	 * Creates a new DataStore instance
-	 *
-	 * @param attributes the default attributes of the <code>DataStore</code>
-	 * @param commandHandler the DataStore's handler for sending commands
-	 * @param updateHandler the DataStore's handler for doing updates
-	 * @param domainNotifier the domain notifier
-	 * @param initialSize the initialNumber of preallocated
-	 *            <code>DataElement</code>s
-	 * @since 3.0 replaced DomainNotifier with IDomainNotifier
-	 */
-	public DataStore(DataStoreAttributes attributes, CommandHandler commandHandler, UpdateHandler updateHandler, IDomainNotifier domainNotifier, int initialSize)
-	{
-		_dataStoreAttributes = attributes;
-		_commandHandler = commandHandler;
-		_updateHandler = updateHandler;
-		_domainNotifier = domainNotifier;
-		_isConnected = true;
-		_logTimes = false;
-		setSpiritModeOnState();
-		_initialSize = _spiritModeOn && !isVirtual() ? SPIRIT_ON_INITIAL_SIZE : initialSize;
-		initialize();
-		createRoot();
-	}
-
-	protected void setSpiritModeOnState()
-	{
-		if (isVirtual()) _spiritModeOn = true;
-		else
-		{
-			String doSpirit = System.getProperty("DSTORE_SPIRIT_ON"); //$NON-NLS-1$
-			_spiritModeOn = (doSpirit != null && doSpirit.equals("true")); //$NON-NLS-1$
-		}
-	}
-
-	public void setServerVersion(int version)
-	{
-		_serverVersion = version;
-	}
-
-	public void setServerMinor(int minor)
-	{
-		_serverMinor = minor;
-	}
-
-	public int getServerVersion()
-	{
-		return _serverVersion;
-	}
-
-	public int getServerMinor()
-	{
-		return _serverMinor;
-	}
-
-	/**
-	 * Sets the ticket for this <code>DataStore</code>.  A ticket is used to prevent unauthorized users
-	 * from accessing the <code>DataStore</code>
-	 *
-	 * @param ticket the <code>DataElement</code> representing the ticket
-	 */
-	public void setTicket(DataElement ticket)
-	{
-		_ticket = ticket;
-	}
-
-	/**
-	 * Sets the loaders for this <code>DataStore</code>.  The loaders are used to load miners (extension tools).
-	 *
-	 * @param loaders the loaders for the miners this <code>DataStore</code> will be using
-	 */
-	public void setLoaders(ArrayList loaders)
-	{
-		_loaders = loaders;
-	}
-
-	/**
-	 * Adds a loader for this <code>DataStore</code>.  The loader is used to load miners (extension tools).
-	 *
-	 * @param loader the loader for the miners this <code>DataStore</code> will be using
-	 * @since 3.0 replaced ExternalLoader by IExternalLoader
-	 */
-	public void addLoader(IExternalLoader loader)
-	{
-		if (_loaders == null)
-		{
-			_loaders = new ArrayList();
-		}
-		_loaders.add(loader);
-	}
-
-
-
-	public boolean usingSSL()
-	{
-		if (_sslProperties != null)
-		{
-			return _sslProperties.usingSSL() && _sslProperties.usingServerSSL();
-		}
-		return false;
-	}
-	/**
-	 * Specifies the security properties of this DataStore. These properties
-	 * indicate whether or not to use SSL, the keystore location and password.
-	 * 
-	 * @param properties the properties to set
-	 */
-	public void setSSLProperties(ISSLProperties properties)
-	{
-		_sslProperties = properties;
-	}
-
-	/*
-	 * Returns the location for the keystore associated with the DataStore.
-	 * The keystore is used when using SSL for remote communications.  On the
-	 * host the file typically resides in the server directory.  On the client,
-	 * the keystore location is normally customized vi <code>setKeyStoreLocation</code>.
-	 */
-	public String getKeyStoreLocation()
-	{
-		if (_sslProperties != null)
-		{
-			return _sslProperties.getServerKeyStorePath();
-		}
-		return null;
-	}
-
-	/*
-	 *  Returns the password to use when accessing the DataStore keystore.
-	 */
-	public String getKeyStorePassword()
-	{
-		if (_sslProperties != null)
-		{
-			return _sslProperties.getServerKeyStorePassword();
-		}
-		return null;
-	}
-
-	/**
-	 * Tells the <code>DataStore</code> where to find the miners which it needs to load.
-	 *
-	 * @param minersLocation a string representing the location of the miners
-	 */
-	public DataElement addMinersLocation(String minersLocation)
-	{
-		if (_minersLocations == null)
-		{
-			_minersLocations = new ArrayList();
-		}
-		if (!_minersLocations.contains(minersLocation))
-		{
-			_minersLocations.add(minersLocation);
-
-			if (isVirtual())
-			{
-				DataElement location = createObject(_tempRoot, "location", minersLocation); //$NON-NLS-1$
-				DataElement cmd = findCommandDescriptor(DataStoreSchema.C_ADD_MINERS);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_ADD_MINERS, 1);
-				ArrayList args = new ArrayList();
-				args.add(location);
-				return command(cmd, args, _dummy);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Tells the <code>DataStore</code> where to find the miners which it needs to load.
-	 *
-	 * @param location a <code>DataElement</code> representing the location of the miners
-	 */
-	public void addMinersLocation(DataElement location)
-	{
-		String name = location.getName();
-		if (_minersLocations == null)
-		{
-			_minersLocations = new ArrayList();
-		}
-
-		if (!_minersLocations.contains(name))
-		{
-			_minersLocations.add(name);
-		}
-	}
-
-	/**
-	 * Tells the <code>DataStore</code> that it is connected to it's tools
-	 *
-	 * @param isConnected indicates whether it is connected or not
-	 */
-	public void setConnected(boolean isConnected)
-	{
-		_isConnected = isConnected;
-	}
-
-	/**
-	 * Sets the <code>DataStore</code>'s IDomainNotifier
-	 *
-	 * @param domainNotifier the domainNotifier
-	 * @since 3.0 replaced DomainNotifier by IDomainNotifier
-	 */
-	public void setDomainNotifier(IDomainNotifier domainNotifier)
-	{
-		_domainNotifier = domainNotifier;
-	}
-
-	/**
-	 * Sets the <code>DataStore</code>'s handler for doing updates
-	 *
-	 * @param updateHandler the handler for doing updates
-	 */
-	public void setUpdateHandler(UpdateHandler updateHandler)
-	{
-		_updateHandler = updateHandler;
-	}
-
-	/**
-	 * Sets the <code>DataStore</code>'s handler for sending commands to miners
-	 *
-	 * @param commandHandler the handler for sending commands to miners
-	 */
-	public void setCommandHandler(CommandHandler commandHandler)
-	{
-		_commandHandler = commandHandler;
-	}
-
-	/**
-	 * Set the compatibility handler for the client. This is used when potential
-	 * compatibility problems are run into - i.e. localDescriptorQuery fails
-	 *
-	 * @param handler the compatibilityHandler to use
-	 * @since 3.0
-	 */
-	public void setCompatibilityHandler(IDataStoreCompatibilityHandler handler){
-		_compatibilityHandler = handler;
-	}
-
-	/**
-	 * Get the compatibility handler for the client. This is used when potential
-	 * compatibility problems are run into - i.e. localDescriptorQuery fails
-	 *
-	 * @return the compatibilityHandler
-	 * @since 3.0
-	 */
-	public IDataStoreCompatibilityHandler getCompatibilityHandler(){
-		if (_compatibilityHandler == null){
-			_compatibilityHandler = new DefaultDataStoreCompatibilityHandler(this);
-		}
-		return _compatibilityHandler;
-	}
-
-
-	/**
-	 * Sets the time the update handler sleeps in between update requests
-	 *
-	 * @param time interval to wait
-	 */
-	public void setUpdateWaitTime(int time)
-	{
-		_updateHandler.setWaitTime(time);
-	}
-
-	/**
-	 * Sets the time the command handler sleeps in between command requests
-	 *
-	 * @param time interval to wait
-	 */
-	public void setCommandWaitTime(int time)
-	{
-		_commandHandler.setWaitTime(time);
-	}
-
-	/**
-	 * Sets the maximum amount of time that the <code>DataStore</code> will wait to receive a response
-	 * for a synchronous command
-	 *
-	 * @param time interval to wait
-	 */
-	public void setTimeoutValue(int time)
-	{
-		_timeout = time;
-	}
-
-	public int getTimeoutValue()
-	{
-		return _timeout;
-	}
-
-	/**
-	 * Gets the time the server may remain idle before shutting down
-	 *
-	 * @return the idle time before shutdown
-	 * @since 3.0
-	 */
-	public int getServerIdleShutdownTimeout()
-	{
-		return _serverIdleShutdownTimeout;
-	}
-
-	/**
-	 * Sets an attribute of the <code>DataStore</code>
-	 *
-	 * @param attribute index of the attribute to set
-	 * @param value value to set the attribute at the give index
-	 */
-	public void setAttribute(int attribute, String value)
-	{
-		_dataStoreAttributes.setAttribute(attribute, value);
-	}
-
-	/**
-	 * Tells the <code>DataStore</code> to log durations of commands
-	 *
-	 * @param flag whether to log times or not
-	 */
-	public void setLogTimes(boolean flag)
-	{
-		_logTimes = flag;
-	}
-
-	/**
-	 * Indicates whether this <code>DataStore</code> is virtual or not.  A virtual <code>DataStore</code>
-	 * is one that does not have it's own tools, but rather communicates with a non-virtual
-	 * <code>DataStore</code> that does.
-	 *
-	 * @return whether the <code>DataStore</code> is virtual or not
-	 */
-	public boolean isVirtual()
-	{
-		if (_commandHandler == null)
-		{
-			return true;
-		}
-		else if (_commandHandler instanceof org.eclipse.dstore.internal.core.client.ClientCommandHandler)
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Indicates whether this <code>DataStore</code> is connected to it's miners or another <code>DataStore</code>
-	 *
-	 * @return whether the <code>DataStore</code> is connected or not
-	 */
-	public boolean isConnected()
-	{
-		return _isConnected;
-	}
-
-	/**
-	 * Indicates whether this <code>DataStore</code> logs the durations of commands
-	 *
-	 * @return whether the <code>DataStore</code> logs command times or not
-	 */
-	public boolean logTimes()
-	{
-		return _logTimes;
-	}
-
-	/**
-	 * Returns the <code>DataStore</code>'s ticket
-	 *
-	 * @return the ticket
-	 */
-	public DataElement getTicket()
-	{
-		return _ticket;
-	}
-
-	/**
-	 * Returns the time the update handler waits between requests
-	 *
-	 * @return wait time
-	 */
-	public int getUpdateWaitTime()
-	{
-		return _updateHandler.getWaitTime();
-	}
-
-	/**
-	 * Returns the time the command handler waits between requests
-	 *
-	 * @return wait time
-	 */
-	public int getCommandWaitTime()
-	{
-		return _commandHandler.getWaitTime();
-	}
-
-
-
-
-
-	/**
-	 * Returns the name of the <code>DataStore</code>
-	 *
-	 * @return the name of the <code>DataStore</code>
-	 */
-	public String getName()
-	{
-		return getAttribute(DataStoreAttributes.A_HOST_NAME);
-	}
-
-	/**
-	 * Returns the root <code>DataElement</code> in the <code>DataStore</code>.
-	 * The root <code>DataElement</code> has no parent and contains every <code>DataElement</code>
-	 * in the <code>DataStore</code> through a <code>DataElement</code> tree
-	 *
-	 * @return the root <code>DataElement</code>
-	 */
-	public DataElement getRoot()
-	{
-		return _root;
-	}
-
-	public DataElement getDummy()
-	{
-	    return _dummy;
-	}
-
-	/**
-	 * Returns the host root <code>DataElement</code> in the <code>DataStore</code>.
-	 * The host root <code>DataElement</code> is a child of root and references
-	 * <code>DataElement</code>s in the <code>DataStore</code> that are related to host information
-	 *
-	 * @return the host root <code>DataElement</code>
-	 */
-	public DataElement getHostRoot()
-	{
-		return _hostRoot;
-	}
-
-	public DataElement getExternalRoot()
-	{
-		return _externalRoot;
-	}
-
-	/**
-	 * Returns the miner root <code>DataElement</code> in the <code>DataStore</code>.
-	 * The miner root <code>DataElement</code> is a child of root and contains
-	 * <code>DataElement</code>s the represent tools and the information that tools possess
-	 *
-	 * @return the miner root <code>DataElement</code>
-	 */
-	public DataElement getMinerRoot()
-	{
-		return _minerRoot;
-	}
-
-	/**
-	 * Returns the status of the <code>DataStore</code>.
-	 *
-	 * @return the status of the <code>DataStore</code>
-	 */
-	public DataElement getStatus()
-	{
-		return _status;
-	}
-
-	/**
-	 * Returns the log root <code>DataElement</code> of the <code>DataStore</code>.
-	 * The log root contains all commands that are issued from the <code>DataStore</code>
-	 *
-	 * @return the log root
-	 */
-	public DataElement getLogRoot()
-	{
-		return _logRoot;
-	}
-
-	/**
-	 * Returns the descriptor root <code>DataElement</code> of the <code>DataStore</code>.
-	 * The descriptor root contains the schema for the <code>DataStore</code> and it's tools
-	 *
-	 * @return the descriptor root
-	 */
-	public DataElement getDescriptorRoot()
-	{
-		return _descriptorRoot;
-	}
-
-	/**
-	 * Returns the temp root <code>DataElement</code> of the <code>DataStore</code>.
-	 * The temp root contains temporary information.
-	 *
-	 * @return the temp root
-	 */
-	public DataElement getTempRoot()
-	{
-		return _tempRoot;
-	}
-
-	/**
-	 * Returns the handler for sending commands.
-	 *
-	 * @return the command handler
-	 */
-	public CommandHandler getCommandHandler()
-	{
-		return _commandHandler;
-	}
-
-	/**
-	 * Returns the handler for doing updates.
-	 *
-	 * @return the update handler
-	 */
-	public UpdateHandler getUpdateHandler()
-	{
-		return _updateHandler;
-	}
-
-	/**
-	 * Returns the loader that is used for loading miners.
-	 *
-	 * @return the loader
-	 */
-	public ArrayList getLoaders()
-	{
-		return _loaders;
-	}
-
-	/**
-	 * Returns registered local classloaders.
-	 */
-	public ArrayList getLocalClassLoaders()
-	{
-		return _localClassLoaders;
-	}
-
-	/**
-	 * Registers a local class loader. On the client, each subsystem
-	 * must register its local class loader using this method so that
-	 * if the subsystem's classes cannot be found on the server, they can
-	 * be requested from the client, loaded using <code>loader</code>,
-	 * transferred to the server, and then loaded on the server.
-	 */
-	public void registerLocalClassLoader(ClassLoader loader)
-	{
-		if (_localClassLoaders == null)
-		{
-			_localClassLoaders = new ArrayList();
-		}
-		if (!_localClassLoaders.contains(loader)) _localClassLoaders.add(loader);
-	}
-
-	public DataElement getContentsRelation()
-	{
-		return _dataStoreSchema.getContentsRelation();
-	}
-
-	public DataElement getAttributesRelation()
-	{
-		return _dataStoreSchema.getAttributesRelation();
-	}
-
-	public DataElement getAbstractedByRelation()
-	{
-		return _dataStoreSchema.getAbstractedByRelation();
-	}
-
-	public DataElement getAbstractsRelation()
-	{
-		return _dataStoreSchema.getAbstractsRelation();
-	}
-
-	/**
-	 * Returns the location of the miners.
-	 *
-	 * @return the location of the miners
-	 */
-	public ArrayList getMinersLocation()
-	{
-		return _minersLocations;
-	}
-
-	/**
-	 * Returns the domain notifier.
-	 *
-	 * @return the domain notifier
-	 * @since 3.0 replaced DomainNotifier by IDomainNotifier
-	 */
-	public IDomainNotifier getDomainNotifier()
-	{
-		return _domainNotifier;
-	}
-
-	/**
-	 * Returns the attribute indicated by an index.
-	 *
-	 * @param attribute the index of the attribute to get
-	 * @return the attribute
-	 */
-	public String getAttribute(int attribute)
-	{
-		return _dataStoreAttributes.getAttribute(attribute);
-	}
-
-	/**
-	 * Returns the number of live elements in the <code>DataStore</code>.
-	 *
-	 * @return the number of live elements
-	 */
-	public int getNumElements()
-	{
-		synchronized (_hashMap){	
-			return _hashMap.size();
-		}
-	}
-
-	/**
-	* Returns the number of recycled elements in the <code>DataStore</code>.
-	*
-	* @return the number of recycled elements
-	*/
-	public int getNumRecycled()
-	{
-		return _recycled.size();
-	}
-	/**
-	 * Returns the table of live elements in the <code>DataStore</code>.
-	 *
-	 * @return the table of live elements
-	 */
-	public HashMap getHashMap()
-	{
-		return _hashMap;
-	}
-
-	/**
-	 * Initializes the <code>DataStore</code> by creating the root elements
-	 *
-	 */
-	public void createRoot()
-	{
-		_root =
-			createObject(
-				null,
-				DataStoreResources.model_root,
-				_dataStoreAttributes.getAttribute(DataStoreAttributes.A_ROOT_NAME),
-				_dataStoreAttributes.getAttribute(DataStoreAttributes.A_ROOT_PATH),
-				"rootID"); //$NON-NLS-1$
-
-
-		_descriptorRoot = createObject(_root, DE.T_OBJECT_DESCRIPTOR, DataStoreResources.model_descriptors, "", "schemaID"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		_ticket = createObject(_root, DataStoreResources.model_ticket, "null", "", "ticketID"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		createRoots();
-		initializeDescriptors();
-	}
-
-	/**
-	 * Creates a contents relationship between two <code>DataElement</code>s
-	 *
-	 * @param from the element that contains the other
-	 * @param to the element that is contained by the other
-	 * @return the new reference
-	 */
-	public DataElement createReference(DataElement from, DataElement to)
-	{
-		// default reference is a containment relationship
-		return createReference(from, to, getContentsRelation());
-	}
-
-	/**
-	 * Creates a relationship between two <code>DataElement</code>s given a type of relationship
-	 *
-	 * @param parent the element that references the other element
-	 * @param realObject the element that is referenced by the parent element
-	 * @param relationType the descriptor element that represents the type of relationship between parent and realObject
-	 * @return the new reference
-	 */
-	public DataElement createReference(DataElement parent, DataElement realObject, DataElement relationType)
-	{
-		if (parent != null)
-		{
-
-			// reference with a specified type of relationship
-			DataElement reference = createElement();
-
-			reference.reInit(parent, realObject, relationType);
-			parent.addNestedData(reference, false);
-
-			String sugId = reference.getId();
-			synchronized (_hashMap){
-				_hashMap.put(sugId, reference);
-			}
-			refresh(parent);
-
-			return reference;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Creates a relationship between two <code>DataElement</code>s given a type of relationship
-	 *
-	 * @param parent the element that references the other element
-	 * @param realObject the element that is referenced by the parent element
-	 * @param relationType the string that represents the type of relationship between parent and realObject
-	 * @return the new reference
-	 */
-	public DataElement createReference(DataElement parent, DataElement realObject, String relationType)
-	{
-	    return createReference(parent, realObject, relationType, true);
-	}
-
-	/**
-	 * Creates a relationship between two <code>DataElement</code>s given a type of relationship
-	 *
-	 * @param parent the element that references the other element
-	 * @param realObject the element that is referenced by the parent element
-	 * @param relationType the string that represents the type of relationship between parent and realObject
-	 * @param doRefresh indicates whether or not to refresh the parent of the new reference
-	 * @return the new reference
-	 */
-	public DataElement createReference(DataElement parent, DataElement realObject, String relationType, boolean doRefresh)
-	{
-		if (parent != null)
-		{
-			// reference with a specified type of relationship
-			DataElement reference = createElement();
-
-			DataElement toDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, relationType);
-			if (toDescriptor != null)
-			{
-				reference.reInit(parent, realObject, toDescriptor);
-			}
-			else
-			{
-				reference.reInit(parent, realObject, relationType);
-			}
-
-			parent.addNestedData(reference, false);
-
-			String sugId = reference.getId();
-			synchronized (_hashMap){
-				_hashMap.put(sugId, reference);
-			}
-			
-			if (doRefresh)
-			{
-			    refresh(parent);
-			}
-
-			return reference;
-		}
-		return null;
-	}
-
-	/**
-	 * Creates a set of  relationships between one <code>DataElement</code> and a set of <code>DataElement</code>s given a type of relationship
-	 *
-	 * @param from the element that references the other elements
-	 * @param to a list of elements that from references
-	 * @param type the string that represents the type of relationships between from and to
-	 */
-	public void createReferences(DataElement from, ArrayList to, String type)
-	{
-		DataElement toDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, type);
-		if (toDescriptor != null)
-		{
-			createReferences(from, to, toDescriptor);
-		}
-		else
-		{
-			for (int i = 0; i < to.size(); i++)
-			{
-				DataElement toObject = (DataElement) to.get(i);
-				createReference(from, toObject, type);
-			}
-		}
-	}
-
-	/**
-	 * Creates a set of  relationships between one <code>DataElement</code> and a set of <code>DataElement</code>s given a type of relationship
-	 *
-	 * @param from the element that references the other elements
-	 * @param to a list of elements that from references
-	 * @param type the descriptor element that represents the type of relationships between from and to
-	 */
-	public void createReferences(DataElement from, ArrayList to, DataElement type)
-	{
-		for (int i = 0; i < to.size(); i++)
-		{
-			DataElement toObject = (DataElement) to.get(i);
-			createReference(from, toObject, type);
-		}
-	}
-
-	/**
-	 * Creates a two-way relationship between two elements
-	 *
-	 * @param parent an element that references the other element
-	 * @param realObject an element that references the other element
-	 * @param toRelation the descriptor element that represents the type of relationship between parent and realObject
-	 * @param fromRelation the descriptor element that represents the type of relationship between realObject and parent
-	 * @return the new reference
-	 */
-	public DataElement createReference(DataElement parent, DataElement realObject, DataElement toRelation, DataElement fromRelation)
-	{
-		if (parent != null)
-		{
-			// reference with "to" relationship
-			DataElement toReference = createElement();
-			toReference.reInit(parent, realObject, toRelation);
-
-			parent.addNestedData(toReference, false);
-
-			String toId = toReference.getId();
-			synchronized (_hashMap){
-				_hashMap.put(toId, toReference);
-			}
-			// reference with "from" relationship
-			DataElement fromReference = createElement();
-
-			fromReference.reInit(realObject, parent, fromRelation);
-
-			realObject.addNestedData(fromReference, false);
-
-			String fromId = fromReference.getId();
-			synchronized (_hashMap){
-				_hashMap.put(fromId, fromReference);
-			}
-			refresh(parent);
-
-
-			return toReference;
-		}
-		return null;
-	}
-
-	/**
-	 * Creates a two-way relationship between two elements
-	 *
-	 * @param parent an element that references the other element
-	 * @param realObject an element that references the other element
-	 * @param toRelation the string that represents the type of relationship between parent and realObject
-	 * @param fromRelation the string that represents the type of relationship between realObject and parent
-	 * @return the new reference
-	 */
-	public DataElement createReference(DataElement parent, DataElement realObject, String toRelation, String fromRelation)
-	{
-		if (parent != null)
-		{
-			// reference with "to" relationship
-			DataElement toReference = createElement();
-			DataElement toDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, toRelation);
-			if (toDescriptor != null)
-			{
-				toReference.reInit(parent, realObject, toDescriptor);
-			}
-			else
-			{
-				toReference.reInit(parent, realObject, toRelation);
-			}
-
-			parent.addNestedData(toReference, false);
-
-			String toId = toReference.getId();
-			synchronized (_hashMap){
-				_hashMap.put(toId, toReference);
-			}
-
-			// reference with "from" relationship
-			DataElement fromReference = createElement();
-
-			DataElement fromDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, fromRelation);
-			if (fromDescriptor != null)
-			{
-				fromReference.reInit(realObject, parent, fromDescriptor);
-			}
-			else
-			{
-				fromReference.reInit(realObject, parent, fromRelation);
-			}
-
-			realObject.addNestedData(fromReference, false);
-
-			String fromId = fromReference.getId();
-			synchronized (_hashMap){
-				_hashMap.put(fromId, fromReference);
-			}
-			 refresh(parent);
-
-
-			return toReference;
-		}
-		return null;
-	}
-
-	/**
-	 * Creates a set of two-way relationship between a <code>DataElement</code> and a list of elements
-	 *
-	 * @param from an element that references the other elements
-	 * @param to a list of elements that reference from
-	 * @param toRel the descriptor element that represents the type of relationship between from and to
-	 * @param fromRel the descriptor element that represents the type of relationship between to and from
-	 */
-	public void createReferences(DataElement from, ArrayList to, DataElement toRel, DataElement fromRel)
-	{
-		for (int i = 0; i < to.size(); i++)
-		{
-			DataElement toObject = (DataElement) to.get(i);
-			createReference(from, toObject, toRel, fromRel);
-		}
-	}
-
-	/**
-	 * Creates a set of two-way relationship between a DataElement and a list of elements
-	 *
-	 * @param from an element that references the other elements
-	 * @param to a list of elements that reference from
-	 * @param toRel the string that represents the type of relationship between from and to
-	 * @param fromRel the string that represents the type of relationship between to and from
-	 */
-	public void createReferences(DataElement from, ArrayList to, String toRel, String fromRel)
-	{
-		DataElement toDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, toRel);
-		DataElement fromDescriptor = findDescriptor(DE.T_RELATION_DESCRIPTOR, fromRel);
-
-		if ((toDescriptor != null) && (fromDescriptor != null))
-		{
-			createReferences(from, to, toDescriptor, fromDescriptor);
-		}
-		else
-		{
-			for (int i = 0; i < to.size(); i++)
-			{
-				DataElement toObject = (DataElement) to.get(i);
-				createReference(from, toObject, toRel, fromRel);
-			}
-		}
-	}
-
-	public DataElement createTransientObject(String attributes[])
-	{
-		DataElement newObject = createElement();
-
-		newObject.reInitAsTransient(attributes);
-		return newObject;
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param type the descriptor representing the type of the new element
-	 * @param name the name of the new element
-	 * @return the new element
-	 */
-	public DataElement createObject(DataElement parent, DataElement type, String name)
-	{
-		return createObject(parent, type, name, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param type the string representing the type of the new element
-	 * @param name the name of the new element
-	 * @return the new element
-	 */
-	public DataElement createObject(DataElement parent, String type, String name)
-	{
-		return createObject(parent, type, name, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param type the descriptor element representing the type of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @return the new element
-	 */
-	public DataElement createObject(DataElement parent, DataElement type, String name, String source)
-	{
-		String id = generateId();
-		return createObject(parent, type, name, source, id);
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param type the string representing the type of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @return the new element
-	 */
-	public DataElement createObject(DataElement parent, String type, String name, String source)
-	{
-		String id = generateId(parent, type, name);
-		if (id == null)
-		{
-			return null;
-		}
-
-		return createObject(parent, type, name, source, id);
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param type the descriptor element representing the type of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @param sugId the suggested ID for the new element
-	 * @return the new element
-	 */
-	public DataElement createObject(DataElement parent, DataElement type, String name, String source, String sugId)
-	{
-		return createObject(parent, type, name, source, sugId, false);
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param type the string representing the type of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @param sugId the suggested ID for the new element
-	 * @return the new element
-	 */
-	public DataElement createObject(DataElement parent, String type, String name, String source, String sugId)
-	{
-		return createObject(parent, type, name, source, sugId, false);
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param type the descriptor element representing the type of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @param sugId the suggested ID for the new element
-	 * @param isReference an indication whether the new element is a reference
-	 * @return the new element
-	 */
-	public DataElement createObject(DataElement parent, DataElement type, String name, String source, String sugId, boolean isReference)
-	{
-		String id = makeIdUnique(sugId);
-
-		DataElement newObject = createElement();
-		if (parent == null)
-		{
-			parent = _tempRoot;
-		}
-
-		newObject.reInit(parent, type, id, name, source, isReference);
-
-		if (parent != null)
-		{
-			parent.addNestedData(newObject, false);
-		}
-
-		synchronized (_hashMap)
-		{
-			_hashMap.put(id, newObject);
-		}
-
-		if (_autoRefresh)
-			refresh(parent);
-		return newObject;
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param type the string representing the type of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @param sugId the suggested ID for the new element
-	 * @param isReference an indication whether the new element is a reference
-	 * @return the new element
-	 */
-	public DataElement createObject(DataElement parent, String type, String name, String source, String sugId, boolean isReference)
-	{
-		String id = makeIdUnique(sugId);
-
-		DataElement newObject = createElement();
-		if (parent == null)
-		{
-			parent = _tempRoot;
-		}
-
-
-		DataElement descriptor = findDescriptor(DE.T_OBJECT_DESCRIPTOR, type);
-		if (descriptor != null && (parent != _descriptorRoot))
-		{
-			newObject.reInit(parent, descriptor, id, name, source, isReference);
-		}
-		else
-		{
-			newObject.reInit(parent, type, id, name, source, isReference);
-		}
-
-		if (parent != null)
-		{
-			parent.addNestedData(newObject, false);
-		}
-
-		synchronized(_hashMap)
-		{
-			_hashMap.put(id, newObject);
-		}
-
-		if (_autoRefresh)
-			refresh(parent);
-		return newObject;
-	}
-
-	/**
-	 * Creates a new <code>DataElement</code>.  This is normally called on client side via xml parser
-	 *
-	 * @param parent the parent of the new element
-	 * @param attributes the attributes to use in this new element
-	 * @return the new element
-	 */
-	public DataElement createObject(DataElement parent, String attributes[])
-	{
-		DataElement newObject = createElement();
-
-		if (parent == null)
-		{
-			parent = _tempRoot;
-		}
-
-		DataElement descriptor = findObjectDescriptor(attributes[DE.A_TYPE]);
-
-		if (descriptor != null && (parent != _descriptorRoot))
-		{
-			newObject.reInit(parent, descriptor, attributes);
-		}
-		else
-		{
-			newObject.reInit(parent, attributes);
-		}
-
-		if (parent != null)
-		{
-			parent.addNestedData(newObject, false);
-		}
-
-		// cache descriptors in map for faster access
-		if (descriptor == _dataStoreSchema.getObjectDescriptor() || descriptor == _dataStoreSchema.getAbstractObjectDescriptor())
-		{
-		    _objDescriptorMap.put(attributes[DE.A_NAME], newObject);
-		}
-		else if (descriptor == _dataStoreSchema.getCommandDescriptor() || descriptor == _dataStoreSchema.getAbstractCommandDescriptor())
-		{
-		    _cmdDescriptorMap.put(attributes[DE.A_NAME], newObject);
-		}
-		else if (descriptor == _dataStoreSchema.getRelationDescriptor() || descriptor == _dataStoreSchema.getAbstractRelationDescriptor())
-		{
-		    _relDescriptorMap.put(attributes[DE.A_NAME], newObject);
-		}
-
-		synchronized (_hashMap)
-		{
-			_hashMap.put(attributes[DE.A_ID], newObject);
-		}
-		return newObject;
-	}
-
-	/**
-	 * Creates a new abstract object descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createAbstractObjectDescriptor(DataElement parent, String name)
-	{
-		DataElement descriptor = createObject(parent, DE.T_ABSTRACT_OBJECT_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$
-		_objDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new abstract object descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createAbstractObjectDescriptor(DataElement parent, String name, String source)
-	{
-		DataElement descriptor = createObject(parent, DE.T_ABSTRACT_OBJECT_DESCRIPTOR, name, source, name);
-		_objDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new object descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createObjectDescriptor(DataElement parent, String name)
-	{
-	    DataElement parentDescriptor = _dataStoreSchema.getObjectDescriptor();
-	    DataElement descriptor = null;
-	    if (parentDescriptor != null)
-	    {
-	    	descriptor = createObject(parent, parentDescriptor, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$
-	    }
-	    else
-	    {
-			descriptor = createObject(parent, DE.T_OBJECT_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$
-	    }
-		_objDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new object descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @param source the name of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createObjectDescriptor(DataElement parent, String name, String source)
-	{
-	    DataElement parentDescriptor = _dataStoreSchema.getObjectDescriptor();
-	    DataElement descriptor = null;
-	    if (parentDescriptor != null)
-	    {
-	    	descriptor = createObject(parent, parentDescriptor, name, source, name);
-	    }
-	    else
-	    {
-	        descriptor = createObject(parent, DE.T_OBJECT_DESCRIPTOR, name, source, name);
-	    }
-		_objDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new abstract relation descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createAbstractRelationDescriptor(DataElement parent, String name)
-	{
-		DataElement descriptor = createObject(parent, DE.T_ABSTRACT_RELATION_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$
-		_relDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new abstract relation descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createAbstractRelationDescriptor(DataElement parent, String name, String source)
-	{
-		DataElement descriptor = createObject(parent, DE.T_ABSTRACT_RELATION_DESCRIPTOR, name, source, name);
-		_relDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new relation descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createRelationDescriptor(DataElement parent, String name)
-	{
-		DataElement descriptor = createObject(parent, DE.T_RELATION_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$
-		_relDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new relation descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createRelationDescriptor(DataElement parent, String name, String source)
-	{
-		DataElement descriptor =  createObject(parent, DE.T_RELATION_DESCRIPTOR, name, source, name);
-		_relDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new abstract command descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createAbstractCommandDescriptor(DataElement parent, String name)
-	{
-		DataElement descriptor = createAbstractCommandDescriptor(parent, name, name);
-		_cmdDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new abstract command descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @param value the value used to identify the command
-	 * @return the new descriptor element
-	 */
-	public DataElement createAbstractCommandDescriptor(DataElement parent, String name, String value)
-	{
-		DataElement cmd = createObject(parent, DE.T_ABSTRACT_COMMAND_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$
-		cmd.setAttribute(DE.A_VALUE, value);
-		_cmdDescriptorMap.put(value, cmd);
-		return cmd;
-	}
-
-	/**
-	 * Creates a new abstract command descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @param value the value used to identify the command
-	 * @return the new descriptor element
-	 */
-	public DataElement createAbstractCommandDescriptor(DataElement parent, String name, String source, String value)
-	{
-		DataElement cmd = createObject(parent, DE.T_ABSTRACT_COMMAND_DESCRIPTOR, name, source, name);
-		cmd.setAttribute(DE.A_VALUE, value);
-		_cmdDescriptorMap.put(value, cmd);
-		return cmd;
-	}
-
-	/**
-	 * Creates a new command descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @return the new descriptor element
-	 */
-	public DataElement createCommandDescriptor(DataElement parent, String name)
-	{
-		DataElement descriptor = createCommandDescriptor(parent, name, name);
-		_cmdDescriptorMap.put(name, descriptor);
-		return descriptor;
-	}
-
-	/**
-	 * Creates a new command descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @param value the value used to identify the command
-	 * @return the new descriptor element
-	 */
-	public DataElement createCommandDescriptor(DataElement parent, String name, String value)
-	{
-	    DataElement parentDescriptor = _dataStoreSchema.getCommandDescriptor();
-	    DataElement cmd = null;
-	    if (parentDescriptor != null)
-	    {
-	    	cmd = createObject(parent, parentDescriptor, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$
-	    }
-	    else
-	    {
-	        cmd = createObject(parent, DE.T_COMMAND_DESCRIPTOR, name, "org.eclipse.rse.dstore.core", name); //$NON-NLS-1$
-	    }
-		cmd.setAttribute(DE.A_VALUE, value);
-		_cmdDescriptorMap.put(value, cmd);
-		return cmd;
-	}
-
-	/**
-	 * Creates a new command descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @param value the value used to identify the command
-	 * @return the new descriptor element
-	 */
-	public DataElement createCommandDescriptor(DataElement parent, String name, String source, String value)
-	{
-	    DataElement parentDescriptor = _dataStoreSchema.getCommandDescriptor();
-	    DataElement cmd = null;
-	    if (parentDescriptor != null)
-	    {
-	    	cmd = createObject(parent, parentDescriptor, name, source, name);
-	    }
-	    else
-	    {
-	        cmd = createObject(parent, DE.T_COMMAND_DESCRIPTOR, name, source, name);
-	    }
-		cmd.setAttribute(DE.A_VALUE, value);
-		_cmdDescriptorMap.put(value, cmd);
-		return cmd;
-	}
-
-	/**
-	 * Creates a new command descriptor <code>DataElement</code>
-	 *
-	 * @param parent the parent of the new element
-	 * @param name the name of the new element
-	 * @param source the source location of the new element
-	 * @param value the value used to identify the command
-	 * @param visible indicates whether the command is visible or not
-	 * @return the new descriptor element
-	 */
-	public DataElement createCommandDescriptor(DataElement parent, String name, String source, String value, boolean visible)
-	{
-	    DataElement parentDescriptor = _dataStoreSchema.getCommandDescriptor();
-	    DataElement cmd = null;
-	    if (parentDescriptor != null)
-	    {
-	    	cmd = createObject(parent, parentDescriptor, name, source, name);
-	    }
-	    else
-	    {
-			cmd = createObject(parent, DE.T_COMMAND_DESCRIPTOR, name, source, name);
-	    }
-		cmd.setAttribute(DE.A_VALUE, value);
-		if (!visible)
-		{
-			cmd.setDepth(0);
-		}
-		_cmdDescriptorMap.put(value, cmd);
-
-		return cmd;
-	}
-
-	/**
-	 * Moves a element from one location in the <code>DataStore</code> tree to another
-	 *
-	 * @param source the element to move
-	 * @param target the element to move source to
-	 */
-	public void moveObject(DataElement source, DataElement target)
-	{
-		DataElement oldParent = source.getParent();
-		List nested = oldParent.getNestedData();
-		if (nested != null)
-		{
-			nested.remove(source);
-		}
-		refresh(oldParent, true);
-
-		target.addNestedData(source, false);
-		source.setParent(target);
-		refresh(target, true);
-	}
-
-	/**
-	 * Deletes all the elements contained in from
-	 *
-	 * @param from the element from which to delete objects from
-	 */
-	public void deleteObjects(DataElement from)
-	{
-		if (from != null)
-		{
-			for (int i = from.getNestedSize() - 1; i >= 0; i--)
-			{
-				DataElement deletee = from.get(i);
-				if (deletee != null)
-				{
-					deleteObjectHelper(from, deletee, 5);
-				}
-			}
-
-			//			refresh(from);
-		}
-	}
-
-	/**
-	 * Disconnect all the elements contained in from
-	 *
-	 * @param from the element from which to disconnect objects
-	 */
-	public void disconnectObjects(DataElement from)
-	{
-		if (!isDoSpirit())
-			{
-			return;
-			}
-		if (from != null)
-		{
-			for (int i = from.getNestedSize() - 1; i >= 0; i--)
-			{
-				DataElement disconnectee = from.get(i);
-				if (disconnectee != null)
-				{
-					disconnectObjectHelper(disconnectee, 5);
-				}
-			}
-
-			//			refresh(from);
-		}
-	}
-
-	/**
-	 * Deletes an element from another element
-	 *
-	 * @param from the element from which to delete an object from
-	 * @param toDelete the element to remove
-	 */
-	public void deleteObject(DataElement from, DataElement toDelete)
-	{
-		if (toDelete != null)
-		{
-			deleteObjectHelper(from, toDelete, 5);
-			//			refresh(toDelete);
-			//			refresh(from);
-		}
-	}
-
-	/**
-	 * Disconnects an element and makes it a "spirit"
-	 *
-	 * @param toDisconnect the element to disconnect
-	 */
-	public void disconnectObject(DataElement toDisconnect)
-	{
-		if (!isDoSpirit()) return;
-		if (toDisconnect != null)
-		{
-			disconnectObjectHelper(toDisconnect, 5);
-			// refresh(toDisconnect);
-			//			refresh(from);
-		}
-	}
-
-	/**
-	 * Replaces a deleted object
-	 */
-	public DataElement replaceDeleted(DataElement deletedObject)
-	{
-		if (deletedObject != null)
-		{
-			synchronized (deletedObject)
-			{
-				String name = deletedObject.getName();
-				String type = deletedObject.getType();
-
-				// find undeleted ancestor
-				DataElement parent = deletedObject.getParent();
-				if ((parent != null) && parent.isDeleted())
-				{
-					parent = replaceDeleted(parent);
-				}
-				if ((parent != null) && !parent.isDeleted())
-				{
-					for (int i = 0; i < parent.getNestedSize(); i++)
-					{
-						DataElement child = parent.get(i);
-						if (!child.isDeleted())
-						{
-							if (child.getName().equals(name) && child.getType().equals(type))
-							{
-								return child;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Checks if a <code>DataElement</code> with a given ID exists in the <code>DataStore</code>
-	 *
-	 * @param id the id to look for
-	 * @return whether it exists or not
-	 */
-	public boolean contains(String id)
-	{
-		synchronized (_hashMap){
-			return _hashMap.containsKey(id);
-		}
-	}
-
-	/**
-	 * Refresh a set of <code>DataElement</code>s
-	 *
-	 * @param elements a list of elements to refresh
-	 */
-	public void refresh(ArrayList elements)
-	{
-		// this gets called in response to a query
-		for (int i = 0; i < elements.size(); i++)
-		{
-			refresh((DataElement) elements.get(i));
-		}
-	}
-
-	/**
-	 * Refresh a <code>DataElement</code>
-	 *
-	 * @param element an element to refresh
-	 */
-	public void refresh(DataElement element)
-	{
-		if (element != null)
-		{
-			if (element.isReference())
-			{
-				refresh(element.dereference(), false);
-			}
-			refresh(element, false);
-		}
-	}
-
-	/**
-	 * Refresh a <code>DataElement</code> - immediately if indicated
-	 *
-	 * @param element an element to refresh
-	 * @param immediate indicates to do the refresh immediately
-	 */
-	public void refresh(DataElement element, boolean immediate)
-	{
-		if ((_updateHandler != null) && (element != null))
-		{
-			//element = findLastUpdatedAncestor(element, 5);
-
-			// update either client or ui
-			//element.setUpdated(false);
-			_updateHandler.update(element, immediate);
-		}
-	}
-
-	/**
-	 * Refresh a <code>DataElement</code> and its children to a certain depth - immediately if indicated
-	 *
-	 * @param element an element to refresh
-	 * @param depth The depth to refresh the elements descendants. A depth of 0 means only the element itself
-	 * is refreshed; 1 means the element and its children are refreshed, 2 - it, its children, and its grandchildren,
-	 * etc.
-	 * @param immediate indicates to do the refresh immediately. If true, the update handler will send updates
-	 * for each refreshed element in the subtree of depth <code>depth</code> below the element.
-	 */
-	public void refresh(DataElement element, int depth, boolean immediate)
-	{
-		if (depth < 0) return;
-
-		if (depth == 0) refresh(element, immediate);
-
-		if (depth > 0)
-		{
-			if (element.getNestedSize() > 0)
-			{
-				List children = element.getNestedData();
-				for (int i = 0; i < children.size(); i++)
-				{
-					refresh((DataElement)children.get(i), depth-1, immediate);
-				}
-			}
-			refresh(element, immediate);
-		}
-	}
-
-	public void update(ArrayList objects)
-	{
-		// this gets called in response to a query
-		for (int i = 0; i < objects.size(); i++)
-		{
-			update((DataElement) objects.get(i));
-		}
-	}
-
-	public void update(DataElement dataElement)
-	{
-		refresh(dataElement);
-	}
-
-	public void updateRemoteClassInstance(IRemoteClassInstance instance, String byteStreamHandlerId)
-	{
-		getUpdateHandler().updateClassInstance(instance, byteStreamHandlerId);
-	}
-
-	/**
-	 * Transfers a file from a server to a client.  This should only be called from
-	 * a miner on a different machine from the client.  If a file exists on the client
-	 * side that the server file maps to then the existing client file will be replaced.
-	 *
-	 * @param remotePath the path of the file on the client side
-	 * @param bytes an array of bytes representing a file
-	 * @param size the number of bytes to transfer
-	 * @param binary indicates whether to send the bytes as binary or text
-	 */
-	public void updateFile(String remotePath, byte[] bytes, int size, boolean binary)
-	{
-		updateFile(remotePath, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER);
-	}
-
-	/**
-	 * Transfers a file from a server to a client.  This should only be called from
-	 * a miner on a different machine from the client.  If a file exists on the client
-	 * side that the server file maps to then the existing client file will be replaced.
-	 *
-	 * @param remotePath the path of the file on the client side
-	 * @param bytes an array of bytes representing a file
-	 * @param size the number of bytes to transfer
-	 * @param binary indicates whether to send the bytes as binary or text
-	 * @param byteStreamHandlerId indicates the client byte stream handler to receive the bytes
-	 */
-	public void updateFile(String remotePath, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		remotePath = new String(remotePath.replace('\\', '/'));
-		String fileName = mapToLocalPath(remotePath);
-		if (fileName != null)
-		{
-			_updateHandler.updateFile(remotePath, bytes, size, binary, byteStreamHandlerId);
-		}
-	}
-
-	/**
-	 * Transfers and appends a file from a server to a client.  This should only be called from
-	 * a miner on a different machine from the client.  If a file exists on the client
-	 * side that the server file maps to then the existing client file will be appended to
-	 *
-	 * @param remotePath the path of the file on the client side
-	 * @param bytes an array of bytes representing a file
-	 * @param size the number of bytes to transfer
-	 * @param binary indicates whether to send the bytes as binary or text
-	 */
-	public void updateAppendFile(String remotePath, byte[] bytes, int size, boolean binary)
-	{
-		updateAppendFile(remotePath, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER);
-	}
-
-	/**
-	 * Transfers and appends a file from a server to a client.  This should only be called from
-	 * a miner on a different machine from the client.  If a file exists on the client
-	 * side that the server file maps to then the existing client file will be appended to
-	 *
-	 * @param remotePath the path of the file on the client side
-	 * @param bytes an array of bytes representing a file
-	 * @param size the number of bytes to transfer
-	 * @param binary indicates whether to send the bytes as binary or text
-	 * @param byteStreamHandlerId indicates the client byte stream handler to receive the bytes
-	 */
-	public void updateAppendFile(String remotePath, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		remotePath = new String(remotePath.replace('\\', '/'));
-		String fileName = mapToLocalPath(remotePath);
-		if (fileName != null)
-		{
-			_updateHandler.updateAppendFile(remotePath, bytes, size, binary, byteStreamHandlerId);
-		}
-	}
-
-
-
-	/**
-	 * Transfers a file from a client to a server.  The should only be called from
-	 * a client on a different machine from the server.  If a file exists on the server
-	 * side that the client file maps to then the existing server file will be replaced.
-	*
-	 * @param remotePath the path of the file on the server side
-	 * @param bytes an array of bytes representing a file
-	 * @param size the number of bytes to transfer
-	 * @param binary indicates whether to send the bytes as binary or text
-	 * @param byteStreamHandlerId indicates which byteStreamHandler to use to receive the bytes
-	 */
-	public void replaceFile(String remotePath, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		remotePath = new String(remotePath.replace('\\', '/'));
-
-		_commandHandler.sendFile(remotePath, bytes, size, binary, byteStreamHandlerId);
-	}
-
-
-	/**
-	 * Transfers a file from a client to a server.  The should only be called from
-	 * a client on a different machine from the server.  If a file exists on the server
-	 * side that the client file maps to then the existing server file will be replaced.
-	*
-	 * @param remotePath the path of the file on the server side
-	 * @param bytes an array of bytes representing a file
-	 * @param size the number of bytes to transfer
-	 * @param binary indicates whether to send the bytes as binary or text
-	 */
-	public void replaceFile(String remotePath, byte[] bytes, int size, boolean binary)
-	{
-		replaceFile(remotePath, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER);
-	}
-
-	/**
-	 * Transfers a file from a client to a server.  The should only be called from
-	 * a client on a different machine from the server.  If a file exists on the server
-	 * side that the client file maps to then the existing server file will be appended to.
-	 *
-	 * @param remotePath the path of the file on the server side
-	 * @param bytes an array of bytes representing a file
-	 * @param size the number of bytes to transfer
-	 * @param binary indicates whether to send the bytes as binary or text
-	 * @param byteStreamHandlerId indicates which byte stream handler to use to receive the bytes
-	 */
-	public void replaceAppendFile(String remotePath, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		remotePath = new String(remotePath.replace('\\', '/'));
-
-		_commandHandler.sendAppendFile(remotePath, bytes, size, binary, byteStreamHandlerId);
-	}
-
-	/**
-	 * Transfers a file from a client to a server.  The should only be called from
-	 * a client on a different machine from the server.  If a file exists on the server
-	 * side that the client file maps to then the existing server file will be appended to.
-	 *
-	 * @param remotePath the path of the file on the server side
-	 * @param bytes an array of bytes representing a file
-	 * @param size the number of bytes to transfer
-	 * @param binary indicates whether to send the bytes as binary or text
-	 */
-	public void replaceAppendFile(String remotePath, byte[] bytes, int size, boolean binary)
-	{
-		replaceAppendFile(remotePath, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER);
-	}
-
-	/**
-	 * Makes a given client element available on the server
-	 *
-	 * @param localObject the element to transfer
-	 */
-	public void setObject(DataElement localObject)
-	{
-		setObject(localObject, true);
-	}
-
-	/**
-	 * Makes a given client element available on the server
-	 *
-	 * @param localObject the element to transfer
-	 * @param noRef indicates whether the element is a reference or not
-	 */
-	public void setObject(DataElement localObject, boolean noRef)
-	{
-		DataElement cmd = findCommandDescriptor(DataStoreSchema.C_SET);
-		    //localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_SET, 1);
-		command(cmd, localObject, noRef);
-	}
-
-	public void modifyObject(DataElement localObject)
-	{
-		DataElement cmd = find(_descriptorRoot, DE.A_NAME, DataStoreResources.model_Modify, 2);
-		DataElement status = _commandHandler.command(cmd, localObject, true);
-		waitUntil(status, DataStoreResources.model_done);
-	}
-
-	/**
-	 * Used at <code>DataStore</code> initialization time to indicate where to point the host root
-	 *
-	 * @param localHostObject the client host element to transfer to the server site
-	 */
-	public DataElement setHost(DataElement localHostObject)
-	{
-		DataElement cmd = findCommandDescriptor(DataStoreSchema.C_SET_HOST);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_SET_HOST, 1);
-		DataElement status = _commandHandler.command(cmd, localHostObject, false);
-		waitUntil(status, DataStoreResources.model_done);
-		return status;
-	}
-
-	/**
-	 * Used at <code>DataStore</code> initialization time to setup the schema
-	 *
-	 */
-	public DataElement getSchema()
-	{
-		DataElement cmd = findCommandDescriptor(DataStoreSchema.C_SCHEMA);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_SCHEMA, 1);
-		return command(cmd, _dummy);
-	}
-
-	/**
-	 * Sets a property value preference on the client and server datastore
-	 * @param property the property to set
-	 * @param value the value of the property
-	 */
-	public void setPreference(String property, String value)
-	{
-		setPreference(property, value, true);
-	}
-
-	/**
-	 * Sets a property value preference on the client datastore. If
-	 * remoteAndLocal is set then the property get set on the server side as
-	 * well as the client.
-	 *
-	 * @param property the property to set
-	 * @param value the value of the property
-	 * @param remoteAndLocal whether to propagate the change to the server
-	 * @since 3.0
-	 */
-	public void setPreference(String property, String value, boolean remoteAndLocal)
-	{
-		_dataStorePreferences.put(property, value);
-		if (isVirtual() && remoteAndLocal)
-		{
-			DataElement cmd = findCommandDescriptor(DataStoreSchema.C_SET_PREFERENCE);
-			if (cmd != null)
-			{
-				DataElement prefObj = createObject(null, "preference", property); //$NON-NLS-1$
-				prefObj.setAttribute(DE.A_VALUE, value);
-				command(cmd, prefObj, true);
-			}
-		}
-
-		// notify that preferences have changed
-		IDataStorePreferenceListener[] listeners = null;
-		synchronized (_dataStorePreferenceListeners){
-			listeners = (IDataStorePreferenceListener[])_dataStorePreferenceListeners.toArray(new IDataStorePreferenceListener[_dataStorePreferenceListeners.size()]);
-		}
-			
-		for (int i = 0; i < listeners.length; i++){
-			IDataStorePreferenceListener listener = listeners[i];
-			listener.preferenceChanged(property, value);
-		}
-	}
-
-	public String getPreference(String property)
-	{
-		return (String)_dataStorePreferences.get(property);
-	}
-
-	/**
-	 * Adds a preference change listener to the DataStore
-	 * 
-	 * @param listener the listener to add
-	 * @since 3.0
-	 */
-	public void addDataStorePreferenceListener(IDataStorePreferenceListener listener){
-		synchronized (_dataStorePreferenceListeners){	
-			_dataStorePreferenceListeners.add(listener);
-		}
-	}
-
-	/**
-	 * Removes a specific preference change listener from the Datastore
-	 * 
-	 * @param listener the listener to remove
-	 * @since 3.0
-	 */
-	public void removeDataStorePreferenceListener(IDataStorePreferenceListener listener){		
-		synchronized (_dataStorePreferenceListeners){	
-			_dataStorePreferenceListeners.remove(listener);	
-		}
-	}
-
-	/**
-	 * Removes all the preference change listeners
-	 * @since 3.0
-	 */
-	public void removeAllDataStorePreferenceListeners(){
-		synchronized (_dataStorePreferenceListeners){
-			_dataStorePreferenceListeners.clear();
-		}
-	}
-
-	/**
-	 * Used to load and initialize a new miner on the host
-	 * @param minerId the qualified classname of the miner to load
-	 * @return the status of the activate miner command
-	 */
-	public DataElement activateMiner(String minerId)
-	{
-		// check if the miner is loaded
-		DataElement minerInfo = findMinerInformation(minerId);
-		if (minerInfo == null)
-		{
-			if (isVirtual())
-			{
-				DataElement cmd = findCommandDescriptor(DataStoreSchema.C_ACTIVATE_MINER);
-				DataElement minerObj = createObject(null, DataStoreResources.model_miner, minerId);
-				return command(cmd, minerObj, true);
-			}
-			else
-			{
-			}
-		}
-		return null;
-	}
-
-
-
-	/**
-	 * Used at <code>DataStore</code> initialization time to initialize the miners
-	 *
-	 * @return the status element for the initMiners command
-	 */
-	public DataElement initMiners()
-	{
-		DataElement cmd = findCommandDescriptor(DataStoreSchema.C_INIT_MINERS);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_INIT_MINERS, 1);
-
-		return command(cmd, _dummy);
-	}
-
-
-	public DataElement queryInstall()
-	{
-		DataElement cmd = findCommandDescriptor(DataStoreSchema.C_QUERY_INSTALL);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_QUERY_INSTALL, 1);
-		return synchronizedCommand(cmd, _dummy);
-	}
-
-	public DataElement queryClientIP()
-	{
-		DataElement cmd = findCommandDescriptor(DataStoreSchema.C_QUERY_CLIENT_IP);//localDescriptorQuery(_root.getDescriptor(), DataStoreSchema.C_QUERY_INSTALL, 1);
-		return synchronizedCommand(cmd, _dummy);
-	}
-
-	public boolean queryServerSpiritState()
-	{
-		DataElement spirittype = findObjectDescriptor(IDataStoreConstants.DATASTORE_SPIRIT_DESCRIPTOR);
-		if (spirittype == null) return false;
-		DataElement cmd = localDescriptorQuery(spirittype, IDataStoreConstants.C_START_SPIRIT, 2);
-		if (cmd == null) return false;
-
-		DataElement status = synchronizedCommand(cmd, _dummy);
-		if ((status != null) && status.getName().equals(DataStoreResources.model_done))
-			return true;
-		else return false;
-	}
-
-	public DataElement queryHostJVM()
-	{
-		DataElement cmd = findCommandDescriptor(DataStoreSchema.C_QUERY_JVM);
-		return synchronizedCommand(cmd, _dummy);
-	}
-
-
-	public void runRemoteClassInstance(IRemoteClassInstance runnable)
-	{
-		getCommandHandler().sendClassInstance(runnable, ClassByteStreamHandler.class.getName());
-	}
-
-	/**
-	 * Used at <code>DataStore</code> initialization validate access to the <code>DataStore</code>
-	 *
-	 * @param ticketStr ticket string
-	 * @return and indication of whether the ticket is valid or not
-	 */
-	public boolean showTicket(String ticketStr)
-	{
-		DataElement ticket = createTicket(ticketStr);
-		DataElement status = queryShowTicket(ticket);
-
-		if (status != null)
-		{
-			waitUntil(status, DataStoreResources.model_done);
-		}
-		else
-		{
-			return true;
-		}
-
-		return ticketValid(ticket);
-	}
-
-	public boolean ticketValid(DataElement ticket)
-	{
-		return ticket.getAttribute(DE.A_VALUE).equals(DataStoreResources.model_valid);
-	}
-
-	public DataElement createTicket(String ticketStr)
-	{
-		if (ticketStr == null)
-		{
-			ticketStr = "null"; //$NON-NLS-1$
-		}
-		return createObject(_tempRoot, DataStoreResources.model_ticket, ticketStr);
-	}
-
-	public DataElement queryShowTicket(DataElement ticket)
-	{
-		DataElement cmd = findCommandDescriptor(DataStoreSchema.C_VALIDATE_TICKET);
-		DataElement status = _commandHandler.command(cmd, ticket, false);
-
-		if (ticket.getName().equals("null")) //$NON-NLS-1$
-		{
-			return null;
-		}
-		return status;
-	}
-
-	/**
-	 * Indicates whether a client has permission to access the <code>DataStore</code>
-	 *
-	 * @return and indication of whether the ticket is valid or not
-	 */
-	public boolean validTicket()
-	{
-		if (_ticket.getAttribute(DE.A_VALUE).equals(DataStoreResources.model_valid))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-
-
-	/**
-	 * Wait until a given status element reached the specified state.
-	 * This is used for issuing synchronized commands
-	 *
-	 * @param status the status element
-	 * @param state the state to wait until
-	 */
-	public void waitUntil(DataElement status, String state)
-	{
-		waitUntil(status, state, _timeout);
-	}
-
-	public boolean isWaiting(DataElement status)
-	{
-		return _waitingStatuses.contains(status);
-	}
-
-	public void stopWaiting(DataElement status)
-	{
-		_waitingStatuses.remove(status);
-	}
-
-	public void startWaiting(DataElement status)
-	{
-		_waitingStatuses.add(status);
-	}
-
-	public void waitUntil(DataElement status, String state, int timeout)
-	{
-		int timeToWait = 500;
-		int timeWaited = 0;
-		boolean timedOut = false;
-		startWaiting(status);
-
-		while ((status != null)
-			&& (_status == null || _status.getName().equals("okay")) //$NON-NLS-1$
-			&& !status.getName().equals(state)
-			&& !status.getValue().equals(state)
-			&& !status.getName().equals(DataStoreResources.model_incomplete)
-			&& !timedOut)
-		{
-			if ((timeout != -1) && (timeWaited > timeout))
-			{
-				// waited too long!
-				timedOut = true;
-			}
-
-			status.waitForUpdate(timeToWait);
-
-
-			timeWaited += timeToWait;
-
-			if (!isWaiting(status))
-			{
-				// stopped waiting
-				return;
-			}
-		}
-
-		stopWaiting(status);
-
-		if (timedOut)
-		{
-			if (status != null)
-				status.setAttribute(DE.A_NAME, DataStoreResources.model_timeout);
-		}
-
-	}
-
-	public void cleanBadReferences(DataElement root)
-	{
-	}
-
-	/**
-	 * Tells the command handler to cancel all pending commands.
-	 */
-	public void cancelAllCommands()
-	{
-		_commandHandler.cancelAllCommands();
-	}
-
-	/**
-	 * Creates and issues a synchronized command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param dataObject the subject of the command
-	 * @return the status of the command
-	 */
-	public DataElement synchronizedCommand(DataElement commandDescriptor, DataElement dataObject)
-	{
-		return synchronizedCommand(commandDescriptor, dataObject, false);
-	}
-
-	/**
-	 * Creates and issues a synchronized command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param dataObject the subject of the command
-	 * @param noRef and indication of whether the subject should be referenced or not
-	 * @return the status of the command
-	 */
-	public DataElement synchronizedCommand(DataElement commandDescriptor, DataElement dataObject, boolean noRef)
-	{
-		DataElement status = command(commandDescriptor, dataObject, noRef, true);
-		waitUntil(status, DataStoreResources.model_done);
-
-		return status;
-	}
-
-	/**
-	 * Creates and issues a synchronized command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param arguments the arguments for the command
-	 * @param dataObject the subject of the command
-	 * @return the status of the command
-	 */
-	public DataElement synchronizedCommand(DataElement commandDescriptor, ArrayList arguments, DataElement dataObject)
-	{
-		DataElement status = command(commandDescriptor, arguments, dataObject, true);
-		waitUntil(status, DataStoreResources.model_done);
-
-		return status;
-	}
-
-	/**
-	 * Creates and issues a command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param arguments the arguments for the command
-	 * @param dataObject the subject of the command
-	 * @return the status of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, ArrayList arguments, DataElement dataObject)
-	{
-		return command(commandDescriptor, arguments, dataObject, false);
-	}
-
-	/**
-	 * Creates and issues a command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param arguments the arguments for the command
-	 * @param dataObject the subject of the command
-	 * @param immediate indicates whether the command should be placed first on the request queue
-	 * @return the status of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, ArrayList arguments, DataElement dataObject, boolean immediate)
-	{
-		if (_commandHandler != null)
-		{
-			return _commandHandler.command(commandDescriptor, arguments, dataObject, true, immediate);
-		}
-		return null;
-	}
-
-	/**
-	 * Creates and issues a command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param arg an argument for the command
-	 * @param dataObject the subject of the command
-	 * @return the status of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, DataElement arg, DataElement dataObject)
-	{
-		return command(commandDescriptor, arg, dataObject, false);
-	}
-
-	/**
-	 * Creates and issues a command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param arg an argument for the command
-	 * @param dataObject the subject of the command
-	 * @param immediate indicates whether the command should be placed first on the request queue
-	 * @return the status of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, DataElement arg, DataElement dataObject, boolean immediate)
-	{
-		if (_commandHandler != null)
-		{
-			return _commandHandler.command(commandDescriptor, arg, dataObject, true, immediate);
-		}
-		return null;
-	}
-
-	/**
-	 * Creates and issues a command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param dataObject the subject of the command
-	 * @return the status of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, DataElement dataObject)
-	{
-		return command(commandDescriptor, dataObject, false);
-	}
-
-	/**
-	 * Creates and issues a command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param dataObject the subject of the command
-	 * @param noRef an indication of whether to reference the subject or not
-	 * @return the status of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, DataElement dataObject, boolean noRef)
-	{
-		return command(commandDescriptor, dataObject, noRef, false);
-	}
-
-	/**
-	 * Creates and issues a command.
-	 *
-	 * @param commandDescriptor the comamnd descriptor for the command
-	 * @param dataObject the subject of the command
-	 * @param noRef an indication of whether to reference the subject or not
-	 * @param immediate an indication of whether
-	 * @return the status of the command
-	 */
-	public DataElement command(DataElement commandDescriptor, DataElement dataObject, boolean noRef, boolean immediate)
-	{
-		if (_commandHandler != null)
-		{
-			return _commandHandler.command(commandDescriptor, dataObject, !noRef);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Issues a command.
-	 *
-	 * @param commandObject an instance of a command
-	 * @return the status of the command
-	 */
-	public DataElement command(DataElement commandObject)
-	{
-		return _commandHandler.command(commandObject);
-	}
-
-	/**
-	 * Delete information from the <code>DataStore</code>.
-	 *
-	 */
-	public void flush()
-	{
-		// flush the whole thing
-		flush(_logRoot);
-		flush(_hostRoot);
-		flush(_minerRoot);
-		flush(_tempRoot);
-		flush(_descriptorRoot);
-		flush(_dummy);
-		flush(_root);
-
-	}
-
-	/**
-	 * Delete information from the <code>DataStore</code> contained by an element.
-	 *
-	 * @param element the element from which to delete
-	 */
-	public void flush(DataElement element)
-	{
-		if (element != null)
-		{
-			deleteObjects(element);
-		}
-	}
-
-	/**
-	 * Find a command descriptor element in the schema with the given value.
-	 *
-	 * @param object the object descriptor representing the type of object that can issue such a command
-	 * @param keyName the value of the command to search for
-	 * @return the command descriptor for the specified command
-	 */
-	public DataElement localDescriptorQuery(DataElement object, String keyName)
-	{
-		return localDescriptorQuery(object, keyName, 5);
-	}
-
-	/**
-	 * Find a command descriptor element in the schema with the given value.
-	 *
-	 * @param descriptor the object descriptor representing the type of object that can issue such a command
-	 * @param keyName the value of the command to search for
-	 * @param depth the depth of abstraction to search
-	 * @return the command descriptor for the specified command
-	 */
-	public DataElement localDescriptorQuery(DataElement descriptor, String keyName, int depth)
-	{
-		if ((descriptor != null) && (depth > 0))
-		{
-			for (int i = 0; i < descriptor.getNestedSize(); i++)
-			{
-				DataElement subDescriptor = descriptor.get(i).dereference();
-				String type = subDescriptor.getType();
-				if (type == null)
-				{
-				}
-				else if (type.equals(DE.T_COMMAND_DESCRIPTOR))
-				{
-					if (keyName.equals(subDescriptor.getValue()))
-						return subDescriptor;
-				}
-				else if (type.equals(DE.T_ABSTRACT_COMMAND_DESCRIPTOR))
-				{
-					DataElement result = localDescriptorQuery(subDescriptor, keyName, depth - 1);
-					if (result != null)
-						return result;
-				}
-			}
-
-			DataElement abstractedBy = getAbstractedByRelation();
-			List abstractDescriptors = descriptor.getAssociated(abstractedBy);
-			int numInherited = abstractDescriptors.size();
-
-			for (int j = 0; j < numInherited; j++)
-			{
-				DataElement abstractDescriptor = (DataElement) abstractDescriptors.get(j);
-
-				DataElement result = localDescriptorQuery(abstractDescriptor, keyName, depth - 1);
-				if (result != null)
-				{
-					return result;
-				}
-			}
-		}
-
-		getCompatibilityHandler().handleMissingCommand(descriptor, keyName);
-		return null;
-	}
-
-	public void addToRecycled(DataElement toRecycle)
-	{
-		if (!_recycled.contains(toRecycle)) _recycled.add(0, toRecycle);
-	}
-
-	/**
-	 * Finds the element that represents the miner that implements a particular command.
-	 *
-	 * @param commandDescriptor a command descriptor
-	 * @return the element representing a miner
-	 */
-	public DataElement getMinerFor(DataElement commandDescriptor)
-	{
-		String minerName = commandDescriptor.getSource();
-		DataElement theMinerElement = find(_minerRoot, DE.A_NAME, minerName, 1);
-		return theMinerElement;
-	}
-
-	/**
-	 * Finds all the elements that are of a given type from a specified element.
-	 *
-	 * @param root where to search from
-	 * @param type the descriptor representing the type of the objects to search for
-	 * @return a list of elements
-	 */
-	public List findObjectsOfType(DataElement root, DataElement type)
-	{
-		ArrayList results = new ArrayList();
-		List searchList = root.getAssociated(getContentsRelation());
-		if (searchList != null)
-		{
-			for (int i = 0; i < searchList.size(); i++)
-			{
-				DataElement child = (DataElement) searchList.get(i);
-				if (child.isOfType(type))
-				{
-					results.add(child);
-				}
-
-				List subResults = findObjectsOfType(child, type);
-				for (int j = 0; j < subResults.size(); j++)
-				{
-					results.add(subResults.get(j));
-				}
-			}
-		}
-
-		return results;
-	}
-
-	/**
-	 * Finds all the elements that are of a given type from a specified element.
-	 *
-	 * @param root where to search from
-	 * @param type the descriptor representing the type of the objects to search for
-	 * @return a list of elements
-	 */
-	public List findObjectsOfType(DataElement root, String type)
-	{
-		ArrayList results = new ArrayList();
-		List searchList = root.getAssociated(getContentsRelation());
-		if (searchList != null)
-		{
-			for (int i = 0; i < searchList.size(); i++)
-			{
-				DataElement child = (DataElement) searchList.get(i);
-				if (child.getType().equals(type) || child.isOfType(type))
-				{
-					results.add(child);
-				}
-
-				List subResults = findObjectsOfType(child, type);
-				for (int j = 0; j < subResults.size(); j++)
-				{
-					results.add(subResults.get(j));
-				}
-			}
-		}
-
-		return results;
-	}
-
-	/**
-	 * Finds all the deleted elements
-	 *
-	 * @param root where to search from
-	 * @return a list of elements
-	 */
-	public List findDeleted(DataElement root)
-	{
-		return findDeleted(root, 10);
-	}
-
-	/**
-	 * Finds all the deleted elements
-	 *
-	 * @param root where to search from
-	 * @param depth the depth to search
-	 * @return a list of elements
-	 */
-	public List findDeleted(DataElement root, int depth)
-	{
-		ArrayList results = new ArrayList();
-//		synchronized (root)
-		// synchronized can cause hang here..but may not be necessary anyway since
-		// we're not adding or removing anything here
-		{
-			if (root != null && root.getDataStore() == this)
-			{
-				if (results.contains(root))
-				{
-					return results;
-				}
-
-				if (root.isDeleted())
-				{
-					results.add(root);
-				}
-
-
-				List searchList = root.getNestedData();
-
-				if (searchList != null)
-				{
-					for (int i = 0; i < searchList.size(); i++)
-					{
-						DataElement child = (DataElement) searchList.get(i);
-						if (child != null)
-						{
-							synchronized (child)
-							{
-								if (child.isDeleted() && !results.contains(child))
-								{
-
-									results.add(child);
-									if (!child.isReference())
-									{
-										if (depth > 0)
-										{
-											List sResults = findDeleted(child, depth - 1);
-											for (int j = 0; j < sResults.size(); j++)
-											{
-												results.add(sResults.get(j));
-											}
-										}
-
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return results;
-	}
-
-	/**
-	 * Finds all relationship descriptor types that can be applied to a particular element.
-	 *
-	 * @param descriptor the object descriptor that uses relationships
-	 * @param fixateOn a filter for the type of relationships to look for
-	 * @return a list of relationship descriptor elements
-	 */
-	public ArrayList getRelationItems(DataElement descriptor, String fixateOn)
-	{
-		ArrayList result = new ArrayList();
-		if (descriptor != null)
-		{
-			// contained relationships
-			for (int i = 0; i < descriptor.getNestedSize(); i++)
-			{
-				DataElement object = descriptor.get(i).dereference();
-
-				String objType = (String) object.getElementProperty(DE.P_TYPE);
-				if (objType.equals(DE.T_RELATION_DESCRIPTOR) || objType.equals(DE.T_ABSTRACT_RELATION_DESCRIPTOR))
-				{
-					if (fixateOn != null)
-					{
-						String objName = (String) object.getElementProperty(DE.P_NAME);
-						if (objName.equals(fixateOn))
-						{
-							if (!result.contains(object))
-								result.add(object);
-						}
-					}
-					else
-					{
-						if (!result.contains(object))
-							result.add(object);
-					}
-				}
-			}
-
-			// abstracted relationships
-			List baseDescriptors = descriptor.getAssociated(getAbstractedByRelation());
-			for (int j = 0; j < baseDescriptors.size(); j++)
-			{
-
-				DataElement baseDescriptor = (DataElement) baseDescriptors.get(j);
-				ArrayList baseRelations = getRelationItems(baseDescriptor, fixateOn);
-				for (int k = 0; k < baseRelations.size(); k++)
-				{
-					DataElement relation = (DataElement) baseRelations.get(k);
-					if (!result.contains(relation))
-					{
-						result.add(relation);
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-
-
-	/**
-	 * Find all elements from a given element that match a certain attribute.
-	 *
-	 * @param root the element to search from
-	 * @param attribute the index of the attribute to match
-	 * @param pattern the value to compare with the attribute
-	 * @param ignoreCase an indication whether to ignore case for the attribute or not
-	 * @return the list of matches
-	 */
-	public ArrayList searchForPattern(DataElement root, int attribute, String pattern, boolean ignoreCase)
-	{
-		int attributes[] = { attribute };
-		String patterns[] = { pattern };
-		return searchForPattern(root, attributes, patterns, 1, ignoreCase);
-	}
-
-	/**
-	 * Find all elements from a given element that match a certain set of attributes.
-	 *
-	 * @param root the element to search from
-	 * @param attributes a list of attributes to match
-	 * @param patterns a list of values to compare with the attributes
-	 * @param ignoreCase an indication whether to ignore case for the attributes or not
-	 * @return the list of matches
-	 */
-	public ArrayList searchForPattern(DataElement root, ArrayList attributes, ArrayList patterns, boolean ignoreCase)
-	{
-		int att[] = new int[attributes.size()];
-		String ptn[] = new String[attributes.size()];
-		for (int i = 0; i < attributes.size(); i++)
-		{
-			att[i] = ((Integer) attributes.get(i)).intValue();
-			ptn[i] = (String) (patterns.get(i));
-		}
-
-		return searchForPattern(root, att, ptn, attributes.size(), ignoreCase);
-	}
-
-	/**
-	 * Find all elements from a given element that match a certain set of attributes.
-	 *
-	 * @param root the element to search from
-	 * @param attributes a list of attribute indexes to match
-	 * @param patterns a list of values to compare with the attributes
-	 * @param numAttributes the number of attributes to match
-	 * @param ignoreCase an indication whether to ignore case for the attributes or not
-	 * @return the list of matches
-	 */
-	public ArrayList searchForPattern(DataElement root, int attributes[], String patterns[], int numAttributes, boolean ignoreCase)
-	{
-		return searchForPattern(root, attributes, patterns, numAttributes, ignoreCase, 1);
-	}
-
-	/**
-	 * Find all elements from a given element that match a certain set of attributes.
-	 *
-	 * @param root the element to search from
-	 * @param attributes a list of attribute indexes to match
-	 * @param patterns a list of values to compare with the attributes
-	 * @param numAttributes the number of attributes to match
-	 * @param ignoreCase an indication whether to ignore case for the attributes or not
-	 * @param depth how deep to search
-	 * @return the list of matches
-	 */
-	public ArrayList searchForPattern(DataElement root, int attributes[], String patterns[], int numAttributes, boolean ignoreCase, int depth)
-	{
-		ArrayList searched = new ArrayList();
-		return searchForPattern(root, attributes, patterns, numAttributes, ignoreCase, depth, searched);
-	}
-
-	/**
-	 * Find all elements from a given element that match a certain set of attributes.
-	 *
-	 * @param root the element to search from
-	 * @param attributes a list of attribute indexes to match
-	 * @param patterns a list of values to compare with the attributes
-	 * @param numAttributes the number of attributes to match
-	 * @param ignoreCase an indication whether to ignore case for the attributes or not
-	 * @param depth how deep to search
-	 * @param searched a list of objects already searched
-	 * @return the list of matches
-	 */
-	public ArrayList searchForPattern(DataElement root, int attributes[], String patterns[], int numAttributes, boolean ignoreCase, int depth, ArrayList searched)
-	{
-		ArrayList result = new ArrayList();
-		if (depth > 0)
-		{
-			for (int i = 0; i < root.getNestedSize(); i++)
-			{
-				DataElement child = root.get(i);
-				child = child.dereference();
-				if ((child != null) && !searched.contains(child))
-				{
-					searched.add(child);
-					if (child.patternMatch(attributes, patterns, numAttributes, ignoreCase))
-					{
-						result.add(child);
-					}
-
-					ArrayList subResults = searchForPattern(child, attributes, patterns, numAttributes, ignoreCase, depth - 1, searched);
-					for (int j = 0; j < subResults.size(); j++)
-					{
-						result.add(subResults.get(j));
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Returns the element that represents the specified miner's data.
-	 *
-	 * @param minerName the qualified name of the miner
-	 * @return the element representing the miner information
-	 */
-	public DataElement findMinerInformation(String minerName)
-	{
-		DataElement information = null;
-		DataElement minerElement = find(_minerRoot, DE.A_NAME, minerName, 1);
-		if (minerElement != null)
-		{
-			information = find(minerElement, DE.A_TYPE, DataStoreResources.model_data, 1);
-		}
-
-		return information;
-	}
-
-	/**
-	 * Finds a descriptor element with a specified type and name.
-	 *
-	 * @param type the type of the descriptor
-	 * @param name the name of the descriptor
-	 * @return the found descriptor
-	 */
-	public DataElement findDescriptor(String type, String name)
-	{
-		if (_descriptorRoot != null)
-		{
-			synchronized (_descriptorRoot)
-			{
-			    if (type.equals(DE.T_OBJECT_DESCRIPTOR))
-			    {
-			        return (DataElement)_objDescriptorMap.get(name);
-			    }
-			    else if (type.equals(DE.T_COMMAND_DESCRIPTOR))
-			    {
-			        return (DataElement)_cmdDescriptorMap.get(name);
-
-			    }
-			    else if (type.equals(DE.T_RELATION_DESCRIPTOR))
-			    {
-			        return (DataElement)_relDescriptorMap.get(name);
-			    }
-			    else
-			    {
-					for (int i = 0; i < _descriptorRoot.getNestedSize(); i++)
-					{
-						DataElement descriptor = _descriptorRoot.get(i);
-
-						if (descriptor.getName().equals(name) && descriptor.getType().equals(type))
-						{
-							return descriptor;
-						}
-					}
-			    }
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Finds an object descriptor element with a specified name.
-	 *
-	 * @param name the name of the descriptor
-	 * @return the found descriptor
-	 */
-	public DataElement findObjectDescriptor(String name)
-	{
-	    return (DataElement)_objDescriptorMap.get(name);
-	}
-
-	/**
-	 * Finds an relation descriptor element with a specified name.
-	 *
-	 * @param name the name of the descriptor
-	 * @return the found descriptor
-	 */
-	public DataElement findRelationDescriptor(String name)
-	{
-	    return (DataElement)_relDescriptorMap.get(name);
-	}
-
-	/**
-	 * Finds an command descriptor element with a specified name.
-	 *
-	 * @param name the name of the descriptor
-	 * @return the found descriptor
-	 */
-	public DataElement findCommandDescriptor(String name)
-	{
-	    return (DataElement)_cmdDescriptorMap.get(name);
-	}
-
-	/**
-	 * Finds an element with the specified ID.
-	 *
-	 * @param id the ID of the descriptor
-	 * @return the found element
-	 */
-	public DataElement find(String id)
-	{
-		synchronized (_hashMap){
-			DataElement result = (DataElement) _hashMap.get(id);
-			return result;
-		}
-	}
-
-	/**
-	 * Finds an element matching a specified attribute and name.
-	 *
-	 * @param root the element to search from
-	 * @param attribute the index of the attribute to compare
-	 * @param name the name of the element
-	 * @return the first found element
-	 */
-	public DataElement find(DataElement root, int attribute, String name)
-	{
-		return find(root, attribute, name, 10);
-	}
-
-	/**
-	 * Finds an element matching a specified attribute and name.
-	 *
-	 * @param root the element to search from
-	 * @param attribute the index of the attribute to compare
-	 * @param name the name of the element
-	 * @param depth the depth of the search
-	 * @return the first found element
-	 */
-	public DataElement find(DataElement root, int attribute, String name, int depth)
-	{
-		if ((root != null) && (name != null) && !root.isReference() && depth > 0)
-		{
-
-			if (StringCompare.compare(name, root.getAttribute(attribute), false))
-			{
-				return root;
-			}
-			else if (depth > 0)
-			{
-				for (int h = 0; h < root.getNestedSize(); h++)
-				{
-					DataElement nestedObject = root.get(h);
-					String compareName = nestedObject.getAttribute(attribute);
-
-					if (!nestedObject.isReference() && (compareName != null))
-					{
-
-						if (name.compareTo(compareName) == 0)
-						{
-							return nestedObject;
-						}
-						else
-						{
-							DataElement foundObject = find(nestedObject, attribute, name, depth - 1);
-							if (foundObject != null)
-							{
-								return foundObject;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the mapping from a remote path to a local path.
-	 *
-	 * @param aPath the remote path
-	 * @return the local path
-	 */
-	public String mapToLocalPath(String aPath)
-	{
-		/*
-		String result = null;
-
-		char slash = '/';
-		String remotePath = aPath.replace('\\', slash);
-		String localRoot = _dataStoreAttributes.getAttribute(DataStoreAttributes.A_LOCAL_PATH).replace('\\', slash);
-		String remoteRoot = getHostRoot().getSource().replace('\\', slash);
-
-		if (localRoot.equals(remoteRoot))
-		{
-			result = remotePath;
-		}
-		else if (remotePath.startsWith(localRoot))
-		{
-			result = remotePath;
-		}
-		else if (remotePath.startsWith(remoteRoot))
-		{
-			result = new String(localRoot + slash + remotePath.substring(remoteRoot.length(), remotePath.length()));
-		}
-		else
-		{
-			// file is outside of scope
-			// create temporary location
-			int indexOfDrive = remotePath.indexOf(":");
-			if (indexOfDrive > 0)
-			{
-				remotePath = remotePath.substring(indexOfDrive + 1, remotePath.length());
-			}
-
-			result = new String(localRoot + remotePath);
-		}
-
-		return result;
-		*/
-
-		// no more mapping here - expect actual paths
-		return aPath;
-	}
-
-	/**
-	 * Persist the <code>DataStore</code> tree from a given root
-	 *
-	 * @param root the element to persist from
-	 * @param remotePath the path where the persisted file should be saved
-	 * @param depth the depth of persistence from the root
-	 */
-	public void saveFile(DataElement root, String remotePath, int depth)
-	{
-		remotePath = new String(remotePath.replace('\\', '/'));
-		String fileName = mapToLocalPath(remotePath);
-		try
-		{
-			// need to create directories as well
-			File file = new File(fileName);
-			try
-			{
-				file = file.getCanonicalFile();
-			}
-			catch (IOException e)
-			{
-			}
-
-			if (!file.exists())
-			{
-				File dir = new File(file.getParent());
-				dir.mkdirs();
-				file.createNewFile();
-			}
-
-			File newFile = new File(file.getCanonicalPath());
-
-			if (newFile.canWrite())
-			{
-				FileOutputStream fileStream = new FileOutputStream(newFile);
-				PrintStream fileWriter = new PrintStream(fileStream);
-				BufferedWriter dataWriter = new BufferedWriter(new OutputStreamWriter(fileStream, DE.ENCODING_UTF_8));
-
-				XMLgenerator generator = new XMLgenerator(this);
-				generator.setIgnoreDeleted(true);
-				generator.setFileWriter(fileWriter);
-				generator.setDataWriter(dataWriter);
-				generator.setBufferSize(1000);
-				generator.generate(root, depth);
-				generator.flushData();
-
-				fileStream.close();
-			}
-		}
-		catch (IOException e)
-		{
-			System.out.println(e);
-		}
-	}
-
-	/**
-	 * Save a file in the specified location
-	 *
-	 * @param remotePath the path where to save the file
-	 * @param buffer the buffer to save in the file
-	 */
-	public void saveFile(String remotePath, byte[] buffer, int size, boolean binary)
-	{
-		getDefaultByteStreamHandler().receiveBytes(remotePath, buffer, size, binary);
-	}
-
-	/**
-	 * Save a file in the specified location
-	 *
-	 * @param remotePath the path where to save the file
-	 * @param buffer the buffer to save in the file
-	 * @param byteStreamHandlerId indicates which byte stream handler to receive the bytes
-	 */
-	public void saveFile(String remotePath, byte[] buffer, int size, boolean binary, String byteStreamHandlerId)
-	{
-
-		getByteStreamHandler(byteStreamHandlerId).receiveBytes(remotePath, buffer, size, binary);
-	}
-
-	/**
-	 * Saves a class to memory (but not to disk) where it can then be loaded by
-	 * the RemoteClassLoaders. The class will be saved in a new thread, so this method
-	 * will potentially return before the class has been saved.
-	 *
-	 * @param className the fully qualified name of the class
-	 * @param buffer the contents of the class
-	 * @param size the size of the buffer
-	 */
-	public void saveClass(String className, byte[] buffer, int size)
-	{
-		getDefaultClassByteStreamHandler().receiveBytes(className, buffer, size);
-	}
-
-
-	/**
-	 * Saves a class instance
-	 *
-	 * @param buffer the contents of the class
-	 * @param size the size of the buffer
-	 * @param classbyteStreamHandlerId the id for the byte stream handler
-	 */
-	public void saveClassInstance(byte[] buffer, int size, String classbyteStreamHandlerId)
-	{
-		getDefaultClassByteStreamHandler().receiveInstanceBytes(buffer, size);
-	}
-
-
-	/**
-	 * Saves a class to memory (but not to disk) where it can then be loaded by
-	 * the RemoteClassLoaders. The class will be saved in a new thread, so this method
-	 * will potentially return before the class has been saved.
-	 *
-	 * @param className the fully qualified name of the class
-	 * @param buffer the contents of the class
-	 * @param size the size of the buffer
-	 * @param classbyteStreamHandlerId indicates which class byte stream handler to receive the bytes
-	 */
-	public void saveClass(String className, byte[] buffer, int size, String classbyteStreamHandlerId)
-	{
-		getClassByteStreamHandler(classbyteStreamHandlerId).receiveBytes(className, buffer, size);
-	}
-
-	/**
-	 * Append a file to the specified location
-	 *
-	 * @param remotePath the path where to save the file
-	 * @param buffer the buffer to append into the file
-	 */
-	public void appendToFile(String remotePath, byte[] buffer, int size, boolean binary)
-	{
-		getDefaultByteStreamHandler().receiveAppendedBytes(remotePath, buffer, size, binary);
-	}
-
-	/**
-	 * Append a file to the specified location
-	 *
-	 * @param remotePath the path where to save the file
-	 * @param buffer the buffer to append into the file
-	 * @param byteStreamHandlerId indicates which byte stream handler to receive the bytes
-	 */
-	public void appendToFile(String remotePath, byte[] buffer, int size, boolean binary, String byteStreamHandlerId)
-	{
-		getByteStreamHandler(byteStreamHandlerId).receiveAppendedBytes(remotePath, buffer, size, binary);
-	}
-
-	/**
-	 * Load a persisted <code>DataStore</code> tree into the specified <code>DataElement</code>
-	 *
-	 * @param root the root element of the persisted tree
-	 * @param pathName the location of the persisted file
-	 */
-	public void load(DataElement root, String pathName)
-	{
-		String fileName = pathName;
-
-		FileInputStream inFile = loadFile(fileName);
-		if (inFile != null)
-		{
-			BufferedInputStream document = new BufferedInputStream(inFile);
-			try
-			{
-				XMLparser parser = new XMLparser(this);
-				DataElement subRoot = parser.parseDocument(document, null);
-				if (subRoot != null)
-				{
-					root.removeNestedData();
-					List nestedData = subRoot.getNestedData();
-					if (nestedData != null)
-					{
-						root.addNestedData(nestedData, true);
-					}
-					refresh(root);
-				}
-			}
-			catch (IOException e)
-			{
-			}
-		}
-
-	}
-
-	public static FileInputStream loadFile(String fileName)
-	{
-		File file = new File(fileName);
-		if (file.exists() && (file.length() > 0))
-		{
-			try
-			{
-				FileInputStream inFile = new FileInputStream(file);
-
-				return inFile;
-			}
-			catch (FileNotFoundException e)
-			{
-				return null;
-			}
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Indicate whether a given descriptor can contain the specified element
-	 *
-	 * @param descriptor the object descriptor to test
-	 * @param dataElement the object to test against
-	 * @return and indication whether dataElement can be in an object of type descriptor
-	 */
-	public boolean filter(DataElement descriptor, DataElement dataElement)
-	{
-		return filter(descriptor, dataElement, 2);
-	}
-
-	/**
-	 * Indicate whether a given descriptor can contain the specified element
-	 *
-	 * @param descriptor the object descriptor to test
-	 * @param dataElement the object to test against
-	 * @param depth how far to search
-	 * @return and indication whether dataElement can be in an object of type descriptor
-	 */
-	public boolean filter(DataElement descriptor, DataElement dataElement, int depth)
-	{
-		if (depth > 0)
-		{
-			depth--;
-
-			String dataType = (String) dataElement.getElementProperty(DE.P_TYPE);
-			String typeStr = (String) descriptor.getElementProperty(DE.P_NAME);
-
-			if (((dataType != null) && (typeStr != null)) && (dataType.equals(typeStr) || typeStr.equals(DataStoreResources.model_all)))
-			{
-				return true;
-			}
-			else
-			{
-				for (int i = 0; i < descriptor.getNestedSize(); i++)
-				{
-					if (filter(descriptor.get(i), dataElement, depth))
-					{
-						return true;
-					}
-				}
-
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Indicate whether a given set of descriptors can contain the specified element
-	 *
-	 * @param descriptors the object descriptors to test
-	 * @param dataElement the object to test against
-	 * @return and indication whether dataElement can be in an object of type descriptor
-	 */
-	public boolean filter(ArrayList descriptors, DataElement dataElement)
-	{
-		for (int i = 0; i < descriptors.size(); i++)
-		{
-			if (filter((DataElement) descriptors.get(i), dataElement))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Indicate whether an command is specified as transient
-	 *
-	 * @param commandObject the object descriptors to test
-	 * @return and indication whether the command is transient
-	 */
-	public boolean isTransient(DataElement commandObject)
-	{
-		boolean isTransient = false;
-		DataElement subject = commandObject.get(0);
-
-		DataElement subjectDescriptor = subject.getDescriptor();
-		if (subjectDescriptor != null)
-		{
-			DataElement minerElement = getMinerFor(commandObject);
-			DataElement transientObjects = find(minerElement, DE.A_TYPE, DataStoreResources.model_transient, 1);
-			if (transientObjects != null)
-			{
-				for (int i = 0; i < transientObjects.getNestedSize(); i++)
-				{
-					DataElement transientDescriptor = transientObjects.get(i).dereference();
-					if (transientDescriptor == subjectDescriptor)
-					{
-						isTransient = true;
-					}
-				}
-			}
-		}
-
-		return isTransient;
-	}
-
-	private void initializeDescriptors()
-	{
-		_dataStoreSchema.extendSchema(_descriptorRoot);
-	}
-
-	public void enableAutoRefresh(boolean flag)
-	{
-		_autoRefresh = flag;
-	}
-
-	public boolean isAutoRefreshOn()
-	{
-		return _autoRefresh;
-	}
-	/**
-	 * getUserPreferencesDirectory() - returns directory on IFS where to store user settings
-	 */
-	public String getUserPreferencesDirectory()
-	{
-		if (_userPreferencesDirectory == null) {
-
-			String clientUserID;
-			if (_client != null){
-				_userPreferencesDirectory = _client.getProperty("user.home"); //$NON-NLS-1$
-				clientUserID = _client.getProperty("client.username"); //$NON-NLS-1$
-			}
-			else {
-				_userPreferencesDirectory = System.getProperty("user.home"); //$NON-NLS-1$
-				clientUserID = System.getProperty("client.username"); //$NON-NLS-1$
-			}
-
-			if (clientUserID == null || clientUserID.equals("")) //$NON-NLS-1$
-			{
-				clientUserID = ""; //$NON-NLS-1$
-			}
-			else
-			{
-				clientUserID += File.separator;
-			}
-
- 			// append a '/' if not there
-  			if ( _userPreferencesDirectory.length() == 0 ||
-  			     _userPreferencesDirectory.charAt( _userPreferencesDirectory.length() -1 ) != File.separatorChar ) {
-
-				_userPreferencesDirectory = _userPreferencesDirectory + File.separator;
-		    }
-
-  			// for bug 282599, log directory allows customization of log location relative to user dir
-  			String logDirectory = System.getProperty("DSTORE_LOG_DIRECTORY"); //$NON-NLS-1$
-  			if (logDirectory == null){
-  				logDirectory = ".eclipse" + File.separator + "RSE" + File.separator;  //$NON-NLS-1$//$NON-NLS-2$
-  			}
-  			
-  			if (logDirectory.length() > 0){
-  				// append a '/' if not there
-  				if (logDirectory.charAt( logDirectory.length() -1 ) != File.separatorChar ) {
-  					logDirectory = logDirectory + File.separator;
-  				}
-  				
-  				// remove the '/' if first char
-  				if (logDirectory.charAt(0) == File.separatorChar){
-  					logDirectory = logDirectory.substring(1);
-  				}
-  			}
-  			
-  			_userPreferencesDirectory = _userPreferencesDirectory + logDirectory + clientUserID;  			
-  			
-	  		File dirFile = new File(_userPreferencesDirectory);
-	  		if (!dirFile.exists()) {
-	 	 		dirFile.mkdirs();
-	  		}
-		}
-	  return _userPreferencesDirectory;
-	}
-
-	private void initialize()
-	{
-		_lastCreatedElements = new ArrayList();
-		_minersLocations = new ArrayList();
-
-
-		_random = new Random(System.currentTimeMillis());
-
-		_objDescriptorMap = new HashMap(100);
-		_cmdDescriptorMap = new HashMap(100);
-		_relDescriptorMap = new HashMap(100);
-		_dataStorePreferences = new HashMap(10);
-		_dataStorePreferenceListeners = new ArrayList();
-
-		_hashMap = new HashMap(2 * _initialSize);
-		_recycled = new ArrayList(_initialSize);
-		initElements(_initialSize);
-
-		_timeout = 20000;
-		_autoRefresh = false;//true;
-
-
-		_dataStoreSchema = new DataStoreSchema(this);
-
-		if (!isVirtual())
-		{
-			// get the time the server can remain idle before automatically shutting down
-			// if the idle is 0 or not set then it is considered indefinite.
-			// The server is considered idle for the period of which no commands are
-			// received in server command handler
-			String serverIdleShutdownTimeout = System.getProperty("DSTORE_IDLE_SHUTDOWN_TIMEOUT"); //$NON-NLS-1$
-			if (serverIdleShutdownTimeout != null)
-			{
-				_serverIdleShutdownTimeout = Integer.parseInt(serverIdleShutdownTimeout);
-			}
-
-		}
-
-
-		String tracingProperty = System.getProperty("DSTORE_TRACING_ON"); //$NON-NLS-1$
-		if (tracingProperty != null && tracingProperty.equals("true")) //$NON-NLS-1$
-		{
-			_tracingOn = true;
-		}
-		else
-		{
-			_tracingOn = false;
-		}
-		if (_tracingOn)
-		{
-			// only start tracing now if we're in one process per server mode
-			if (SystemServiceManager.getInstance().getSystemService() == null){
-				String logDir = getUserPreferencesDirectory();
-				_traceFileHandle = new File(logDir, ".dstoreTrace"); //$NON-NLS-1$
-				if (!_traceFileHandle.exists()){
-					try { // try to create it
-						_traceFileHandle.createNewFile();
-					} catch (IOException e) {
-					}
-				}
-				if (_traceFileHandle.canWrite()){
-					try
-					{
-						_traceFile = new RandomAccessFile(_traceFileHandle, "rw"); //$NON-NLS-1$
-						startTracing();
-					}
-					catch (IOException e)
-					{
-						// turn tracing off if there's a problem
-						_tracingOn = false;
-					}
-				}
-				else {
-					_tracingOn = false;
-				}
-			}
-		}
-
-		//_remoteClassLoader = new RemoteClassLoader(this);
-		_classReqRepository = new HashMap();
-
-		_waitingStatuses = new ArrayList();
-
-		_byteStreamHandlerRegistry = new ByteStreamHandlerRegistry();
-		_classbyteStreamHandlerRegistry = new ClassByteStreamHandlerRegistry();
-		setDefaultByteStreamHandler();
-		setDefaultClassByteStreamHandler();
-
-		// only start tracing now if we're in one process per server mode
-		if (SystemServiceManager.getInstance().getSystemService() == null){
-			assignCacheJar();
-		}
-
-		registerLocalClassLoader(this.getClass().getClassLoader());
-	}
-
-	public void startDataElementRemoverThread()
-	{
-		if (!isVirtual() && _deRemover == null)
-		{
-			String memLogging = System.getProperty("DSTORE_MEMLOGGING_ON"); //$NON-NLS-1$
-			_memLoggingOn = (memLogging != null && memLogging.equals("true")); //$NON-NLS-1$
-
-			if (_memLoggingOn)
-			{
-				String logDir = getUserPreferencesDirectory();
-				_memLoggingFileHandle = new File(logDir, ".dstoreMemLogging"); //$NON-NLS-1$
-				if (_memLoggingFileHandle.canWrite()){
-					try
-					{
-						_memLogFile = new RandomAccessFile(_memLoggingFileHandle, "rw"); //$NON-NLS-1$
-						startMemLogging();
-					}
-					catch (IOException e)
-					{
-						// turn mem logging off if there's a problem
-						_memLoggingOn = false;
-					}
-				}
-				else {
-					_memLoggingOn = false;
-				}
-			}
-			_deRemover = new DataElementRemover(this);
-			_deRemover.start();
-		}
-	}
-
-	public boolean isDoSpirit()
-	{
-		if (isVirtual()) return _spiritModeOn;
-		else return _spiritModeOn && _spiritCommandReceived;
-	}
-
-	public void receiveStartSpiritCommand()
-	{
-		_spiritCommandReceived = true;
-	}
-
-	public IByteStreamHandler getDefaultByteStreamHandler()
-	{
-	    return _byteStreamHandlerRegistry.getDefault();
-	}
-
-	public IClassByteStreamHandler getDefaultClassByteStreamHandler()
-	{
-	    return _classbyteStreamHandlerRegistry.getDefault();
-	}
-
-	public IByteStreamHandler getByteStreamHandler(String id)
-	{
-		return _byteStreamHandlerRegistry.getByteStreamHandler(id);
-	}
-
-	public IClassByteStreamHandler getClassByteStreamHandler(String id)
-	{
-		return _classbyteStreamHandlerRegistry.getClassByteStreamHandler(id);
-	}
-
-	public void setRemoteIP(String remoteIP)
-	{
-		_remoteIP = remoteIP;
-	}
-
-	public String getRemoteIP()
-	{
-		return _remoteIP;
-	}
-
-	/**
-	 * Sets the current <code>ByteStreamHandler</code> to be the default.
-	 */
-	public void setDefaultByteStreamHandler()
-	{
-		setDefaultByteStreamHandler(null);
-	}
-
-	/**
-	 * Sets the current <code>ClassByteStreamHandler</code> to be the default.
-	 */
-	public void setDefaultClassByteStreamHandler()
-	{
-		setDefaultClassByteStreamHandler(null);
-	}
-
-	/**
-	 * Sets the current <code>ByteStreamHandler</code> to use for sending and receiving
-	 * files.
-	 * @param handler the <code>ByteStreamHandler</code> to use
-	 */
-	public void setDefaultByteStreamHandler(IByteStreamHandler handler)
-	{
-		if (handler == null)
-		{
-			DataElement log = null;
-			handler = new ByteStreamHandler(this, log);
-		}
-		_byteStreamHandlerRegistry.setDefaultByteStreamHandler(handler);
-	}
-
-	public RemoteClassLoader getRemoteClassLoader()
-	{
-		if (_remoteLoader == null)
-		{
-
-			_remoteLoader = new RemoteClassLoader(this);
-		}
-		return _remoteLoader;
-	}
-
-	/**
-	 * Sets the current <code>ClassByteStreamHandler</code> to use for sending and receiving
-	 * classes.
-	 * @param handler the <code>ClassByteStreamHandler</code> to use
-	 */
-	public void setDefaultClassByteStreamHandler(IClassByteStreamHandler handler)
-	{
-		if (handler == null)
-		{
-			DataElement log = null;
-			handler = new ClassByteStreamHandler(this, log);
-		}
-		_classbyteStreamHandlerRegistry.setDefaultClassByteStreamHandler(handler);
-	}
-
-	/**
-	 * Registers a byte stream handler.
-	 * @param handler the handler to register
-	 */
-	public void registerByteStreamHandler(IByteStreamHandler handler)
-	{
-		_byteStreamHandlerRegistry.registerByteStreamHandler(handler);
-	}
-
-	/**
-	 * Registers a class byte stream handler.
-	 * @param handler the handler to register
-	 */
-	public void registerClassByteStreamHandler(IClassByteStreamHandler handler)
-	{
-		_classbyteStreamHandlerRegistry.registerClassByteStreamHandler(handler);
-	}
-
-	public void setByteConverter(IByteConverter converter)
-	{
-		_byteConverter = converter;
-	}
-
-	public IByteConverter getByteConverter()
-	{
-		if (_byteConverter == null)
-		{
-			_byteConverter = new DefaultByteConverter();
-		}
-		return _byteConverter;
-	}
-
-
-	/**
-	 * Preallocates a set of <code>DataElement</code>s.
-	 *
-	 * @param the number of elements to preallocate
-	 */
-	private void initElements(int size)
-	{
-		for (int i = 0; i < size; i++)
-		{
-			_recycled.add(new DataElement(this));
-		}
-	}
-
-	/**
-	 * Returns a new <code>DataElement</code> by either using an existing preallocated <code>DataElement</code> or
-	 * by creating a new one.
-	 *
-	 * @return the new <code>DataElement</code>
-	 */
-	private synchronized DataElement createElement()
-	{
-		DataElement newObject = null;
-
-		int numRecycled = _recycled.size();
-
-		if (numRecycled > 1)
-		{
-			synchronized (_recycled)
-			{
-
-				/*
-				if (numRecycled > _MAX_FREE)
-				    {
-					int numRemoved = numRecycled - _MAX_FREE;
-					for (int i = 1; i <= numRemoved; i++)
-					    {
-						DataElement toRemove = (DataElement)_recycled.remove(numRemoved - i);
-						toRemove = null;
-					    }
-				    }
-				*/
-
-				newObject = (DataElement) _recycled.remove((_recycled.size() - 1));
-			}
-		}
-		if (newObject == null)
-		{
-			newObject = new DataElement(this);
-		}
-
-		newObject.setUpdated(false);
-		newObject.setSpirit(false);
-		updateLastCreated(newObject);
-		return newObject;
-	}
-
-	private void updateLastCreated(DataElement element)
-	{
-		_lastCreatedElements.add(0, element);
-		if (_lastCreatedElements.size() > 4)
-		{
-			for (int i = _lastCreatedElements.size() - 1; i > 4; i--)
-			{
-				_lastCreatedElements.remove(i);
-			}
-		}
-	}
-
-	public List getLastCreatedElements()
-	{
-		return _lastCreatedElements;
-	}
-
-	private void createRoots()
-	{
-		_externalRoot = createObject(_root, DataStoreResources.model_host, "External DataStores", "", "extID"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		_tempRoot = createObject(_root, "temp", "Temp Root", "", "tempID"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		_dummy = createObject(_root, "temp", "dummy"); //$NON-NLS-1$ //$NON-NLS-2$
-		_logRoot = createObject(_root, DataStoreResources.model_log, DataStoreResources.model_Log_Root, "", "logID"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		_minerRoot = createObject(_root, DataStoreResources.model_miners, DataStoreResources.model_Tool_Root, "", "minersID"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		_hostRoot =
-			createObject(
-				_root,
-				DataStoreResources.model_host,
-				_dataStoreAttributes.getAttribute(DataStoreAttributes.A_HOST_NAME),
-				_dataStoreAttributes.getAttribute(DataStoreAttributes.A_HOST_PATH),
-				"hostID"); //$NON-NLS-1$
-
-		_status = createObject(_root, DataStoreResources.model_status, "okay", "", "statusID"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	private void deleteObjectHelper(DataElement from, DataElement toDelete, int depth)
-	{
-		if (depth > 0)
-		{
-			depth--;
-			toDelete.delete();
-			for (int i = 0; i < toDelete.getNestedSize(); i++)
-			{
-				DataElement subDelete = toDelete.get(i);
-				if (subDelete != null && subDelete.getDataStore() == this && !subDelete.isDeleted()) 				{
-					deleteObjectHelper(toDelete, subDelete, depth);
-				}
-			}
-
-			String id = toDelete.getAttribute(DE.A_ID);
-			synchronized (_hashMap)
-			{
-				_hashMap.remove(id);
-			}
-
-			if (!isConnected() && from != null)
-			{
-				from.removeNestedData(toDelete);
-			}
-		}
-	}
-
-	private void disconnectObjectHelper(DataElement toDisconnect, int depth)
-	{
-		if (depth > 0)
-		{
-			depth--;
-			_deRemover.addToQueueForRemoval(toDisconnect);
-			for (int i = 0; i < toDisconnect.getNestedSize(); i++)
-			{
-				DataElement subDisconnect = toDisconnect.get(i);
-				if (subDisconnect != null && subDisconnect.getDataStore() == this && !subDisconnect.isSpirit())
-				{
-					disconnectObjectHelper(subDisconnect, depth);
-				}
-			}
-		}
-	}
-
-	private String makeIdUnique(String id)
-	{
-		boolean containsKey = false;
-		synchronized (_hashMap){
-			containsKey = _hashMap.containsKey(id);
-		}
-		
-		if (!containsKey && id.length() > 0)
-		{
-			return id;
-		}
-		else
-		{
-			return generateId();
-			/*
-			String newId = String.valueOf(_random.nextInt());
-			while (_hashMap.containsKey(newId))
-			{
-				newId = String.valueOf(_random.nextInt());
-			}
-
-			return newId;
-			*/
-		}
-
-
-	}
-
-	private String generateId(DataElement parent, String type, String name)
-	{
-		// by default, name will be the id
-		//return name;
-		return generateId();
-	}
-
-	/**
-	 * Generates a new unique ID to be used by a <code>DataElement</code>
-	 *
-	 * @return the new id
-	 */
-	protected String generateId()
-	{
-		String newId = String.valueOf(_random.nextInt());
-		while (contains(newId))
-		{
-			newId = String.valueOf(_random.nextInt());
-		}
-
-		return newId;
-	}
-
-	public void startTracing()
-	{
-		if (_tracingOn && _traceFile != null && _traceFileHandle != null)
-		{
-			try
-			{
-				_traceFile.seek(_traceFileHandle.length());
-			}
-			catch (IOException e)
-			{
-			}
-
-			trace("-----------------------------------------"); //$NON-NLS-1$
-			trace("Start Tracing at " + System.currentTimeMillis()); //$NON-NLS-1$
-		}
-	}
-
-	public void startMemLogging()
-	{
-		if (_memLoggingOn && _memLogFile != null && _memLoggingFileHandle != null)
-		{
-			try
-			{
-				_memLogFile.seek(_memLoggingFileHandle.length());
-			}
-			catch (IOException e)
-			{
-			}
-
-			memLog("-----------------------------------------"); //$NON-NLS-1$
-			memLog("Start Memory Logging at " + System.currentTimeMillis()); //$NON-NLS-1$
-		}
-	}
-
-	public void memLog(String str)
-	{
-		internalMemLog(str);
-	}
-
-	public void trace(String str)
-	{
-		internalTrace(str);
-	}
-
-	public void trace(Throwable e)
-	{
-		internalTrace(e.getMessage());
-		internalTrace(e);
-	}
-
-	private void internalTrace(Throwable e)
-	{
-		if (_tracingOn && _traceFile != null && e != null)
-		{
-			try
-			{
-				StackTraceElement[] stack = e.getStackTrace();
-				for (int i = 0;i<stack.length;i++)
-				{
-					_traceFile.writeBytes(stack[i].toString());
-					_traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$
-				}
-				_traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$
-			}
-			catch (IOException ex)
-			{
-			}
-		}
-	}
-
-	private void internalTrace(String message)
-	{
-		if (_tracingOn && _traceFile != null && message != null)
-		{
-			try
-			{
-				_traceFile.writeBytes((new Date()).toString() + ": "); //$NON-NLS-1$
-				_traceFile.writeBytes(message);
-				_traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$
-			}
-			catch (IOException e)
-			{
-			}
-		}
-	}
-
-	private void internalMemLog(String message)
-	{
-		if (_memLoggingOn && _memLogFile != null && message != null)
-		{
-			try
-			{
-				_memLogFile.writeBytes((new Date()).toString() + ": "); //$NON-NLS-1$
-				_memLogFile.writeBytes(message);
-				_memLogFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$
-			}
-			catch (IOException e)
-			{
-			}
-		}
-	}
-
-	public void finish()
-	{
-		// dy: the call to flush deletes all the elements in the tree
-		// which causes havoc for iSeries caching when switching between offline / online
-		//if (isVirtual())
-		//	flush();
-		if (_deRemover != null){
-			_deRemover.finish();
-		}
-
-		if (_tracingOn)
-		{
-			try
-			{
-				if (_traceFile != null){
-					_traceFile.writeBytes("Finished Tracing"); //$NON-NLS-1$
-					_traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$
-					_traceFile.close();
-				}
-			}
-			catch (IOException e)
-			{
-			}
-		}
-	}
-
-	/**
-	 * On the server, sends a class request through the ServerUpdateHandler
-	 * to the client.
-	 * On the client, sends the request through the ClientCommandHandler
-	 * @param className The fully qualified name of the class to request.
-	 */
-	public void requestClass(String className)
-	{
-		if (isVirtual())
-		{
-			_commandHandler.requestClass(className);
-		}
-		else
-		{
-			_updateHandler.requestClass(className);
-		}
-	}
-
-	/**
-	 * On the server, sends a keepalive request through the ServerUpdateHandler
-	 * to the client.
-	 */
-	public void sendKeepAliveRequest()
-	{
-		if (isVirtual())
-		{
-			_commandHandler.sendKeepAliveRequest();
-		}
-		else
-		{
-			_updateHandler.sendKeepAliveRequest();
-		}
-	}
-
-	/**
-	 * On the server, sends a class through the ServerCommandHandler
-	 * to the client.
-	 * On the client, sends the class through the ClientUpdateHandler
-	 * @param className The fully qualified name of the class to request.
-	 */
-	public void sendClass(String className)
-	{
-		if (isVirtual())
-		{
-			_commandHandler.sendClass(className);
-		}
-		else
-		{
-			_updateHandler.sendClass(className);
-		}
-	}
-
-
-	/**
-	 * @return the central repository for all class requests initiated by
-	 * this server and its RemoteClassLoaders.
-	 */
-	public HashMap getClassRequestRepository()
-	{
-		return _classReqRepository;
-	}
-
-
-	/**
-	 * Saves a class to disk (caches it) so that it can be loaded by the classloader without needing to
-	 * download it again
-	 */
-	public synchronized void cacheClass(String className, byte[] bytes, int size)
-	{
-		if (_cacheJar == null) return;
-
-		// get the entries from the old cache file
-		Enumeration oldEntries;
-		JarFile oldJarFile = null;
-
-		try
-		{
-			oldJarFile = new JarFile(_cacheJar);
-		}
-		catch (IOException e)
-		{
-			// the jar must be corrupted, so we must erase it.
-			System.out.println("Cache jarfile corrupted... erasing it."); //$NON-NLS-1$
-			if (!_cacheJar.delete()) System.out.println("Couldn't erase corrupted jarfile!"); //$NON-NLS-1$
-			// try to make a new one again.
-			assignCacheJar();
-			return;
-		}
-		oldEntries = oldJarFile.entries();
-
-		// create a new cache file to store the new class in
-		File newJarFile = new File(getCacheDirectory() + REMOTE_CLASS_CACHE_JARFILE_NAME + "_next" + JARFILE_EXTENSION); //$NON-NLS-1$
-		JarOutputStream newJarOutput = null;
-
-		try
-		{
-			newJarOutput = createNewCacheJar(newJarFile);
-		}
-		catch (IOException e)
-		{
-			System.out.println("Class caching failed. Could not create new cache jarfile."); //$NON-NLS-1$
-			return;
-		}
-
-		// transfer the old entries to the new cache file
-		while (oldEntries.hasMoreElements())
-		{
-			JarEntry nextEntry = (JarEntry) oldEntries.nextElement();
-			BufferedInputStream source = null;
-			try
-			{
-				 source = new BufferedInputStream(oldJarFile.getInputStream(nextEntry));
-			}
-			catch (Exception e)
-			{
-				continue;
-			}
-			nextEntry.setCompressedSize(-1);
-			try
-			{
-				newJarOutput.putNextEntry(nextEntry);
-
-				byte[] buf = new byte[1024];
-				int numRead = source.read(buf);
-
-				while (numRead > 0)
-				{
-					newJarOutput.write(buf, 0, numRead);
-					numRead = source.read(buf);
-				}
-
-				newJarOutput.closeEntry();
-				source.close();
-			}
-			catch (IOException e)
-			{
-				System.out.println("Class caching failed. Could not recopy entry from old jar. Cleaning..."); //$NON-NLS-1$
-				try { newJarOutput.close(); } catch (IOException ee) { }
-				if (!newJarFile.delete()) System.out.println("Couldn't erase new jarfile!"); //$NON-NLS-1$
-			}
-		}
-
-		// add the new class file
-		JarEntry newEntry = new JarEntry(className.replace('.', '/') + ".class"); //$NON-NLS-1$
-		newEntry.setCompressedSize(-1);
-
-		try
-		{
-			newJarOutput.putNextEntry(newEntry);
-			newJarOutput.write(bytes, 0, size);
-			newJarOutput.closeEntry();
-			newJarOutput.close();
-		}
-		catch (IOException e)
-		{
-			System.out.println("Class caching failed. Could not cache new class into new jar. Cleaning..."); //$NON-NLS-1$
-			try { newJarOutput.close(); } catch (IOException ee) { }
-			if (!newJarFile.delete()) System.out.println("Couldn't erase new jarfile!"); //$NON-NLS-1$
-		}
-
-		// get rid of the old jar file
-		try { oldJarFile.close(); } catch (IOException ee) { }
-		if (!_cacheJar.delete()) System.out.println("Could not delete old cache jar."); //$NON-NLS-1$
-		if (!newJarFile.renameTo(_cacheJar)) System.out.println("Could not rename new cache jar."); //$NON-NLS-1$
-
-		System.out.println(className + " cached in " + _cacheJar.getAbsolutePath()); //$NON-NLS-1$
-	}
-
-	protected JarOutputStream createNewCacheJar(File newJar) throws IOException
-	{
-		newJar.createNewFile();
-		JarOutputStream dest = new JarOutputStream(
-				  new FileOutputStream(newJar));
-		dest.setMethod(ZipOutputStream.DEFLATED);
-		return dest;
-	}
-
-	protected void assignCacheJar()
-	{		
-		String cacheDirectory = getCacheDirectory();
-		File cacheJar = new File(cacheDirectory + REMOTE_CLASS_CACHE_JARFILE_NAME + JARFILE_EXTENSION);
-		File nextCacheJar = new File(cacheDirectory + REMOTE_CLASS_CACHE_JARFILE_NAME + "_next" + JARFILE_EXTENSION); //$NON-NLS-1$
-		if (nextCacheJar.exists()) 
-			nextCacheJar.renameTo(cacheJar);
-		if (!cacheJar.exists() && cacheJar.canWrite())
-		{
-			try
-			{
-				JarOutputStream cacheOut = createNewCacheJar(cacheJar);
-				cacheOut.putNextEntry(new JarEntry("/")); //$NON-NLS-1$
-				cacheOut.closeEntry();
-				cacheOut.close();
-
-				_cacheJar = cacheJar;
-			}
-			catch (IOException e)
-			{
-				e.printStackTrace();
-				_cacheJar = null;
-				return;
-			}
-		}
-		else {
-			_cacheJar = null;
-		}
-	}
-
-	protected String getCacheDirectory()
-	{
-		String cacheDirectory = getUserPreferencesDirectory();
-		if (!cacheDirectory.endsWith(File.separator))
-		{
-			cacheDirectory = cacheDirectory + File.separator;
-		}
-		return cacheDirectory;
-	}
-
-	public File getRemoteClassLoaderCache()
-	{
-		return _cacheJar;
-	}
-
-	public void sendKeepAliveConfirmation()
-	{
-		if (isVirtual())
-		{
-			_commandHandler.sendKeepAliveConfirmation();
-		}
-		else
-		{
-			_updateHandler.sendKeepAliveConfirmation();
-		}
-	}
-
-	/**
-	 * @return what type of attribute tag is used on the peer DataStore to indicate whether dataelements
-	 * are references, values, or spirit elements. If the peer DataStore is an older one, this will return
-	 * "isRef", if its up-to-date, it will return "refType", and if the tag hasnt been determined yet, this method
-	 * will return null.
-	 */
-	public String getReferenceTag()
-	{
-		return referenceTag;
-	}
-
-	/**
-	 * Sets what type of attribute tag is used on the peer DataStore to indicate whether dataelements
-	 * are references, values, or spirit elements.
-	 */
-	public void setReferenceTag(String tag)
-	{
-		referenceTag = tag;
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public int printTree(String indent, DataElement root)
-	{
-		return printTree(indent, 0, root);
-	}
-
-	/**
-	 * @since 3.0
-	 */
-	public int printTree(String indent, int number, DataElement root)
-	{
-		int total = number;
-		if (root != null)
-		{
-			total++;
-			boolean isSpirit = root.isSpirit();
-			boolean isDeleted = root.isDeleted();
-			String prefix = "DataElement"; //$NON-NLS-1$
-			if (isSpirit)
-				prefix += "<spirit>"; //$NON-NLS-1$
-			if (isDeleted)
-				prefix += "<deleted>"; //$NON-NLS-1$
-
-			String msg = indent + prefix + "["+ total + "]("+root.getType()+", "+root.getName()+")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-			System.out.println(msg);
-			for (int i = 0; i < root.getNestedSize(); i++)
-			{
-				DataElement currentElement = root.get(i);
-				total = printTree(indent + " ", total, currentElement); //$NON-NLS-1$
-			}
-		}
-		return total;
-	}
-
-	/**
-	 * Indicates that the datastore should transfer a DataElement's buffer
-	 * attribute in the communication layer
-	 * 
-	 * @param flag true if the DataElement buffer attribute should be transfered
-	 * @since 3.0
-	 */
-	public void setGenerateBuffer(boolean flag)
-	{
-		if (isVirtual())
-		{
-			// client side
-			((ClientCommandHandler)_commandHandler).setGenerateBuffer(flag);
-		}
-		else
-		{
-			// server side
-			((ServerUpdateHandler)_updateHandler).setGenerateBuffer(flag);
-		}
-	}
-
-	/**
-	 * This method is used to set the Client object for each user. The _client
-	 * variable is null until setClient() is called. After _client is set, it
-	 * can not be changed.
-	 * 
-	 * This method should only be called once to associate a particular client
-	 * with a DataStore. By default, the client for the user of the DataStore
-	 * process is set but, when there is an ISystemService, the daemon sets the
-	 * client.
-	 * 
-	 * @param client the object of the Client class
-	 * @since 3.0
-	 */
-	public void setClient(Client client)
-	{
-		// if client is not null, then this method gets called once.
-		// subsequent calls will have no effect.
-		if (_client == null){
-			_client = client;
-			_userPreferencesDirectory = null;
-			String logDir = getUserPreferencesDirectory();
-
-			// single process server?
-			if (SystemServiceManager.getInstance().getSystemService() != null)
-			{
-				if (_tracingOn) {
-					_traceFileHandle = new File(logDir, ".dstoreTrace"); //$NON-NLS-1$
-					if (_traceFileHandle.canWrite()){
-						try
-						{
-							_traceFile = new RandomAccessFile(_traceFileHandle, "rw"); //$NON-NLS-1$
-							startTracing();
-						}
-						catch (IOException e)
-						{
-							// turn tracing off if there's a problem
-							_tracingOn = false;
-						}
-					}
-					else {
-						_tracingOn = false;
-					}
-				}
-			}
-			assignCacheJar();
-		}
-	}
-
-	/**
-	 * This method is used to get the object of the Client stored for each user.
-	 * 
-	 * @return the object of the Client stored for each user
-	 * @since 3.0
-	 */
-	public Client getClient()
-	{
-		return _client;
-	}
-
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreAttributes.java
deleted file mode 100644
index 2a0fa21ab..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreAttributes.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight (IBM) - update version to 9.0.0
- * David McKnight (IBM) - [220892] version back to 8.1.0 since protocol hasn't changed
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-/**
- * This class is used to store attributes that are required for configuring a
- * remote connection.
- * 
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class DataStoreAttributes
-{
-	/**
-	 * Datastore Protocol Version. Current value = "DataStore.8.0.0". Will be
-	 * changed with protocol updates (which are only rarely necessary).
-	 */
-	public static final String DATASTORE_VERSION = "DataStore.8.0.0"; //$NON-NLS-1$
-
-	public static final int A_PLUGIN_PATH = 0;
-	public static final int A_ROOT_NAME = 1;
-	public static final int A_ROOT_PATH = 2;
-	public static final int A_HOST_NAME = 3;
-	public static final int A_HOST_PATH = 4;
-	public static final int A_HOST_PORT = 5;
-	public static final int A_LOCAL_NAME = 6;
-	public static final int A_LOCAL_PATH = 7;
-	public static final int A_LOG_NAME = 8;
-	public static final int A_LOG_PATH = 9;
-	public static final int A_SIZE = 10;
-
-	private String _attributes[];
-
-	/**
-	 * Constructor
-	 */
-	public DataStoreAttributes()
-	{
-		_attributes = new String[A_SIZE];
-
-		// root
-		_attributes[A_ROOT_NAME] = new String("Local"); //$NON-NLS-1$
-		_attributes[A_ROOT_PATH] = new String(""); //$NON-NLS-1$
-
-		// log
-		_attributes[A_LOG_NAME] = new String("log"); //$NON-NLS-1$
-		_attributes[A_LOG_PATH] = new String("log.xml"); //$NON-NLS-1$
-
-		// host
-		_attributes[A_HOST_NAME] = new String(""); //$NON-NLS-1$
-		_attributes[A_HOST_PATH] = new String(""); //$NON-NLS-1$
-		_attributes[A_HOST_PORT] = new String("4033"); //$NON-NLS-1$
-
-		// local
-		_attributes[A_LOCAL_NAME] = new String(""); //$NON-NLS-1$
-		_attributes[A_LOCAL_PATH] = new String(""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Gets an attribute at a specified index
-	 * @param attributeIndex the index of an attribute
-	 * @return the attribute
-	 */
-	public String getAttribute(int attributeIndex)
-	{
-		return _attributes[attributeIndex];
-	}
-
-	/**
-	 * Set an attribute at a specified index
-	 * @param attributeIndex the index of an attribute
-	 */
-	public void setAttribute(int attributeIndex, String attribute)
-	{
-		_attributes[attributeIndex] = new String(attribute);
-		if (attributeIndex == A_PLUGIN_PATH)
-		{
-			if (_attributes[A_ROOT_PATH].length() == 0)
-			{
-				_attributes[A_ROOT_PATH] = attribute;
-			}
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.java
deleted file mode 100644
index b8a354fce..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreResources.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-/**
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- **/
-public class DataStoreResources 
-{
-	public static final String model_Log_Root="Log Root"; //$NON-NLS-1$
-	public static final String model_Tool_Root="Tool Root"; //$NON-NLS-1$
-	public static final String model_Set="Set"; //$NON-NLS-1$
-	public static final String model_Modify="Modify"; //$NON-NLS-1$
-	public static final String model_timeout="timeout"; //$NON-NLS-1$
-	public static final String model_data="data"; //$NON-NLS-1$
-	public static final String model_transient="transient"; //$NON-NLS-1$
-	public static final String model_all="all"; //$NON-NLS-1$
-	public static final String model_host="host"; //$NON-NLS-1$
-	public static final String model_root="root"; //$NON-NLS-1$
-	public static final String model_descriptors="descriptors"; //$NON-NLS-1$
-	public static final String model_descriptor_for="descriptor for"; //$NON-NLS-1$
-	public static final String model_project="Project"; //$NON-NLS-1$
-	public static final String model_log="log"; //$NON-NLS-1$
-	public static final String model_deleted="deleted"; //$NON-NLS-1$
-	public static final String model_status="status"; //$NON-NLS-1$
-	public static final String model_start="start"; //$NON-NLS-1$
-	public static final String model_failed="failed"; //$NON-NLS-1$
-	public static final String model_done="done"; //$NON-NLS-1$
-	public static final String model_working="working"; //$NON-NLS-1$
-	public static final String model_progress="progress"; //$NON-NLS-1$
-	public static final String model_error="error"; //$NON-NLS-1$
-	public static final String model_warning="warning"; //$NON-NLS-1$
-	public static final String model_informational="informational"; //$NON-NLS-1$
-	public static final String model_markers="markers"; //$NON-NLS-1$
-	public static final String model_invocation="invocation"; //$NON-NLS-1$
-	public static final String model_pattern="pattern"; //$NON-NLS-1$
-	public static final String model_input="input"; //$NON-NLS-1$
-	public static final String model_output="output"; //$NON-NLS-1$
-	public static final String model_details="details"; //$NON-NLS-1$
-	public static final String model_contents="contents"; //$NON-NLS-1$
-	public static final String model_contents_arguments="Contents and Arguments"; //$NON-NLS-1$
-	public static final String model_parent="parent"; //$NON-NLS-1$
-	public static final String model_arguments="arguments"; //$NON-NLS-1$
-	public static final String model_Commands="Commands"; //$NON-NLS-1$
-	public static final String model_device="device"; //$NON-NLS-1$
-	public static final String model_directory="directory"; //$NON-NLS-1$
-	public static final String model_folder="folder"; //$NON-NLS-1$
-	public static final String model_file="file"; //$NON-NLS-1$
-	public static final String model_Filesystem_Objects="Filesystem Objects"; //$NON-NLS-1$
-	public static final String model_Container_Object="Container Object"; //$NON-NLS-1$
-	public static final String model_Directories="Directories"; //$NON-NLS-1$
-	public static final String model_Details="Details"; //$NON-NLS-1$
-	public static final String model_miners="miners"; //$NON-NLS-1$
-	public static final String model_miner="miner"; //$NON-NLS-1$
-	public static final String model_state="state"; //$NON-NLS-1$
-	public static final String model_ticket="ticket"; //$NON-NLS-1$
-	public static final String model_valid="valid"; //$NON-NLS-1$
-	public static final String model_invalid="invalid"; //$NON-NLS-1$
-	public static final String model_abstracted_by="abstracted by"; //$NON-NLS-1$
-	public static final String model_abstracts="abstracts"; //$NON-NLS-1$
-	public static final String model_incomplete="incomplete"; //$NON-NLS-1$
-	public static final String model_Miner_Details="Miner Details"; //$NON-NLS-1$
-	public static final String model_Hosts="Hosts"; //$NON-NLS-1$
-	public static final String model_Tools="Tools"; //$NON-NLS-1$
-	public static final String model_Schema="Schema"; //$NON-NLS-1$
-	public static final String model_Logged_Commands="Logged Commands"; //$NON-NLS-1$
-	public static final String model_Cancel="Cancel"; //$NON-NLS-1$
-	public static final String model_Get_Schema="Get Schema"; //$NON-NLS-1$
-	public static final String model_Show_Ticket="Show Ticket"; //$NON-NLS-1$
-	public static final String model_Init_Miners="Init Miners"; //$NON-NLS-1$
-	public static final String model_Set_Host="Set Host"; //$NON-NLS-1$
-	public static final String model_Exit="Exit"; //$NON-NLS-1$
-	public static final String model_Connect_to="Connect to"; //$NON-NLS-1$
-	public static final String model_Disconnect_from="Disconnect from"; //$NON-NLS-1$
-	public static final String model_Delete_Connection="Delete Connection"; //$NON-NLS-1$
-	public static final String model_time="time"; //$NON-NLS-1$
-	public static final String model_property="property"; //$NON-NLS-1$
-	public static final String model_start_time="start time"; //$NON-NLS-1$
-	public static final String model_command_time="command time"; //$NON-NLS-1$
-	public static final String model_Transient_Objects="Transient Objects"; //$NON-NLS-1$
-	public static final String model_Data="Data"; //$NON-NLS-1$
-	public static final String model_No_input="No input"; //$NON-NLS-1$
-	public static final String model_Open="Open"; //$NON-NLS-1$
-	public static final String model_Close="Close"; //$NON-NLS-1$
-	public static final String model_Refresh="Refresh"; //$NON-NLS-1$
-	public static final String model_Query="Query"; //$NON-NLS-1$
-	public static final String model_Cancellable="Cancellable"; //$NON-NLS-1$
-
-	public static final String SERIALIZED_TYPE="SERIALIZED"; //$NON-NLS-1$
-	public static final String CLASS_TYPE="CLASS"; //$NON-NLS-1$
-	public static final String REQUEST_CLASS_TYPE="REQUEST_CLASS"; //$NON-NLS-1$
-	public static final String DEFAULT_CLASSBYTESTREAMHANDLER="default"; 	 //$NON-NLS-1$
-	public static final String FILE_TYPE="FILE"; //$NON-NLS-1$
-	public static final String DOCUMENT_TYPE="DOCUMENT"; //$NON-NLS-1$
-	public static final String DEFAULT_BYTESTREAMHANDLER="default"; //$NON-NLS-1$
-	public static final String TRUE="true"; //$NON-NLS-1$
-	public static final String FALSE="false"; //$NON-NLS-1$
-	public static final String DELETED="deleted"; //$NON-NLS-1$
-	public static final String KEEPALIVE_TYPE="KEEPALIVE"; //$NON-NLS-1$
-	public static final String KEEPALIVECONFIRM_TYPE="CONFIRMKEEPALIVE"; //$NON-NLS-1$
-	public static final String REFERENCE="reference"; //$NON-NLS-1$
-	public static final String VALUE="value"; //$NON-NLS-1$
-	public static final String SPIRIT="spirit"; //$NON-NLS-1$
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java
deleted file mode 100644
index 711aa463e..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStoreSchema.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-
-/**
- * This class is used for defining the base DataStore schema.  All
- * miner schemas are derived from the schema defined here.  This class
- * provides getters for quickly getting at commonly used schema descriptors.
- * 
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class DataStoreSchema
-{
-
-
-	private DataStore _dataStore;
-	private DataElement _abstractedBy;
-	private DataElement _abstracts;
-	private DataElement _contents;
-	private DataElement _container;
-	private DataElement _attributes;
-	
-	private DataElement _objectDescriptor;
-	private DataElement _commandDescriptor;
-	private DataElement _relationDescriptor;
-	
-	private DataElement _abstractObjectDescriptor;
-	private DataElement _abstractCommandDescriptor;
-	private DataElement _abstractRelationDescriptor;
-
-
-	public static final String C_VALIDATE_TICKET = "C_VALIDATE_TICKET"; //$NON-NLS-1$
-	public static final String C_SET             = "C_SET"; //$NON-NLS-1$
-	public static final String C_MODIFY          = "C_MODIFY"; //$NON-NLS-1$
-	public static final String C_SET_HOST        = "C_SET_HOST"; //$NON-NLS-1$
-	public static final String C_SCHEMA          = "C_SCHEMA"; //$NON-NLS-1$
-	public static final String C_SET_PREFERENCE  = "C_SET_PREFERENCE"; //$NON-NLS-1$
-	public static final String C_ADD_MINERS      = "C_ADD_MINERS"; //$NON-NLS-1$
-	public static final String C_ACTIVATE_MINER  = "C_ACTIVATE_MINER"; //$NON-NLS-1$
-	public static final String C_INIT_MINERS     = "C_INIT_MINERS"; //$NON-NLS-1$
-	public static final String C_OPEN	           = "C_OPEN"; //$NON-NLS-1$
-	public static final String C_CANCEL          = "C_CANCEL"; //$NON-NLS-1$
-	public static final String C_SEND_INPUT      = "C_SEND_INPUT"; //$NON-NLS-1$
-	public static final String C_QUERY           = "C_QUERY"; //$NON-NLS-1$
-	public static final String C_REFRESH         = "C_REFRESH"; //$NON-NLS-1$
-	public static final String C_EXIT            = "C_EXIT"; //$NON-NLS-1$
-	public static final String C_CLOSE           = "C_CLOSE"; //$NON-NLS-1$
-	public static final String C_NOTIFICATION    = "C_NOTIFICATION"; //$NON-NLS-1$
-	public static final String C_QUERY_INSTALL   = "C_QUERY_INSTALL"; //$NON-NLS-1$
-	public static final String C_QUERY_CLIENT_IP = "C_QUERY_CLIENT_IP"; //$NON-NLS-1$
-	public static final String C_QUERY_JVM	   = "C_QUERY_JVM"; //$NON-NLS-1$
-
-	
-	/**
-	 * Constructor
-	 * @param dataStore the associated DataStore
-	 */
-	public DataStoreSchema(DataStore dataStore)
-	{
-		_dataStore = dataStore;
-	}
-
-	/**
-	 * Returns the <i>abstracted by</i> relationship descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getAbstractedByRelation()
-	{
-		return _abstractedBy;
-	}
-
-	/**
-	 * Returns the <i>abstracts</i> relationship descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getAbstractsRelation()
-	{
-		return _abstracts;
-	}
-
-	/**
-	 * Returns the <i>contents</i> relationship descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getContentsRelation()
-	{
-		return _contents;
-	}
-
-	/**
-	 * Returns the <i>attributes</i> relationship descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getAttributesRelation()
-	{
-		return _attributes;
-	}
-
-	/**
-	 * Returns the <i>container</i> base object descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getContainerType()
-	{
-		return _container;
-	}
-	
-	/**
-	 * Returns the base object descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getObjectDescriptor()
-	{
-		return _objectDescriptor;
-	}
-	
-	
-	/**
-	 * Returns the base command descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getCommandDescriptor()
-	{
-		return _commandDescriptor;
-	}
-	
-	/**
-	 * Returns the base relation descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getRelationDescriptor()
-	{
-		return _relationDescriptor;
-	}
-	
-	
-	/**
-	 * Returns the base object descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getAbstractObjectDescriptor()
-	{
-		return _abstractObjectDescriptor;
-	}
-	
-	
-	/**
-	 * Returns the base command descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getAbstractCommandDescriptor()
-	{
-		return _abstractCommandDescriptor;
-	}
-	
-	/**
-	 * Returns the base relation descriptor
-	 * @return the descriptor
-	 */
-	public DataElement getAbstractRelationDescriptor()
-	{
-		return _abstractRelationDescriptor;
-	}
-	
-	
-
-	/**
-	 * This method is called when the DataStore is initialized.  It sets
-	 * up the base DataStore schema.
-	 * @param schemaRoot the root object of the DataStore schema
-	 */
-	public void extendSchema(DataElement schemaRoot)
-	{
-		// miner-specific descriptors are defined in the miners when they extend the schema
-
-		// these first elements are the most fundamental	  
-//		DataElement uiCmdD = _dataStore.createObject(schemaRoot, DE.T_UI_COMMAND_DESCRIPTOR, DE.T_UI_COMMAND_DESCRIPTOR);
-		_dataStore.createObject(schemaRoot, DE.T_UI_COMMAND_DESCRIPTOR, DE.T_UI_COMMAND_DESCRIPTOR);
-
-		_commandDescriptor = _dataStore.createCommandDescriptor(schemaRoot, DE.T_COMMAND_DESCRIPTOR);
-		_objectDescriptor = _dataStore.createObjectDescriptor(schemaRoot, DE.T_OBJECT_DESCRIPTOR);
-		_relationDescriptor = _dataStore.createRelationDescriptor(schemaRoot, DE.T_RELATION_DESCRIPTOR);
-
-		_abstractObjectDescriptor = _dataStore.createAbstractObjectDescriptor(schemaRoot, DE.T_ABSTRACT_OBJECT_DESCRIPTOR);
-		_abstractCommandDescriptor = _dataStore.createAbstractCommandDescriptor(schemaRoot, DE.T_ABSTRACT_COMMAND_DESCRIPTOR);
-		_abstractRelationDescriptor = _dataStore.createAbstractRelationDescriptor(schemaRoot, DE.T_ABSTRACT_RELATION_DESCRIPTOR);
-
-		// cancellable command base descriptor
-		DataElement cancellable = _dataStore.createAbstractObjectDescriptor(schemaRoot, DataStoreResources.model_Cancellable);
-
-		DataElement rootD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_root);
-		
-		DataElement hostD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_host);
-
-		DataElement logD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_log);
-		DataElement statusD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_status);
-
-//		DataElement deletedD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_deleted);
-		_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_deleted);
-
-		// misc
-		DataElement allD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_all);
-
-//		DataElement invokeD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_invocation);
-		_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_invocation);
-//		DataElement patternD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_pattern);
-		_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_pattern);
-
-//		DataElement inputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_input);
-		_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_input);
-//		DataElement outputD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output);
-		_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_output);
-
-		// types of relationships
-		_contents = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_contents);
-		_contents.setDepth(100);
-
-		DataElement descriptorForD = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_descriptor_for);
-		descriptorForD.setDepth(1);
-
-		DataElement parentD = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_parent);
-		parentD.setDepth(1);
-
-		_attributes = _dataStore.createRelationDescriptor(schemaRoot, "attributes"); //$NON-NLS-1$
-		_attributes.setDepth(0);
-
-		DataElement argsD = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_arguments);
-		_abstracts = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_abstracts);
-
-		_abstractedBy = _dataStore.createRelationDescriptor(schemaRoot, DataStoreResources.model_abstracted_by);
-
-		DataElement caRelations = _dataStore.createAbstractRelationDescriptor(schemaRoot, DataStoreResources.model_contents_arguments);
-		_dataStore.createReference(caRelations, _contents, _contents);
-		_dataStore.createReference(caRelations, argsD, _contents);
-
-		_dataStore.createReference(_objectDescriptor, _contents, _contents);
-		_dataStore.createReference(_objectDescriptor, parentD, _contents);
-		_dataStore.createReference(_objectDescriptor, _abstracts, _contents);
-		_dataStore.createReference(_objectDescriptor, _abstractedBy, _contents);
-
-		_dataStore.createReference(_abstractObjectDescriptor, _contents, _contents);
-		_dataStore.createReference(_abstractObjectDescriptor, parentD, _contents);
-		_dataStore.createReference(_abstractObjectDescriptor, _abstracts, _contents);
-		_dataStore.createReference(_abstractObjectDescriptor, _abstractedBy, _contents);
-
-		_dataStore.createReference(statusD, _contents, _contents);
-
-		_dataStore.createReference(_commandDescriptor, allD, _contents);
-		_dataStore.createReference(_commandDescriptor, caRelations, _contents);
-		_dataStore.createReference(_commandDescriptor, argsD, _contents);
-		_dataStore.createReference(_commandDescriptor, _contents, _contents);
-
-		DataElement logDetails = _dataStore.createAbstractObjectDescriptor(logD, DataStoreResources.model_Commands);
-		_dataStore.createReference(logDetails, _commandDescriptor, _contents);
-		_dataStore.createReference(logDetails, allD, _contents);
-		_dataStore.createReference(logD, caRelations, _contents);
-		_dataStore.createReference(logD, _contents, _contents);
-
-		//Base Container Object
-		_container = _dataStore.createAbstractObjectDescriptor(schemaRoot, DataStoreResources.model_Container_Object);
-		_dataStore.createCommandDescriptor(_container, DataStoreResources.model_Query, "*", C_QUERY, false); //$NON-NLS-1$
-		_dataStore.createReference(_container, _contents, _contents);
-
-		// file objects
-		DataElement fileD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_file);
-		DataElement dirD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_directory);
-
-		DataElement fsObject = _dataStore.createAbstractObjectDescriptor(schemaRoot, DataStoreResources.model_Filesystem_Objects);
-
-	
-		_dataStore.createReference(_container, fsObject, _abstracts, _abstractedBy);
-
-		_dataStore.createReference(fileD, fsObject, _abstracts, _abstractedBy);
-		_dataStore.createReference(fsObject, dirD, _abstracts, _abstractedBy);
-
-		_dataStore.createReference(fsObject, fileD, _contents);
-		_dataStore.createReference(fsObject, dirD, _contents);
-		_dataStore.createReference(fsObject, fsObject, _contents);
-
-		_dataStore.createReference(dirD, fileD, _contents);
-		_dataStore.createReference(dirD, dirD, _contents);
-
-		// miner descriptors
-		DataElement minersD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miners);
-		DataElement minerD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_miner);
-		DataElement dataD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_data);
-//		DataElement transientD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient);
-		_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_transient);
-//		DataElement stateD = _dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state);
-		_dataStore.createObjectDescriptor(schemaRoot, DataStoreResources.model_state);
-		// containers
-		_dataStore.createReference(_container, rootD, _abstracts, _abstractedBy);
-		_dataStore.createReference(_container, hostD, _abstracts, _abstractedBy);
-		_dataStore.createReference(_container, logD, _abstracts, _abstractedBy);
-		_dataStore.createReference(_container, minersD, _abstracts, _abstractedBy);
-		_dataStore.createReference(_container, minerD, _abstracts, _abstractedBy);
-		_dataStore.createReference(_container, dataD, _abstracts, _abstractedBy);
-
-	
-
-		// basic commands
-		_dataStore.createCommandDescriptor(cancellable, DataStoreResources.model_Cancel, "*", C_CANCEL); //$NON-NLS-1$
-		_dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Set, "-", C_SET, false); //$NON-NLS-1$
-		_dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Set_Host, "-", C_SET_HOST, false); //$NON-NLS-1$
-		_dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Init_Miners, "*", C_INIT_MINERS, false); //$NON-NLS-1$
-		_dataStore.createCommandDescriptor(rootD, "Add Miners", "-", C_ADD_MINERS, false); //$NON-NLS-1$ //$NON-NLS-2$
-		_dataStore.createCommandDescriptor(rootD, "Activate Miner", "-", C_ACTIVATE_MINER, false); //$NON-NLS-1$ //$NON-NLS-2$
-		_dataStore.createCommandDescriptor(rootD, "Set Preference", "-", C_SET_PREFERENCE, false); //$NON-NLS-1$ //$NON-NLS-2$
-	
-		_dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Show_Ticket, "-", C_VALIDATE_TICKET, false); //$NON-NLS-1$
-		_dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Get_Schema, "*", C_SCHEMA, false); //$NON-NLS-1$
-		_dataStore.createCommandDescriptor(rootD, DataStoreResources.model_Exit, "*", C_EXIT, false); //$NON-NLS-1$
-		_dataStore.createCommandDescriptor(rootD, "Query Install", "*", C_QUERY_INSTALL, false); //$NON-NLS-1$ //$NON-NLS-2$
-		_dataStore.createCommandDescriptor(rootD, "Query Client IP", "*", C_QUERY_CLIENT_IP, false); //$NON-NLS-1$ //$NON-NLS-2$
-		_dataStore.createCommandDescriptor(rootD, "Query JVM", "*", C_QUERY_JVM, false); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		_dataStore.createCommandDescriptor(rootD, "Notification", "*", C_NOTIFICATION, false); //$NON-NLS-1$ //$NON-NLS-2$
-		_dataStore.createCommandDescriptor(rootD, "Send Input", "*", C_SEND_INPUT, false); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		
-		// both ends have this base schema, so mark each descriptor as updated
-		for (int i = 0; i < schemaRoot.getNestedSize(); i++)
-		{
-			DataElement descriptor = schemaRoot.get(i);
-			descriptor.setUpdated(true);	
-			
-			for (int j = 0; j < descriptor.getNestedSize(); j++)
-			{
-				DataElement subDescriptor = descriptor.get(j);
-				subDescriptor.setUpdated(true);	
-			}
-			
-			schemaRoot.setUpdated(true);
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultDataStoreCompatibilityHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultDataStoreCompatibilityHandler.java
deleted file mode 100644
index 730283781..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DefaultDataStoreCompatibilityHandler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- *
- * Contributors:
- * David McKnight   (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients
- ********************************************************************************/
-package org.eclipse.dstore.core.model;
-
-/**
- * @since 3.0
- */
-public class DefaultDataStoreCompatibilityHandler implements
-		IDataStoreCompatibilityHandler {
-	private DataStore _dataStore;
-
-	public DefaultDataStoreCompatibilityHandler(DataStore dataStore){
-		_dataStore = dataStore;
-	}
-
-	public int checkCompatibility(String handshake){
-
-		String[] clientVersionStr = DataStoreAttributes.DATASTORE_VERSION.split("\\.");	 //$NON-NLS-1$
-		String[] serverVersionStr = handshake.split("\\."); //$NON-NLS-1$
-
-		int clientVersion = Integer.parseInt(clientVersionStr[VERSION_INDEX_VERSION]);
-		int serverVersion = Integer.parseInt(serverVersionStr[VERSION_INDEX_VERSION]);
-
-		if (handshake.equals(DataStoreAttributes.DATASTORE_VERSION))
-		{
-			return HANDSHAKE_CORRECT;
-		}
-		else
-		{
-			if (handshake.startsWith("<DataElement")) //$NON-NLS-1$
-			{
-				return HANDSHAKE_SERVER_OLDER;
-			}
-			else if (serverVersionStr[VERSION_INDEX_PROTOCOL].equals(clientVersionStr[VERSION_INDEX_PROTOCOL]))
-			{
-				if (serverVersion == clientVersion)
-				{
-					// major versions match so should be compatible
-					return HANDSHAKE_CORRECT;
-				}
-				else
-				{
-					if (serverVersion > clientVersion)
-					{
-						// newer server
-						if (serverVersion - 1 == clientVersion)
-						{
-							return HANDSHAKE_SERVER_RECENT_NEWER;
-						}
-						else
-						{
-							return HANDSHAKE_SERVER_NEWER;
-						}
-					}
-					else
-					{
-						// newer client
-						if (serverVersion + 1 == clientVersion)
-						{
-							return HANDSHAKE_SERVER_RECENT_OLDER;
-						}
-						else if (serverVersion + 2 == clientVersion)
-						{
-							// TODO we shouldn't be allowing this but
-							// wanting to see if old (non-open RSE server still works with open RSE)
-							return HANDSHAKE_SERVER_RECENT_OLDER;
-						}
-						else
-						{
-							return HANDSHAKE_SERVER_OLDER;
-						}
-					}
-				}
-			}
-			else
-			{
-				return HANDSHAKE_INCORRECT;
-			}
-		}
-	}
-
-	public void handleMissingCommand(DataElement descriptor, String keyName){
-		// default does nothing in this situation
-	//	System.out.println("missing command:"+keyName);
-	//	System.out.println("Descriptor:"+descriptor.getName());
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Handler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Handler.java
deleted file mode 100644
index a05802249..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/Handler.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- *  Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-import org.eclipse.dstore.core.server.SecuredThread;
-
-/**
- * The Handler class is the base class for the threaded mechanisms in
- * the DataStore.  This is a thread that periodically does some activity.
- * The frequency of handling can be configured.
- */
-public abstract class Handler extends SecuredThread
-{
-
-
-	protected int _waitIncrement;
-	protected boolean _keepRunning;
-
-	/**
-	 * Constructor
-	 */
-	public Handler()
-	{
-		_keepRunning = true;
-		_waitIncrement = 100;
-	}
-
-	/**
-	 * Sets the time interval to wait between handling
-	 * @param value the wait interval
-	 */
-	public void setWaitTime(int value)
-	{
-		_waitIncrement = value;
-	}
-
-	/**
-	 * Returns the time interval to wait between handling
-	 * @return the wait interval
-	 */
-	public int getWaitTime()
-	{
-		return _waitIncrement;
-	}
-
-	/**
-	 * Sets the associated DataStore
-	 * @param dataStore
-	 */
-	public void setDataStore(DataStore dataStore)
-	{
-		super.setDataStore(dataStore);
-	}
-
-	/**
-	 * Indicates whether the handler is finished or not
-	 * @return whether the handler is finished or not
-	 */
-	public boolean isFinished()
-	{
-		return !_keepRunning;
-	}
-
-	/**
-	 * Finish handling
-	 */
-	public void finish()
-	{
-		if (_keepRunning)
-		{
-
-			_waitIncrement = 0;
-			_keepRunning = false;
-			notifyInput();
-
-			/* causes hang
-			try
-			{
-			    interrupt();
-			    join();
-			}
-			catch (InterruptedException e)
-			{
-			    System.out.println(e);
-			}
-			*/
-			handle();
-		}
-	}
-
-	/**
-	 * Implemented to provide the periodic activity to be done in a handler.
-	 * This method is called between wait intervals by the handler thread.
-	 */
-	public abstract void handle();
-
-	/**
-	 * Runs the handler loop in a thread.
-	 */
-	public void run()
-	{
-		super.run();
-		while (_keepRunning)
-		{
-			/*
-			try
-			{
-				Thread.sleep(_waitIncrement);
-				Thread.yield();
-			}
-			catch (InterruptedException e)
-			{
-				e.printStackTrace();
-				finish();
-				return;
-			}
-			*/
-			waitForInput();
-
-			handle();
-		}
-	}
-	
-	/**
-	 * Causes the current thread to wait until this class request has been
-	 * fulfilled.
-	 */
-	public synchronized void waitForInput()
-	{
-		try
-		{
-			wait();		
-		}
-		catch (InterruptedException e)
-		{
-			e.printStackTrace();
-			finish();
-			return;
-		}
-	}
-	
-	/**
-	 * Causes all threads waiting for this class request to be filled
-	 * to wake up.
-	 */
-	public synchronized void notifyInput()
-	{
-		notifyAll();
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteConverter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteConverter.java
deleted file mode 100644
index 3f5ce8616..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteConverter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-import java.io.File;
-
-/**
- * Interface for converting between host bytes and client bytes
- */
-public interface IByteConverter 
-{
-	public void setContext(File file);
-	public byte[] convertHostBytesToClientBytes(byte[] buffer, int offset, int length);
-	public byte[] convertClientBytesToHostBytes(byte[] buffer, int offset, int length);
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteStreamHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteStreamHandler.java
deleted file mode 100644
index cf7a31d4f..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IByteStreamHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-/**
- * <p>
- * The ByteStreamHandler interface is used to abstract file read and write operations
- * across the network. 
- * 
- */
-public interface IByteStreamHandler
-{
-
-	/**
-	 * Returns the unique ID for this bytestream handler
-	 * @return the unique id
-	 */
-	public String getId();
-	
-	/**
-	 * Save a file in the specified location.  This method is called by the
-	 * DataStore when the communication layer receives a file transfer    
-	 *
-	 * @param remotePath the path where to save the file
-	 * @param buffer the bytes to insert in the file
-	 * @param size the number of bytes to insert
-	 * @param binary indicates whether to save the bytes as binary or text
-	 */
-	public void receiveBytes(String remotePath, byte[] buffer, int size, boolean binary);
-
-	/**
-	 * Append a bytes to a file at a specified location. This method is called by the
-	 * DataStore when the communication layer receives a file transfer append.      
-	 *
-	 * @param remotePath the path where to save the file
-	 * @param buffer the bytes to append in the file
-	 * @param size the number of bytes to append in the file
-	 * @param binary indicates whether to save the bytes as binary or text
-	 */
-	public void receiveAppendedBytes(String remotePath, byte[] buffer, int size, boolean binary);
-	
-
-	
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreCompatibilityHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreCompatibilityHandler.java
deleted file mode 100644
index 519831619..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreCompatibilityHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- *
- * Contributors:
- * David McKnight   (IBM) - [220892][dstore] Backward compatibility: Server and Daemon should support old clients
- ********************************************************************************/
-package org.eclipse.dstore.core.model;
-
-
-/**
- * @since 3.0
- */
-public interface IDataStoreCompatibilityHandler {
-	public static final int HANDSHAKE_INCORRECT = 0;
-	public static final int HANDSHAKE_SERVER_OLDER = 1;
-	public static final int HANDSHAKE_CORRECT = 2;
-	public static final int HANDSHAKE_UNEXPECTED = 3;
-	public static final int HANDSHAKE_SERVER_NEWER = 4;
-	public static final int HANDSHAKE_SERVER_RECENT_OLDER = 5;
-	public static final int HANDSHAKE_SERVER_RECENT_NEWER = 6;
-	public static final int HANDSHAKE_TIMEOUT = 7;
-
-	public static final int VERSION_INDEX_PROTOCOL = 0;
-	public static final int VERSION_INDEX_VERSION  = 1;
-	public static final int VERSION_INDEX_MINOR    = 2;
-
-	/**
-	 * Checks whether a server is compatible with the current client
-	 * @param handshake the server handshake string in the form <version>.<major>.<miner>
-	 * @return whether this is considered compatible with the client datastore version
-	 */
-	public int checkCompatibility(String handshake);
-
-	/**
-	 * This method is called to notify the compatibility handler that a call
-	 * to localDescriptorQuery() failed to return a result.
-	 *
-	 * @param descriptor the object descriptor that the command was looked for under
-	 * @param keyName the value of the command descriptor to look for
-	 */
-	public void handleMissingCommand(DataElement descriptor, String keyName);
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreConstants.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreConstants.java
deleted file mode 100644
index d2b62b715..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreConstants.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-public interface IDataStoreConstants 
-{
-    public static final String PASSWORD_EXPIRED = "password expired"; //$NON-NLS-1$
-    public static final String NEW_PASSWORD_INVALID = "new password not valid"; //$NON-NLS-1$
-    public static final String AUTHENTICATION_FAILED = "Authentification Failed"; //$NON-NLS-1$
-    public static final String CONNECTED = "connected"; //$NON-NLS-1$
-    public static final String UNKNOWN_PROBLEM = "unknown problem connecting to server"; //$NON-NLS-1$
-    public static final String SERVER_FAILURE = "server failure: "; //$NON-NLS-1$
-    public static final String ATTEMPT_RECONNECT = "attempt reconnect"; //$NON-NLS-1$
-    public static final String PORT_OUT_RANGE = "specified port out of range:"; //$NON-NLS-1$
-    
-    public static final String DATASTORE_SPIRIT_DESCRIPTOR = "datastore.spirit"; //$NON-NLS-1$
-    public static final String C_START_SPIRIT = "C_START_SPIRIT"; //$NON-NLS-1$
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStorePreferenceListener.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStorePreferenceListener.java
deleted file mode 100644
index 6f6270fd0..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStorePreferenceListener.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- *
- * Contributors:
- * David McKnight  (IBM)   [220123][dstore] Configurable timeout on irresponsiveness
- ********************************************************************************/
-package org.eclipse.dstore.core.model;
-
-/**
- * Classes that implement this and add themselves to the DataStore preference
- * listeners get called each time a preference is changed.
- * 
- * @since 3.0
- */
-public interface IDataStorePreferenceListener {
-
-	/**
-	 * A DataStore preference has changed
-	 * @param property the property that has changed
-	 * @param value the value of the property
-	 */
-	public void preferenceChanged(String property, String value);
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreProvider.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreProvider.java
deleted file mode 100644
index b0ae8d0a1..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IDataStoreProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-
-public interface IDataStoreProvider
-{
-	public DataStore getDataStore();
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IExternalLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IExternalLoader.java
deleted file mode 100644
index 50cf21e93..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/IExternalLoader.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2007 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-package org.eclipse.dstore.core.model;
-
-public interface IExternalLoader {
-
-	
-	/**
-	 * Indicates whether this external loader can load a particular class
-	 * @param source a qualified classname
-	 * @return true if it can load the clas
-	 */
-	public boolean canLoad(String source);
-	
-	/**
-	 * Loads the specified class
-	 * @param source a qualified classname
-	 * @return the loaded class
-	 * @throws ClassNotFoundException
-	 */
-	public Class loadClass(String source) throws ClassNotFoundException;
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISSLProperties.java
deleted file mode 100644
index 02b9f49a3..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISSLProperties.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-public interface ISSLProperties
-{
-	public boolean usingSSL();
-	public boolean usingServerSSL();
-	public String getDaemonKeyStorePassword();
-	public String getDaemonKeyStorePath();
-	public String getServerKeyStorePassword();
-	public String getServerKeyStorePath();
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaExtender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaExtender.java
deleted file mode 100644
index 5e8aed432..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaExtender.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-
-
-/**
- * ISchemaExtender describes the interfaces that tool extensions
- * need to implement to add or extend other schemas in the DataStore. 
- */
-public interface ISchemaExtender
-{
-
-
-    /**
-     * Add this tool's schema to the global DataStore schema.
-     * This interface must be implemented by each miner in order to
-     * populate the DataStore schema with information about this tool's
-     * object model and information about how to communicate with the
-     * tool from objects available to the user interface.
-     *
-     * @param schemaRoot the descriptor root
-     */
-    public abstract void extendSchema(DataElement schemaRoot);
-
-	/**
-	 * Implement this to returns the external class loader for this extender
-	 * implementation.  In order  for a tool extension to be loaded by the DataStore, it's
-	 * class loader needs to be supplied.
-	 * 
-	 * @return the external loader
-	 */
-    public abstract IExternalLoader getExternalLoader();     
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaRegistry.java
deleted file mode 100644
index 79ac140db..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/ISchemaRegistry.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-
-/**
- * ISchemaRegistry describes the interface that needs to be 
- * implemented for external tools to contribute their
- * schemas to the DataStore. 
- */
-public interface ISchemaRegistry
-{
-
-	/**
-	 * This method gets called when a new schema extender needs to be
-	 * registered.
-	 * 
-	 * @param extender the new schema extender
-	 */
-	public void registerSchemaExtender(ISchemaExtender extender);
-
-	/**
-	 * This method is responsible for calling <code>extendSchema</code> on 
-	 * each of the registered schema extenders.
-	 * @param dataStore the DataStore for which the schema will be extended
-	 */
-	public void extendSchema(DataStore dataStore);
-	
-	/**
-	 * Returns an <code>IExternalLoader</code> for the specified qualified class name
-	 * @param qualifiedClassName the qualified class name of an external tool
-	 * @return the external loader that can load to specified class
-	 */
-	public IExternalLoader getLoaderFor(String qualifiedClassName);
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java
deleted file mode 100644
index f11ff6545..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM)   [202822] should not be synchronizing on clean method
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- *******************************************************************************/
-
-package org.eclipse.dstore.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.internal.core.util.DataElementRemover;
-
-/**
- * <p>
- * Abstract class for handling updates. A <code>UpdateHandler</code> is a
- * <code>Handler</code> that contains a queue of data responses to be sent to
- * the client. Each DataStore instance uses a single update handler that
- * periodically sends it's data queue either to a client or directly to a domain
- * listener on the client.
- * </p>
- * <p>
- * The UpdateHandler is the means by which the DataStore sends information or
- * files from the remote tools to the client.
- * </p>
- *
- * @noextend This class is not intended to be subclassed by clients.
- */
-public abstract class UpdateHandler extends Handler
-{
-
-
-	protected ArrayList _dataObjects;
-	protected ArrayList _classesToSend;
-
-	/**
-	 * Constructor
-	 */
-	public UpdateHandler()
-	{
-		 setName("DStore UpdateHandler"+getName()); //$NON-NLS-1$
-		_dataObjects = new ArrayList();
-		_classesToSend = new ArrayList();
-	}
-
-	/**
-	 * Periodically called on the handler thread to sends data updates.
-	 */
-	public void handle()
-	{
-		if (!_dataObjects.isEmpty() || !_classesToSend.isEmpty())
-		{
-			sendUpdates();
-		}
-	}
-
-	protected void clean(DataElement object)
-	{
-		clean(object, 2);
-	}
-
-	protected void clean(DataElement object, int depth)
-	{
-		if ((depth > 0) && (object != null) && object.getNestedSize() > 0)
-		{
-			List deletedList = _dataStore.findDeleted(object);
-
-			for (int i = 0; i < deletedList.size(); i++)
-			{
-				DataElement child = (DataElement) deletedList.get(i);
-				if (child != null && child.isDeleted())
-				{
-					DataElement parent = child.getParent();
-					DataElementRemover.addToRemovedCount();
-
-					cleanChildren(child); // clean the children
-
-					if (child.isSpirit())
-					{
-						// officially delete this now
-						child.delete();
-					}
-					child.clear();
-
-					if (parent != null)
-					{
-						synchronized (parent)
-						{
-							parent.removeNestedData(child);
-						}
-					}
-				//  _dataStore.addToRecycled(child);
-				}
-			}
-
-			deletedList.clear();
-		}
-		// delete objects under temproot
-		_dataStore.getTempRoot().removeNestedData();
-
-	}
-
-	/**
-	 * Recursively clean children for deletion
-	 * @param parent
-	 */
-	protected void cleanChildren(DataElement parent)
-	{
-		List nestedData = parent.getNestedData();
-		if (nestedData != null)
-		{
-		for (int i = 0; i < nestedData.size(); i++){
-			DataElement child = (DataElement)nestedData.get(i);
-			cleanChildren(child);
-
-			if (child.isSpirit())
-			{
-				// officially delete this now
-				child.delete();
-			}
-			child.clear();
-			parent.removeNestedData(child);
-		}
-		}
-	}
-
-	/**
-	 * Adds a set of data objects to the update queue
-	 * @param objects a set of objects to get updated
-	 */
-	public void update(ArrayList objects)
-	{
-		for (int i = 0; i < objects.size(); i++)
-		{
-			update((DataElement) objects.get(i));
-		}
-	}
-
-	/**
-	 * Adds an object to the update queue
-	 * @param object an object to get updated
-	 */
-	public void update(DataElement object)
-	{
-		update(object, false);
-	}
-
-	/**
-	 * Adds an object to the update queue
-	 * @param object an object to get updated
-	 * @param immediate true indicates that this object should be first in the queue
-	 */
-	public void update(DataElement object, boolean immediate)
-	{
-		synchronized (_dataObjects)
-		{
-			if (immediate)
-			{
-				_dataObjects.add(0, object);
-				// none of this immediate stuff - just put it at the beginning
-				//handle();
-			}
-			else
-			{
-				if (!_dataObjects.contains(object))
-				{
-						_dataObjects.add(object);
-				}
-				else
-				{
-
-					if (_dataStore != null && object != null && !object.isDeleted())
-					{
-						if (object.getType().equals(DataStoreResources.model_status))
-						{
-							if (object.getName().equals(DataStoreResources.model_done))
-							{
-								//DKM
-								// move to the back of the queue
-								// this is done so that if status that was already queued changed to done in between
-								// requests, and had not yet been transferred over comm layer, the completed status
-								// object does not come back to client (as "done") before the results of a query
-								_dataObjects.remove(object);
-								_dataObjects.add(object);
-							}
-						}
-					}
-				}
-			}
-		}
-		notifyInput();
-	}
-
-	/**
-	 * Causes the current thread to wait until this class request has been
-	 * fulfilled.
-	 */
-	public synchronized void waitForInput()
-	{
-		if (_dataObjects.size() == 0 && _classesToSend.size() == 0)
-		{
-			super.waitForInput();
-		}
-	}
-
-	/**
-	 * Implemented to provide the means by which updates on the queue are sent.
-	 */
-	public abstract void sendUpdates();
-
-
-	/**
-	 * Implemented to provide the means by which files are sent
-	 * @param path the path of the file to send
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or text
-	 */
-	public abstract void updateFile(String path, byte[] bytes, int size, boolean binary);
-
-	/**
-	 * Implemented to provide the means by which files are sent and appended
-	 * @param path the path of the file to send
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or text
-	 */
-	public abstract void updateAppendFile(String path, byte[] bytes, int size, boolean binary);
-
-	/**
-	 * Implemented to provide the means by which files are sent
-	 * @param path the path of the file to send
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or text
-	 * @param byteStreamHandlerId indicates the byte stream handler to receive the bytes
-	 */
-	public abstract void updateFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId);
-
-	/**
-	 * Implemented to provide the means by which files are sent and appended
-	 * @param path the path of the file to send
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or text
-	 * @param byteStreamHandlerId indicates the byte stream handler to receive the bytes
-	 */
-	public abstract void updateAppendFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId);
-
-	/**
-	 * Implemented to provide the means by which classes are requested
-	 * across the comm channel.
-	 * @param className the name of the class to request
-	 */
-	public abstract void requestClass(String className);
-
-	/**
-	 * Implemented to provide the means by which keepalive requests are sent
-	 * across the comm channel.
-	 */
-	public abstract void sendKeepAliveRequest();
-
-	/**
-	 * Impleted to provide the means by which a class on the host is updated on the client
-	 * @param runnable
-	 * @param deserializebyteStreamHandlerId
-	 */
-	public abstract void updateClassInstance(IRemoteClassInstance runnable, String deserializebyteStreamHandlerId);
-
-	/**
-	 * Implemented to provide the means by which classes are sent
-	 * across the comm channel.
-	 * @param className the name of the class to send
-	 */
-	public abstract void sendClass(String className);
-
-	/**
-	 * Implemented to provide the means by which classes are sent
-	 * across the comm channel.
-	 * @param className the name of the class to send
-	 * @param classByteStreamHandlerId indicates which class byte stream handler to receive the class with
-	 */
-	public abstract void sendClass(String className, String classByteStreamHandlerId);
-
-	/**
-	 * Implemented to provide the means by which keepalive confirmations are sent
-	 * across the comm channel.
-	 */
-	public abstract void sendKeepAliveConfirmation();
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
deleted file mode 100644
index 6924780fe..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ConnectionEstablisher.java
+++ /dev/null
@@ -1,583 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight  (IBM)   [220123][dstore] Configurable timeout on irresponsiveness
- * David McKnight  (IBM)   [220892][dstore] Backward compatibility: Server and Daemon should support old clients
- * Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- * David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
- * Jacob Garcowski    (IBM)   [225175] [dstore] error handling change for Client
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * Noriaki Takatsu  (IBM) - [226074] process for getStatus() API
- * Noriaki Takatsu  (IBM) - [226237] [dstore] Move the place where the ServerLogger instance is made
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * Noriaki Takatsu  (IBM) - [242968] [multithread] serverSocket must be closed when an exception happens in Accept
- * David McKnight   (IBM) - [257321] [dstore] "Error binding socket" should include port of the failed socket
- * Noriaki Takatsu  (IBM) - [283656] [dstore][multithread] Serviceability issue
- * Noriaki Takatsu  (IBM) - [289678][api][breaking] ServerSocket creation in multiple IP addresses
- * David McKnight   (IBM) - [368072] [dstore][ssl] no exception logged upon bind error
- *******************************************************************************/
-
-package org.eclipse.dstore.core.server;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.BindException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-
-import org.eclipse.dstore.core.model.Client;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreAttributes;
-import org.eclipse.dstore.core.model.ISSLProperties;
-import org.eclipse.dstore.internal.core.server.ServerAttributes;
-import org.eclipse.dstore.internal.core.server.ServerCommandHandler;
-import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
-import org.eclipse.dstore.internal.core.server.ServerSSLProperties;
-import org.eclipse.dstore.internal.core.server.ServerUpdateHandler;
-import org.eclipse.dstore.internal.core.util.ExternalLoader;
-import org.eclipse.dstore.internal.core.util.Sender;
-import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext;
-
-/**
- * ConnectionEstablisher is responsible for managing the server DataStore and
- * facilitating the communication between client and server DataStores.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- *
- * @since 3.0 moved from non-API to API
- */
-public class ConnectionEstablisher
-{
-
-
-	private ServerSocket _serverSocket;
-	private static boolean _continue;
-
-	private ArrayList _receivers;
-
-	private ServerCommandHandler _commandHandler;
-	private ServerUpdateHandler _updateHandler;
-
-	private ServerAttributes _serverAttributes = new ServerAttributes();
-	private DataStore _dataStore;
-
-	private int _maxConnections;
-	private int _timeout;
-	private String _msg;
-
-
-	/**
-	 * Creates the default ConnectionEstablisher.  Communication occurs
-	 * on a default port, there is no timeout and no ticket is required
-	 * for a client to work with the DataStore.
-	 *
-	 */
-	public ConnectionEstablisher()
-	{
-		String port = _serverAttributes.getAttribute(DataStoreAttributes.A_HOST_PORT);
-		setup(port, null, null);
-	}
-
-	/**
-	 * Creates a ConnectionEstablisher.  Communication occurs
-	 * on the specified port, there is no timeout and no ticket is required
-	 * for a client to work with the DataStore.
-	 *
-	 * @param port the number of the socket port
-	 */
-	public ConnectionEstablisher(String port)
-	{
-		setup(port, null, null);
-	}
-
-	/**
-	 * Creates a ConnectionEstablisher.  Communication occurs
-	 * on the specified port, a timeout value indicates the idle wait
-	 * time before shutting down, and no ticket is required
-	 * for a client to work with the DataStore.
-	 *
-	 * @param port the number of the socket port
-	 * @param timeout the idle duration to wait before shutting down
-	 */
-	public ConnectionEstablisher(String port, String timeout)
-	{
-		setup(port, timeout, null);
-	}
-
-	/**
-	 * Creates a ConnectionEstablisher.  Communication occurs
-	 * on the specified port, a timeout value indicates the idle wait
-	 * time before shutting down, and ticket specified the required
-	 * ticket for a client to present in order to work with the DataStore.
-	 *
-	 * @param port the number of the socket port
-	 * @param timeout the idle duration to wait before shutting down
-	 * @param ticket validation id required by the client to access the DataStore
-	 */
-	public ConnectionEstablisher(String port, String timeout, String ticket)
-	{
-		setup(port, timeout, ticket);
-	}
-	
-	/**
-	 * Creates a ConnectionEstablisher.  Communication occurs
-	 * on the specified port and the specified IP address, 
-	 * a timeout value indicates the idle wait time
-	 * before shutting down, and ticket specified the required
-	 * ticket for a client to present in order to work with the DataStore.
-	 *
-	 * @param port the number of the socket port
-	 * @param backlog listen backlog
-	 * @param bindAddr the local IP address to bind to
-	 * @param timeout the idle duration to wait before shutting down
-	 * @param ticket validation id required by the client to access the DataStore
-	 * @since 3.2
-	 */
-	public ConnectionEstablisher(String port, int backlog, InetAddress bindAddr, String timeout, String ticket)
-	{
-		setup(port, backlog, bindAddr, timeout, ticket);
-	}
-
-
-	/**
-	 * Starts the run loop for the ConnectionEstablisher.
-	 */
-	public void start()
-	{
-		run();
-	}
-
-
-
-	/**
-	 * Returns the DataStore.
-	 *
-	 * @return the DataStore
-	 */
-	public DataStore getDataStore()
-	{
-		return _dataStore;
-	}
-
-	/**
-	 * Return the Server port opened for this client
-	 *
-	 * @return the Server port opened for this client
-	 */
-	public int getServerPort()
-	{
-		if (_serverSocket != null)
-		{
-			return _serverSocket.getLocalPort();
-		}
-
-		return -1;
-	}
-
-	/**
-	 * Return the connection status for this client
-	 *
-	 * * @return the connection status for this client
-	 */
-	public String getStatus()
-	{
-		return _msg;
-	}
-
-	/**
-	 * Tells the connection establisher to clean up and shutdown
-	 */
-	public void finished(ServerReceiver receiver)
-	{
-		_updateHandler.removeSenderWith(receiver.socket());
-		_receivers.remove(receiver);
-		_dataStore.removeDataStorePreferenceListener(receiver);
-		//if (_receivers.size() == 0)
-		{
-			_continue = false;
-			_commandHandler.finish();
-			_updateHandler.finish();
-			_dataStore.finish();
-			System.out.println(ServerReturnCodes.RC_FINISHED);
-
-			if (SystemServiceManager.getInstance().getSystemService() == null)
-				System.exit(0);
-		}
-	}
-
-	private void waitForConnections()
-	{
-		while (_continue == true)
-		{
-			try
-			{
-				Socket newSocket = _serverSocket.accept();
-				if (_dataStore.usingSSL())
-				{
-
-					// wait for connection
-					SSLSocket sslSocket = (SSLSocket)newSocket;
-					sslSocket.setUseClientMode(false);
-					sslSocket.setNeedClientAuth(false);
-					SSLSession session = sslSocket.getSession();
-
-					if (session == null)
-					{
-						System.out.println("handshake failed"); //$NON-NLS-1$
-						sslSocket.close();
-						return;
-					}
-				}
-
-				doHandShake(newSocket);
-				newSocket.setKeepAlive(true);
-
-				ServerReceiver receiver = new ServerReceiver(newSocket, this);
-				_dataStore.addDataStorePreferenceListener(receiver);
-
-				if (_dataStore.getClient() != null)
-				     _dataStore.getClient().setServerReceiver(receiver);
-
-				Sender sender = new Sender(newSocket, _dataStore);
-
-				// add this connection to list of elements
-				_receivers.add(receiver);
-				_updateHandler.addSender(sender);
-
-				receiver.start();
-
-				if (_receivers.size() == 1)
-				{
-					_updateHandler.start();
-					_commandHandler.start();
-				}
-
-				if (_receivers.size() == _maxConnections)
-				{
-					_continue = false;
-					_serverSocket.close();
-
-				}
-			}
-			catch (IOException ioe)
-			{
-				System.err.println(ServerReturnCodes.RC_CONNECTION_ERROR);
-				System.err.println("Server: error initializing socket: " + ioe); //$NON-NLS-1$
-				_msg = ioe.toString();
-				try
-				{
-					_serverSocket.close();
-				}
-				catch (Throwable e)
-				{
-					
-				}
-				_continue = false;
-			}
-		}
-	}
-
-
-
-
-	private ServerSocket createSocket(String portStr, int backlog, InetAddress bindAddr) throws UnknownHostException
-	{
-		ServerSocket serverSocket = null;
-		SSLContext sslContext = null;
-		// port
-		int port = 0;
-
-		if (_dataStore.usingSSL())
-		{
-			String keyStoreFileName = _dataStore.getKeyStoreLocation();
-			String keyStorePassword = _dataStore.getKeyStorePassword();
-
-			try
-			{
-				sslContext = DStoreSSLContext.getServerSSLContext(keyStoreFileName, keyStorePassword);
-			}
-			catch (Exception e)
-			{
-
-			}
-		}
-
-		// determine if portStr is a port range or just a port
-		String[] range = portStr.split("-"); //$NON-NLS-1$
-		if (range.length == 2)
-		{
-			int lPort = 0;
-			int hPort = 0;
-			try
-			{
-				lPort = Integer.parseInt(range[0]);
-				hPort = Integer.parseInt(range[1]);
-			}
-			catch (Exception e)
-			{
-			}
-
-			for (int i = lPort; i < hPort; i++)
-			{
-				// create server socket from port
-				try
-				{
-					if (_dataStore.usingSSL() && sslContext != null)
-					{
-						try
-						{
-							serverSocket = sslContext.getServerSocketFactory().createServerSocket(i, backlog, bindAddr);
-						}
-						catch (BindException e)
-						{
-							_msg = ServerReturnCodes.RC_BIND_ERROR  + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
-							System.err.println(_msg);
-							_dataStore.trace(_msg);
-						}
-						catch (Exception e)
-						{
-						}
-					}
-					else
-					{
-						try
-						{
-							serverSocket = new ServerSocket(i, backlog, bindAddr);
-						}						
-						catch (BindException e)
-						{
-							_msg = ServerReturnCodes.RC_BIND_ERROR  + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
-							System.err.println(_msg);
-							_dataStore.trace(_msg);
-						}
-						catch (Exception e)
-						{
-						}
-					}
-				}
-				catch (Exception e)
-				{
-					_dataStore.trace(e);
-				}
-				if (serverSocket != null && serverSocket.getLocalPort() > 0)
-				{
-					return serverSocket;
-				}
-			}
-			if (serverSocket == null){
-				_msg = ServerReturnCodes.RC_BIND_ERROR  + " on ports " + portStr; //$NON-NLS-1$
-				System.err.println(_msg); 				
-			}
-		}
-		else
-		{
-			port = Integer.parseInt(portStr);
-
-
-			// create server socket from port
-			if (_dataStore.usingSSL() && sslContext != null)
-			{
-				try
-				{
-					serverSocket = sslContext.getServerSocketFactory().createServerSocket(port, backlog, bindAddr);
-				}
-				catch (BindException e){
-					_msg = ServerReturnCodes.RC_BIND_ERROR  + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
-					System.err.println(_msg);
-					_dataStore.trace(_msg);
-				}
-				catch (Exception e)
-				{
-					_dataStore.trace(e);
-				}
-			}
-			else
-			{
-				try
-				{
-					serverSocket = new ServerSocket(port, backlog, bindAddr);
-				}
-				catch (BindException e){
-					_msg = ServerReturnCodes.RC_BIND_ERROR  + " on port " + port + ": " + e.getMessage(); //$NON-NLS-1$ //$NON-NLS-2$
-					System.err.println(_msg);
-					_dataStore.trace(_msg);
-				}
-				catch (Exception e)
-				{
-					_dataStore.trace(e);
-				}
-			}
-		}
-		return serverSocket;
-	}
-	
-	/**
-	 * Create the DataStore and initializes it's handlers and communications.
-	 *
-	 * @param portStr the number of the socket port
-	 * @param timeoutStr the idle duration to wait before shutting down
-	 * @param ticketStr validation id required by the client to access the DataStore
-	 */
-	private void setup(String portStr, String timeoutStr, String ticketStr)
-	{
-		setup(portStr, 50, null, timeoutStr, ticketStr);
-	}
-
-	/**
-	 * Create the DataStore and initializes it's handlers and communications.
-	 *
-	 * @param portStr the number of the socket port
-	 * @param backlog listen backlog
-	 * @param bindAddr the local IP address to bind to
-	 * @param timeoutStr the idle duration to wait before shutting down
-	 * @param ticketStr validation id required by the client to access the DataStore
-	 */
-	private void setup(String portStr, int backlog, InetAddress bindAddr, String timeoutStr, String ticketStr)
-	{
-		_maxConnections = 1;
-
-
-		ArrayList loaders = new ArrayList();
-		loaders.add(new ExternalLoader(getClass().getClassLoader(), "*")); //$NON-NLS-1$
-		_commandHandler = new ServerCommandHandler(loaders);
-		_updateHandler = new ServerUpdateHandler();
-
-		ISSLProperties sslProperties = new ServerSSLProperties();
-
-		_dataStore = new DataStore(_serverAttributes, _commandHandler, _updateHandler, null);
-		_dataStore.setSSLProperties(sslProperties);
-
-		DataElement ticket = _dataStore.getTicket();
-		ticket.setAttribute(DE.A_NAME, ticketStr);
-
-		_updateHandler.setDataStore(_dataStore);
-		_commandHandler.setDataStore(_dataStore);
-
-		if (SystemServiceManager.getInstance().getSystemService() == null)
-		{
-			Client client = new Client();
-			_dataStore.setClient(client);
-		     ServerLogger logger = new ServerLogger(_dataStore.getUserPreferencesDirectory());
-    		client.setLogger(logger);
-		}
-
-		_receivers = new ArrayList();
-		_continue = true;
-
-		try
-		{
-
-			_serverSocket = createSocket(portStr, backlog, bindAddr);
-			if (_serverSocket == null)
-			{
-				_continue = false;
-			}
-			else
-			{
-				// timeout
-				if (timeoutStr != null)
-				{
-					_timeout = Integer.parseInt(timeoutStr);
-				}
-				else
-				{
-					_timeout = 120000;
-				}
-
-				if (_timeout > 0)
-				{
-					_serverSocket.setSoTimeout(_timeout);
-				}
-
-				System.err.println(ServerReturnCodes.RC_SUCCESS);
-				System.err.println(_serverSocket.getLocalPort());
-				_msg = ServerReturnCodes.RC_SUCCESS;
-				try
-				{
-					System.err.println("Server running on: " + InetAddress.getLocalHost().getHostName()); //$NON-NLS-1$
-				}
-				catch (UnknownHostException e)
-				{
-					// keep running
-				}
-			}
-		}
-		catch (UnknownHostException e)
-		{
-			System.err.println(ServerReturnCodes.RC_UNKNOWN_HOST_ERROR + ':' + e.getMessage());
-			_msg = ServerReturnCodes.RC_UNKNOWN_HOST_ERROR;
-			_continue = false;
-		}
-	   catch (BindException e)
-		{
-			System.err.println(ServerReturnCodes.RC_BIND_ERROR + ':' + e.getMessage());
-			_msg = ServerReturnCodes.RC_BIND_ERROR;
-			_continue = false;
-		}
-		catch (IOException e)
-		{
-			System.err.println(ServerReturnCodes.RC_GENERAL_IO_ERROR + ':' + e.getMessage());
-			_msg = ServerReturnCodes.RC_GENERAL_IO_ERROR;
-			_continue = false;
-		}
-		catch (SecurityException e)
-		{
-			System.err.println(ServerReturnCodes.RC_SECURITY_ERROR + ':' + e.getMessage());
-			_msg = ServerReturnCodes.RC_SECURITY_ERROR;
-			_continue = false;
-		}
-	}
-
-	private void run()
-	{
-		waitForConnections();
-	}
-
-	private void doHandShake(Socket socket)
-	{
-	   	try
-	   	{
-		BufferedWriter bwriter = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), DE.ENCODING_UTF_8));
-	   		PrintWriter writer = new PrintWriter(bwriter);
-
-	   		String version = DataStoreAttributes.DATASTORE_VERSION;
-	   		String preferenceVersion = System.getProperty("DSTORE_VERSION"); //$NON-NLS-1$
-	   		if (preferenceVersion != null && preferenceVersion.length() > 0){
-	   			version = preferenceVersion;
-	   		}
-			writer.println(version);
-			writer.flush();
-	   	}
-	   	catch (IOException e)
-	   	{
-	   		if (_dataStore.getClient() != null) {
-				_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
-			}
-	   		System.out.println(e);
-	   	}
-
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java
deleted file mode 100644
index e8d4e7cb8..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/IServerLogger.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: Noriaki Takatsu and Masao Nishimoto
-
- * Contributors:
- *  Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- *  David McKnight  (IBM)  - [305272] [dstore][multithread] log close in ServerLogger
- *******************************************************************************/
-
-package org.eclipse.dstore.core.server;
-
-/**
- * @since 3.0
- * @noimplement This interface is not intended to be implemented by clients.
- *              Server logger implementations must subclass
- *              {@link ServerLogger} rather than implementing this
- *              interface directly.
- */
-public interface IServerLogger
-{
-	/**
-	 * logInfo
-	 *
-	 * @param minerName
-	 * @param message Message text to be logged.
-	 */
-	public void logInfo(String minerName, String message);
-
-	/**
-	 * logWarning
-	 *
-	 * @param minerName
-	 * @param message Message text to be logged.
-	 */
-	public void logWarning(String minerName, String message);
-
-	/**
-	 * logError
-	 *
-	 * @param minerName
-	 * @param message Message text to be logged.
-	 * @param exception Exception that generated the error.  Used to print a stack trace.
-	 */
-	public void logError(String minerName, String message, Throwable exception);
-
-	/**
-	 * logDebugMessage
-	 * @param minerName
-	 * @param message Message text to be logged.
-	 */
-	public void logDebugMessage(String minerName, String message);
-	
-	/**
-	 * closeLogFileStream
-	 * @since 3.2
-	 */
-	public void closeLogFileStream();
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ISystemService.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ISystemService.java
deleted file mode 100644
index 90137a4e6..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ISystemService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- *  The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: Noriaki Takatsu and Masao Nishimoto
- *
- * Contributors:
- *  Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- *******************************************************************************/
-
-
-package org.eclipse.dstore.core.server;
-
-import org.eclipse.dstore.core.model.Client;
-
-/**
- * @since 3.0
- */
-public interface ISystemService
-{
-	/**
-     * This method is used to establish a thread-level security.
-     *
-     * @param client the object of the client
-     */
-    public void setThreadSecurity(Client client);
-
-    /**
-     * This method is used to execute run() in a thread assigned
-     * from thread pools.
-     *
-     * @param securedThread the securedThread object that implements
-     *        Runnable.
-     */
-    public void executeThread(SecuredThread securedThread);
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java
deleted file mode 100644
index b75867366..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SecuredThread.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- *  The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: Noriaki Takatsu and Masao Nishimoto
- *
- * Contributors:
- *   Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- *   Noriaki Takatsu (IBM)  - [228335] [dstore][multithread] start() in SecuredThread class
- *   David McKnight  (IBM)  - [358301] [DSTORE] Hang during debug source look up
- *******************************************************************************/
-
-package org.eclipse.dstore.core.server;
-
-
-import java.io.PrintWriter;
-
-import org.eclipse.dstore.core.model.DataStore;
-
-/**
- * @since 3.0
- */
-public class SecuredThread extends Thread
-{
-
-	public DataStore _dataStore;
-
-
-	/**
-	 * 	Constructs a new SecuredThread without a DataStore.  In this case, the DataStore
-	 * needs to be set sometime after creation via <code>setDataStore(DataStore)</code>.
-	 */
-	public SecuredThread() {
-	}
-
-	/**
-	 * Constructs a new SecuredThread given a DataStore.
-	 *
-	 * @param dataStore used to extract user id and password for a client
-	 */
-	public SecuredThread(DataStore dataStore)
-	{
-		this(null, dataStore);
-	}
-
-
-	/**
-	 * 	Constructs a new SecuredThread with a DataStore and a runnable.  After
-	 * the thread starts, the runnable will be implicitly executed.
-	 *
-	 * @param runnable the runnable to be executed by the thread
-	 * @param dataStore used to extract user id and password for a client
-	 */
-	public SecuredThread(Runnable runnable, DataStore dataStore) {
-		super(runnable);
-		_dataStore = dataStore;
-	}
-
-
-	/**
-	 * Constructs a new SecuredThread with a DataStore, a runnable and name for the thread.
-	 * After the thread starts, the runnable will be implicitly executed.
-	 *
-	 * @param runnable	the runnable to be executed by the thread
-	 * @param threadName the name for the SecuredThread being created
-	 * @param dataStore used to extract user id and password for a client
-	 */
-	public SecuredThread(Runnable runnable, String threadName, DataStore dataStore) {
-		this(null, runnable, threadName, dataStore);
-	}
-
-	/**
-	 * Constructs a new SecuredThread with a DataStore, a runnable and a ThreadGroup.
-	 * After the thread starts, the runnable will be implicitly executed.
-	 *
-	 * @param group the thread group for which this thread will belong
-	 * @param runnable	the runnable to be executed by the thread
-	 * @param dataStore used to extract user id and password for a client
-	 */
-	public SecuredThread(ThreadGroup group, Runnable runnable, DataStore dataStore) {
-		super(group, runnable);
-		_dataStore = dataStore;
-	}
-
-
-	/**
-	 * Constructs a new SecuredThread with a DataStore, a runnable, a name and a ThreadGroup.
-	 * After the thread starts, the runnable will be implicitly executed.
-	 *
-	 * @param group the thread group for which this thread will belong
-	 * @param runnable	the runnable to be executed by the thread
-	 * @param threadName the name for the SecuredThread being created
-	 * @param dataStore used to extract user id and password for a client
-	 */
-	public SecuredThread(ThreadGroup group, Runnable runnable, String threadName, DataStore dataStore) {
-		super(group, runnable, threadName);
-		_dataStore = dataStore;
-	}
-
-
-	/**
-	 * Sets the DataStore associated with the client
-	 * @param dataStore
-	 */
-	public void setDataStore(DataStore dataStore)
-	{
-		_dataStore = dataStore;
-	}
-
-
-	/**
-	 * When run() is called, a check is made to see if there is an ISystemService.   If there is
-	 * the <code>ISystemService.setThreadSecurity(Client)</code> is called before <code>Thread.run()</code>
-	 * is called.
-	 *
-	 * If a Runnable was passed into the constructor for SecuredThread then, when <code>Thread.run()</code>
-	 * is called, the Runnable will be invoked.
-	 */
-	public void run()
-	{
-		try
-		{
-			ISystemService systemService = SystemServiceManager.getInstance().getSystemService();
-			if (systemService != null){
-				systemService.setThreadSecurity(_dataStore.getClient());
-			}
-		}
-		catch (OutOfMemoryError err){
-			System.exit(-1);
-		}
-		catch (Throwable e)
-		{
-			e.printStackTrace(new PrintWriter(System.err));
-		}
-
-		super.run();
-	}
-
-	 /**
-	  *
-	  * As per bug 228335, this is commented out.
-      *
-	  * When start() is called, a check is made to see if there is an ISystemService.
-	  * If there is, the <code>ISystemService.executeThread(SecuredThread)</code> is called.
-	  * In this case, the run() method is invoked in a thread assigned from the running
-	  * work threads
-	  * If there isn't, the <code>super.start()</code> is called.
-	  * In this case. the run() method is invoked as a new thread.
-
-	 public void start()
-	 {
-
-	  try
-	  {
-
-	   ISystemService systemService = SystemServiceManager.getInstance().getSystemService();
-	   if (systemService != null){
-	    systemService.executeThread(this);
-	   }
-	   else
-	   {
-	    super.start();
-	   }
-	  }
-	  catch(Throwable e)
-	  {
-	   e.printStackTrace(new PrintWriter(System.err));
-	  }
-	 }
-	 */
-	
-	public void start(){
-		try {
-			super.start();
-		}
-		catch (OutOfMemoryError e){
-			System.exit(-1);
-		}
-	}
-}
-
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java
deleted file mode 100644
index d92751f26..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/Server.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- *  Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- *  David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
- *  David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- *  David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- *  Noriaki Takatsu (IBM)  - [289678][api][breaking] ServerSocket creation in multiple IP addresses
- *******************************************************************************/
-
-package org.eclipse.dstore.core.server;
-
-import java.net.InetAddress;
-import java.util.StringTokenizer;
-
-import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
-
-/**
- * Server is the standard way of instantiating and controlling a remote DataStore.
- * The server runs a ConnectionEstablisher which manages client connections to
- * the DataStore.
- *
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class Server implements Runnable
-{
-
-	private ConnectionEstablisher _establisher;
-
-	/**
-	 * The startup interface to run the Server.
-	 *
-	 * @param args a list of arguments for running the server.  These consist of
-	 * the socket port to wait on, the timeout value, and the the ticket
-	 */
-	public static void main(String[] args)
-	{
-		//Tell the Launcher that we are starting
-		System.err.println(ServerReturnCodes.RC_DSTORE_SERVER_MAGIC);
-
-		String jversion = System.getProperty("java.version"); //$NON-NLS-1$
-
-		StringTokenizer tokenizer = new StringTokenizer(jversion, "."); //$NON-NLS-1$
-		try
-		{
-			String[] vers = new String[3];
-			vers[0] = tokenizer.nextToken();
-			vers[1] = tokenizer.nextToken();
-
-			int version = Integer.parseInt(vers[0]);
-			int major = Integer.parseInt(vers[1]);
-
-
-			if (version >= 1 && major >= 4)
-			{
-				// version is good
-			}
-			else
-			{
-				// version is bad
-				System.err.println(ServerReturnCodes.RC_JRE_VERSION_ERROR);
-				if (SystemServiceManager.getInstance().getSystemService() == null)
-					System.exit(-1);
-			}
-		}
-		catch (Exception e)
-		{
-			// version is bad
-			System.err.println(ServerReturnCodes.RC_JRE_VERSION_ERROR);
-			if (SystemServiceManager.getInstance().getSystemService() == null)
-				System.exit(-1);
-		}
-
-		try
-		{
-			Server theServer = null;
-			switch (args.length)
-			{
-				case 0 :
-					theServer = new Server();
-					break;
-				case 1 :
-					theServer = new Server(args[0]);
-					break;
-				case 2 :
-					theServer = new Server(args[0], args[1]);
-					break;
-				case 3 :
-					theServer = new Server(args[0], args[1], args[2]);
-					break;
-				default :
-					break;
-			}
-
-
-			if (theServer != null)
-			{
-				theServer.run();
-			}
-		}
-		catch (SecurityException e)
-		{
-			System.err.println(ServerReturnCodes.RC_SECURITY_ERROR);
-			throw e; // Optional
-		}
-	}
-
-	/**
-	 * Creates a new Server with default DataStore and connection attributes.
-	 *
-	 */
-	public Server()
-	{
-		_establisher = new ConnectionEstablisher();
-	}
-
-	/**
-	 * Creates a new Server that waits on the specified socket port.
-	 *
-	 * @param port the number of the socket port to wait on
-	 */
-	public Server(String port)
-	{
-		_establisher = new ConnectionEstablisher(port);
-	}
-
-	/**
-	 * Creates a new Server that waits on the specified socket port for
-	 * the specified time interval before shutting down.
-	 *
-	 * @param port the number of the socket port to wait on
-	 * @param timeout the idle time to wait before shutting down
-	 */
-	public Server(String port, String timeout)
-	{
-		_establisher = new ConnectionEstablisher(port, timeout);
-	}
-
-	/**
-	 * Creates a new Server that waits on the specified socket port for
-	 * the specified time interval before shutting down.
-	 *
-	 * @param port the number of the socket port to wait on
-	 * @param timeout the idle time to wait before shutting down
-	 * @param ticket the ticket that the client needs to interact with the DataStore
-	 */
-	public Server(String port, String timeout, String ticket)
-	{
-		_establisher = new ConnectionEstablisher(port, timeout, ticket);
-	}
-	
-	/**
-	 * Creates a new Server that waits on the specified socket port and
-	 * the specified IP address with the backlog for
-	 * the specified time interval before shutting down.
-	 *
-	 * @param port the number of the socket port to wait on
-	 * @param backlog listen backlog
-	 * @param bindAddr the local IP address to bind to
-	 * @param timeout the idle time to wait before shutting down
-	 * @param ticket the ticket that the client needs to interact with the DataStore
-	 * @since 3.2
-	 */
-	public Server(String port, int backlog, InetAddress bindAddr, String timeout, String ticket)
-	{
-		_establisher = new ConnectionEstablisher(port, backlog, bindAddr, timeout, ticket);
-	}
-
-
-
-	/**
-	 * Runs the server by starting the ConnectionEstablisher
-	 */
-	public void run()
-	{
-		_establisher.start();
-	}
-
-	
-	/**
-	 * Return the reference for the ConnectionEstablisher for this client
-	 *
-	 * @return the the reference for the ConnectionEstablisher instance for this
-	 *         client
-	 * @since 3.0
-	 */
-	public ConnectionEstablisher getEstablisher()
-	{
-		return _establisher;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
deleted file mode 100644
index 5f6fdef60..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLauncher.java
+++ /dev/null
@@ -1,686 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight (IBM) - [193426] don't display exceptions
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * David McKnight   (IBM) - [245714] [dstore] Multiple user ID/password prompts and connect fails
- *******************************************************************************/
-
-package org.eclipse.dstore.core.server;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.BindException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-
-import javax.net.ssl.HandshakeCompletedEvent;
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.IDataStoreConstants;
-import org.eclipse.dstore.core.model.ISSLProperties;
-import org.eclipse.dstore.internal.core.server.ServerReturnCodes;
-import org.eclipse.dstore.internal.core.server.ServerSSLProperties;
-import org.eclipse.dstore.internal.core.util.ssl.DStoreSSLContext;
-
-/**
- * This class is the DataStore daemon. It is used for authenticating users,
- * launching DataStore servers under particular user IDs, and providing a client
- * with enough information to connect to a launched server.
- * 
- */
-public class ServerLauncher extends Thread {
-
-	/**
-	 * An instances of this class get loaded whenever a client requests access
-	 * to a DataStore server. The ConnectionListener attempts to launch a server
-	 * under the client user's ID, communicating back information to the client
-	 * so that if may connect to the launched server. If the authentification
-	 * and connection to the server are successful, ConnectionListener continues
-	 * to monitor the server connection until it is terminated.
-	 */
-	public class ConnectionListener extends Thread implements
-			HandshakeCompletedListener {
-
-		private Socket _socket;
-
-		private PrintWriter _writer;
-
-		private BufferedReader _reader;
-
-		private Process _serverProcess;
-
-		private String _port;
-
-		private boolean _done;
-
-		private BufferedReader _outReader;
-
-		private BufferedReader _errReader;
-
-		/**
-		 * Constructor
-		 * 
-		 * @param socket
-		 *            a socket to the daemon
-		 */
-		public ConnectionListener(Socket socket) {
-
-			_socket = socket;
-			try {
-				_writer = new PrintWriter(new OutputStreamWriter(_socket
-						.getOutputStream(), DE.ENCODING_UTF_8));
-				_reader = new BufferedReader(new InputStreamReader(_socket
-						.getInputStream(), DE.ENCODING_UTF_8));
-			} catch (java.io.IOException e) {
-				System.out.println("ServerLauncher:" + e); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * Called when shutdown
-		 */
-		public void finalize() throws Throwable {
-			if (_serverProcess != null) {
-				_serverProcess.destroy();
-			}
-			super.finalize();
-		}
-
-		/**
-		 * Listens to the connection and prints any output while the connection
-		 * is active
-		 */
-		public void run() {
-			_done = true;
-			if (listen()) {
-				if (_serverProcess != null) {
-					_done = false;
-
-					try {
-						String line = null;
-
-						while ((_outReader != null)
-								&& ((line = _outReader.readLine()) != null)) {
-							if (line.equals(ServerReturnCodes.RC_FINISHED)) {
-								break;
-							} else {
-								System.out.println(line);
-							}
-						}
-
-						if (_outReader != null) {
-							_outReader.close();
-						}
-						if (_errReader != null) {
-							_errReader.close();
-						}
-
-						_serverProcess.waitFor();
-					} catch (Exception e) {
-						System.out.println("ServerLauncher:" + e); //$NON-NLS-1$
-					}
-				}
-
-				System.out.println("finished on port " + _port); //$NON-NLS-1$
-				_outReader = null;
-				_errReader = null;
-				_serverProcess = null;
-				_done = true;
-			} else {
-				_done = true;
-			}
-		}
-
-		/**
-		 * Indicates whether the connection has terminated or not
-		 * 
-		 * @return true if the connection has terminated
-		 */
-		public boolean isDone() {
-			return _done;
-		}
-
-		/**
-		 * Returns the DataStore server port used
-		 * 
-		 * @return the server port
-		 */
-		public String getServerPort() {
-			return _port;
-		}
-
-		private boolean isPortInRange(String portStr, String portRange) {
-			if (portRange != null) {
-				String[] range = portRange.split("-"); //$NON-NLS-1$
-				if (range.length == 2) {
-					int lPort = 0;
-					int hPort = 0;
-					int port = 0;
-					try {
-						lPort = Integer.parseInt(range[0]);
-						hPort = Integer.parseInt(range[1]);
-						port = Integer.parseInt(portStr);
-					} catch (Exception e) {
-					}
-
-					return (port >= lPort && port <= hPort);
-				}
-			}
-			return true;
-		}
-
-		/**
-		 * Attempt to start a new DataStore server. The port and the ticket for
-		 * a newly started DataStore are captured and sent back to the client so
-		 * that it may connect to the server.
-		 * 
-		 * @return whether the server started successfully
-		 */
-		public boolean listen()
-		{
-			boolean connected = false;
-
-			String user = null;
-			String password = null;
-
-			_port = null;
-			
-			boolean problemReadingSocket = false;
-			try
-			{
-				user = _reader.readLine();
-				password = _reader.readLine();
-				_port = _reader.readLine();
-			}
-			catch (IOException e)
-			{
-				// don't display exceptions 193426
-				//e.printStackTrace();
-				_port = "0"; //$NON-NLS-1$
-				
-				// this is probably an SSL exception
-				_writer.println(IDataStoreConstants.SERVER_FAILURE + e);
-				problemReadingSocket = true;
-			}
-
-			
-			if (_serverPortRange != null && (_port == null || _port.equals("0"))) //$NON-NLS-1$
-			{
-				_port = _serverPortRange;
-			}		
-
-			if (!problemReadingSocket)
-			{
-				boolean isError = false;
-				if (_serverPortRange != null && _port != _serverPortRange)
-				{
-					if (!isPortInRange(_port, _serverPortRange))
-					{
-						String message = IDataStoreConstants.PORT_OUT_RANGE;
-						message += _serverPortRange;
-						_writer.println(message);
-						isError = true;
-					}
-				}
-				if (!isError)
-				{
-					// start new server
-					try
-					{
-						String launchStatus = null;
-						String ticket = new String("" + System.currentTimeMillis()); //$NON-NLS-1$
-	
-						String theOS = System.getProperty("os.name"); //$NON-NLS-1$
-						String timeout = "120000"; //$NON-NLS-1$
-	
-								
-						if (!theOS.toLowerCase().startsWith("win")) //$NON-NLS-1$
-						{
-							// assuming unix compatable
-	                        //
-	                        // Get the property which
-	                        // contains the authorization
-	                        // script path
-	                        //
-							String authPath = System.getProperty("RSE.AUTH"); //$NON-NLS-1$
-							File authFile = null;
-							if (authPath != null && authPath.length() > 0)
-							{
-								authFile = new File(authPath);
-							}
-							if (authFile == null || !authFile.exists())
-							{
-								authPath = "perl " + _path + File.separator + "auth.pl"; //$NON-NLS-1$ //$NON-NLS-2$							
-							}
-	
-							String authString =
-									authPath
-									+ " " //$NON-NLS-1$
-									+ user
-									+ " " //$NON-NLS-1$
-									+ _path
-									+ " " //$NON-NLS-1$
-									+ _port
-									+ " " //$NON-NLS-1$
-									+ timeout
-									+ " " //$NON-NLS-1$
-									+ ticket
-									+ " " //$NON-NLS-1$
-									+ System.getProperty("java.home") //$NON-NLS-1$
-									;
-	
-							String[] authArray = { "sh", "-c", authString }; //$NON-NLS-1$ //$NON-NLS-2$
-	
-							// test password
-							_serverProcess = Runtime.getRuntime().exec(authArray);
-	
-							_outReader = new BufferedReader(new InputStreamReader(_serverProcess.getInputStream()));
-							_errReader = new BufferedReader(new InputStreamReader(_serverProcess.getErrorStream()));
-							BufferedWriter inWriter  = new BufferedWriter(new OutputStreamWriter(_serverProcess.getOutputStream()));
-							// write password
-							if (password != null)
-							{
-								inWriter.write(password);
-								inWriter.newLine();
-								inWriter.flush();
-							
-								launchStatus = _outReader.readLine();
-							}
-						}
-						else
-						{
-				
-							// launch new server
-							String[] cmdArray =
-								{
-									"java", //$NON-NLS-1$
-									"-DA_PLUGIN_PATH=" + _path, //$NON-NLS-1$
-									"-DDSTORE_SPIRIT_ON=true", //$NON-NLS-1$
-									"org.eclipse.dstore.core.server.Server", //$NON-NLS-1$
-									_port,
-									timeout,
-									ticket};
-	
-							_serverProcess = Runtime.getRuntime().exec(cmdArray);
-							_outReader = new BufferedReader(new InputStreamReader(_serverProcess.getInputStream()));
-							_errReader = new BufferedReader(new InputStreamReader(_serverProcess.getErrorStream()));
-	
-							launchStatus = "success"; //$NON-NLS-1$
-						}
-	
-						if ((launchStatus == null) || !launchStatus.equals("success")) //$NON-NLS-1$
-						{
-							_writer.println(IDataStoreConstants.AUTHENTICATION_FAILED);
-						}
-						else
-						{
-							// look for the server startup string, it needs to occur
-							// somewhere in the line.
-							String status = _errReader.readLine();
-							while (status!=null && (status.indexOf(ServerReturnCodes.RC_DSTORE_SERVER_MAGIC) < 0))
-							{
-								status = _errReader.readLine();
-							}
-							// now read the real server status
-							if (status != null)
-							{
-								status = _errReader.readLine();
-							}
-							if ((status != null) && status.equals(ServerReturnCodes.RC_SUCCESS))
-							{
-								_port = _errReader.readLine();
-								_errReader.readLine();
-								_writer.println(IDataStoreConstants.CONNECTED);
-								_writer.println(_port);
-								_writer.println(ticket);
-	
-								System.out.println("launched new server on " + _port); //$NON-NLS-1$
-								connected = true;
-							}
-							else
-							{
-								if (status == null)
-								{
-									status = new String(IDataStoreConstants.UNKNOWN_PROBLEM);
-								}
-								// TODO Make sure that the client doesnt try
-								// connecting forever
-								_writer.println(status);
-	
-								_serverProcess.destroy();
-								_serverProcess = null;
-								_outReader.close();
-								_outReader = null;
-	
-								_errReader.close();
-								_errReader = null;
-							}
-						}
-			
-					}
-					catch (IOException e)
-					{
-						_writer.println(IDataStoreConstants.SERVER_FAILURE + e);
-					}
-				}
-			}
-
-			_writer.flush();
-
-			// close socket
-			try
-			{
-				_socket.close();
-			}
-			catch (IOException e)
-			{
-				System.out.println("ServerLauncher:" + e); //$NON-NLS-1$
-			}
-
-			return connected;
-		}
-
-		public void handshakeCompleted(HandshakeCompletedEvent event) {
-			System.out.println("handshake completed"); //$NON-NLS-1$
-			System.out.println(event);
-
-		}
-	}
-
-	private ServerSocket _serverSocket;
-
-	private String _path;
-
-	private ArrayList _connections;
-
-	private String _serverPortRange;
-
-	private ISSLProperties _sslProperties;
-
-	public static int DEFAULT_DAEMON_PORT = 4075;
-
-	/**
-	 * Constructor
-	 */
-	public ServerLauncher() {
-		String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$
-		if (pluginPath == null) {
-			System.out.println("A_PLUGIN_PATH is not defined"); //$NON-NLS-1$
-			System.exit(-1);
-		}
-		else
-		{
-			_path = pluginPath.trim();
-
-			_connections = new ArrayList();
-
-			init(DEFAULT_DAEMON_PORT + ""); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param portStr
-	 *            the port for the daemon socket to run on
-	 */
-	public ServerLauncher(String portStr) {
-		String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$
-		if (pluginPath == null) {
-			System.out.println("A_PLUGIN_PATH is not defined"); //$NON-NLS-1$
-			System.exit(-1);
-		}
-		else
-		{
-			_path = pluginPath.trim();
-
-			_connections = new ArrayList();
-			init(portStr);
-		}
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param portStr
-	 *            the port for the daemon socket to run on
-	 * @param serverPortRange
-	 *            the port range for launched servers
-	 */
-	public ServerLauncher(String portStr, String serverPortRange) {
-		String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$
-		if (pluginPath == null) {
-			System.out.println("A_PLUGIN_PATH is not defined"); //$NON-NLS-1$
-			System.exit(-1);
-		}
-		else
-		{
-			_path = pluginPath.trim();
-
-			_serverPortRange = serverPortRange;
-			_connections = new ArrayList();
-			init(portStr);
-		}
-	}
-
-	private String getKeyStoreLocation() {
-		return _sslProperties.getDaemonKeyStorePath();
-	}
-
-	private String getKeyStorePassword() {
-		return _sslProperties.getDaemonKeyStorePassword();
-	}
-
-	/**
-	 * initializes the DataStore daemon
-	 * 
-	 * @param portStr the daemon port
-	 */
-	public void init(String portStr) {
-		// create server socket from port
-		_sslProperties = new ServerSSLProperties();
-
-		// determine if portStr is a port range or just a port
-		String[] range = portStr.split("-"); //$NON-NLS-1$
-		if (range.length == 2) {
-			int lPort = 0;
-			int hPort = 0;
-			try {
-				lPort = Integer.parseInt(range[0]);
-				hPort = Integer.parseInt(range[1]);
-			} catch (Exception e) {
-			}
-
-			boolean socketBound = false;
-			for (int i = lPort; i < hPort && !socketBound; i++) {
-				// create server socket from port
-				try {
-					if (_sslProperties.usingSSL()) {
-						String keyStoreFileName = getKeyStoreLocation();
-						String keyStorePassword = getKeyStorePassword();
-
-						try {
-							SSLContext sslContext = DStoreSSLContext
-									.getServerSSLContext(keyStoreFileName,
-											keyStorePassword);
-
-							_serverSocket = sslContext.getServerSocketFactory()
-									.createServerSocket(i);
-						} catch (Exception e) {
-							// don't display exceptions 193426
-							//e.printStackTrace();
-						}
-					} else {
-						_serverSocket = new ServerSocket(i);
-					}
-					if (_serverSocket != null
-							&& _serverSocket.getLocalPort() > 0) {
-						socketBound = true;
-						System.out.println("Daemon running on: " //$NON-NLS-1$
-								+ InetAddress.getLocalHost().getHostName()
-								+ ", port: " + i); //$NON-NLS-1$
-					}
-				} catch (UnknownHostException e) {
-					System.err
-							.println("Networking problem, can't resolve local host"); //$NON-NLS-1$
-					// don't display exceptions 193426
-					//e.printStackTrace();
-					System.exit(-1);
-				} catch (BindException e) {
-					System.err.println("socket taken on " + i); //$NON-NLS-1$
-					// keep going
-				} catch (IOException e) {
-					System.err.println("Failure to create ServerSocket"); //$NON-NLS-1$
-					// don't display exceptions 193426
-					//e.printStackTrace();
-					System.exit(-1);
-				}
-
-			}
-		} else {
-			int port = Integer.parseInt(portStr);
-			try {
-				if (_sslProperties.usingSSL()) {
-					String keyStoreFileName = getKeyStoreLocation();
-					String keyStorePassword = getKeyStorePassword();
-
-					try {
-						SSLContext sslContext = DStoreSSLContext
-								.getServerSSLContext(keyStoreFileName,
-										keyStorePassword);
-
-						_serverSocket = sslContext.getServerSocketFactory()
-								.createServerSocket(port);
-					} catch (Exception e) {
-						// don't display exceptions 193426
-						//e.printStackTrace();
-						System.err.println(e.getMessage());
-						System.exit(-1);
-					}
-				} else {
-					_serverSocket = new ServerSocket(port);
-				}
-				System.out.println("Daemon running on: " //$NON-NLS-1$
-						+ InetAddress.getLocalHost().getHostName() + ", port: " //$NON-NLS-1$
-						+ port);
-			} catch (UnknownHostException e) {
-				System.err
-						.println("Networking problem, can't resolve local host"); //$NON-NLS-1$
-				// don't display exceptions 193426
-				//e.printStackTrace();
-				System.exit(-1);
-			} catch (IOException e) {
-				System.err.println("Failure to create ServerSocket"); //$NON-NLS-1$
-				// don't display exceptions 193426
-				//e.printStackTrace();
-				System.exit(-1);
-			}
-		}
-	}
-
-	/**
-	 * Return the connection listener for the specified port if there is one
-	 * 
-	 * @param port
-	 *            the port
-	 * @return the listener associated with the port
-	 */
-	protected ConnectionListener getListenerForPort(String port) {
-		for (int i = 0; i < _connections.size(); i++) {
-			ConnectionListener listener = (ConnectionListener) _connections
-					.get(i);
-			if (listener.getServerPort().equals(port)) {
-				return listener;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Run the daemon
-	 */
-	public void run() {
-		while (true) {
-			try {
-				boolean connectionOkay = true;
-				Socket newSocket = _serverSocket.accept();
-				if (_sslProperties.usingSSL()) {
-
-					SSLSocket sslSocket = (SSLSocket) newSocket;
-					sslSocket
-							.addHandshakeCompletedListener(new HandshakeCompletedListener() {
-
-								public void handshakeCompleted(
-										HandshakeCompletedEvent event) {
-									System.out.println("handshake completed"); //$NON-NLS-1$
-								}
-
-							});
-					SSLSession session = sslSocket.getSession();
-					if (session == null) {
-						System.out.println("handshake failed"); //$NON-NLS-1$
-
-						sslSocket.close();
-						connectionOkay = false;
-					}
-				}
-				if (connectionOkay) {
-					ConnectionListener listener = new ConnectionListener(
-							newSocket);
-					listener.start();
-					_connections.add(listener);
-				}
-			} catch (IOException ioe) {
-				System.err.println("Server: error initializing socket: " + ioe); //$NON-NLS-1$
-				System.exit(-1);
-			}
-		}
-	}
-
-	/**
-	 * Entry point into the DataStore daemon
-	 * 
-	 * @param args
-	 *            the port for the daemon to run on (default is 4075).
-	 *            Optionally, the second arg specifies whether to use SSL or
-	 *            not. an optional second arg can be used to specify the port
-	 *            range of servers that get launched
-	 */
-	public static void main(String args[]) {
-		if (args.length == 2) {
-			ServerLauncher theServer = new ServerLauncher(args[0], args[1]);
-			theServer.start();
-		} else if (args.length == 1) {
-			ServerLauncher theServer = new ServerLauncher(args[0]);
-			theServer.start();
-		} else {
-			ServerLauncher theServer = new ServerLauncher();
-			theServer.start();
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLogger.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLogger.java
deleted file mode 100644
index f4d64960d..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerLogger.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- * David McKnight  (IBM)  - [226086] [dstore][api][breaking] Move ServerLogger class to dstore.core
- * Jacob Garcowski (IBM)  - [232738] [dstore] Delay creation of log file until written to
- * Noriaki Takatsu (IBM)  - [232443] [multithread] A single rsecomm.log for all clients
- * Noriaki Takatsu (IBM)  - [239419] [multithread] Dynamically change the level of logging
- * David McKnight  (IBM)  - [244876] [dstore] make DEBUG a non-final variable of the ServerLogger class
- * David McKnight  (IBM)  - [271914] [dstore] Setting debug on/off dynamically
- * David McKnight  (IBM)  - [269908] [dstore] rsecomm.log file management
- * David McKnight  (IBM)  - [284787] [dstore] ability to disable RSECOMM_LOGFILE_MAX option
- * David McKnight  (IBM)  - [305272] [dstore][multithread] log close in ServerLogger
- * Noriaki Takatsu (IBM)  - [341578] [dstore] ServerLogger is looped when IOError happens
- * David McKnight   (IBM) - [351993] [dstore] not able to connect to server if .eclipse folder not available
- * David McKnight  (IBM)  - [366220] Log_To_File no longer default value for log_location in rsecomm.properties
- ********************************************************************************/
-
-package org.eclipse.dstore.core.server;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.ResourceBundle;
-
-/**
- * Class that facilitates logging for errors, warnings, debug messages and info
- * for DataStore servers.
- *
- * @since 3.0 moved from non-API to API
- */
-public class ServerLogger implements IServerLogger
-{
-
-
-	// Constants for logging - for use in rsecomm.properties
-	private static final String DEBUG_LEVEL = "debug_level"; //$NON-NLS-1$
-	private static final String LOG_LOCATION = "log_location"; //$NON-NLS-1$
-
-	private static final int LOG_WARNING = 1;
-	private static final int LOG_INFO = 2;
-	private static final int LOG_DEBUG = 3;
-
-	private static final String LOG_TO_STDOUT = "Log_To_StdOut"; //$NON-NLS-1$
-
-	private Object writeLock = new Object();
-	private PrintWriter _logFileStream = null;
-
-	/**
-	 * Switch to enable debug-level logging. Note that, in 3.0, this variable
-	 * was final but, as of 3.0.1, it's not.
-	 */
-	public static boolean DEBUG = false;
-
-	private int log_level = 0;
-
-	private boolean initialized = false;
-	private String logPathName = null;
-	private boolean logToFile = true;
-
-	/**
-	 * Constructs a new ServerLogger.
-	 *
-	 * @param logPathName the path on the filesystem to store the log information
-	 */
-	public ServerLogger(String logPathName) {
-		this.logPathName = logPathName;
-		// Read .properties file to configure
-		try {
-			ResourceBundle properties = ResourceBundle.getBundle("rsecomm"); //$NON-NLS-1$
-			String debug_level = properties.getString(DEBUG_LEVEL).trim();
-			log_level = Integer.parseInt(debug_level);
-			String log_location = properties.getString(LOG_LOCATION).trim();
-			if (log_location.equalsIgnoreCase(LOG_TO_STDOUT)) {
-				logToFile = false;
-				_logFileStream = new PrintWriter(System.out);
-			}
-		} catch (Exception e) {
-			// Just use logging defaults: log_level = 0, log to file
-			//e.printStackTrace();		
-		}
-	}
-
-	private void initialize()
-	{
-		initialized = true;
-		if (_logFileStream == null) {
-			if (logToFile) {
-				try {
-			  		File _logFile = getLogFile("rsecomm"); //$NON-NLS-1$
-			  		if (!_logFile.exists()){
-			  			_logFile.createNewFile();
-			  		}
-			  		if (_logFile != null && _logFile.canWrite()){
-			  			_logFileStream = new PrintWriter(new FileOutputStream(_logFile));
-			  		}
-			  		else {
-			  			log_level = 0;
-						logToFile = false;
-						_logFileStream = new PrintWriter(System.out);
-			  		}
-
-				} catch (IOException e) {
-					System.out.println("Error opening log file " + logPathName + "rsecomm.log");		 //$NON-NLS-1$ //$NON-NLS-2$
-					log_level = 0;
-					logToFile = false;
-					_logFileStream = new PrintWriter(System.out);
-				}
-			}
-		}
-	}
-
-	/**
-	 * closeLogFileStream
-	 * @since 3.2
-	 */
-	public void closeLogFileStream(){
-		if (_logFileStream != null){
-			_logFileStream.close();
-		}
-	}
-	
-	private File getLogFile(String preferredName){
-		String ext = ".log"; //$NON-NLS-1$
-		boolean found = false;
-		long logFileMax = 1000000;
-		String logFileMaxStr = System.getProperty("RSECOMM_LOGFILE_MAX"); //$NON-NLS-1$
-		if (logFileMaxStr != null && logFileMaxStr.length() > 0){
-			try {
-				logFileMax = Integer.parseInt(logFileMaxStr);
-			}
-			catch (NumberFormatException e){
-				System.err.println("ServerLogger: "+e.toString()); //$NON-NLS-1$
-			}
-		}
-		
-		File logFile = null;
-		String name = null;
-		int suffix = 0;
-		while (!found) {
-			name = (suffix == 0) ? preferredName + ext: preferredName + suffix + ext;
-			logFile = new File(logPathName, name);
-
-			if (!logFile.exists()) {
-				try {
-					logFile.createNewFile();
-					found = true;
-				}
-				catch (IOException e){
-					return null;
-				}
-			}
-			else {
-				// if the file exists, check it's size
-				long fileSize = logFile.length();
-				if  (logFileMax > 0 && fileSize > logFileMax){ // if logFileMax is 0 or less, than always use the same file					
-					// file too big, need a new one				
-					suffix++;
-				}
-				else {
-					found = true;
-				}
-			}	
-		}
-		return logFile;
-	}
-	
-
-	/**
-	 * Logs an informational message
-	 *
-	 * @param minerName the name of the miner associated with this message
-	 * @param message Message text to be logged.
-	 */
-	public void logInfo(String minerName, String message) {
-		if (!initialized)
-			initialize();
-		String loggerLogLevel = System.getProperty("DSTORE_LOGGER_LOG_LEVEL"); //$NON-NLS-1$
-		if (loggerLogLevel != null){
-			try {
-				log_level = Integer.parseInt(loggerLogLevel);
-			}
-			catch (NumberFormatException e){
-				System.err.println("ServerLogger: "+e.toString()); //$NON-NLS-1$
-			}
-		}
-		if (log_level >= LOG_INFO) {
-			if (_logFileStream != null) {
-				synchronized(writeLock) {
-					try {
-						_logFileStream.println(new Date());
-						_logFileStream.println("INFO " + minerName + ": " + message); //$NON-NLS-1$ //$NON-NLS-2$
-						_logFileStream.println("---------------------------------------------------------------"); //$NON-NLS-1$
-						_logFileStream.flush();
-					}catch (Exception e) {}
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Logs a warning message
-	 *
-	 * @param minerName the name of the miner associated with this message
-	 * @param message Message text to be logged.
-	 */
-	public void logWarning(String minerName, String message) {
-		if (!initialized)
-			initialize();
-		String loggerLogLevel = System.getProperty("DSTORE_LOGGER_LOG_LEVEL"); //$NON-NLS-1$
-		if (loggerLogLevel != null){
-			try {
-				log_level = Integer.parseInt(loggerLogLevel);
-			}
-			catch (NumberFormatException e){
-				System.err.println("ServerLogger: "+e.toString()); //$NON-NLS-1$
-			}
-		}
-		if (log_level >= LOG_WARNING) {
-			if (_logFileStream != null) {
-				synchronized(writeLock) {
-					try {
-						_logFileStream.println(new Date());
-						_logFileStream.println("WARNING " + minerName + ": " + message); //$NON-NLS-1$ //$NON-NLS-2$
-						_logFileStream.println("---------------------------------------------------------------"); //$NON-NLS-1$
-						_logFileStream.flush();
-					}catch (Exception e) {}
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Logs an error message
-	 *
-	 * @param minerName the name of the miner associated with this message
-	 * @param message Message text to be logged.
-	 *
-	 * @param exception Exception that generated the error.  Used to print a stack trace.
-	 */
-	public void logError(String minerName, String message, Throwable exception) {
-		if (!initialized)
-			initialize();
-		
-		String loggerLogLevel = System.getProperty("DSTORE_LOGGER_LOG_LEVEL"); //$NON-NLS-1$
-		if (loggerLogLevel != null){
-			try {
-				log_level = Integer.parseInt(loggerLogLevel);
-			}
-			catch (NumberFormatException e){
-				System.err.println("ServerLogger: "+e.toString()); //$NON-NLS-1$
-			}
-		}		
-		
-		if (_logFileStream != null) {
-			synchronized(writeLock) {
-				try {
-					_logFileStream.println(new Date());
-					_logFileStream.println("ERROR " + minerName + ": " + message); //$NON-NLS-1$ //$NON-NLS-2$
-					if (exception != null) {
-						exception.printStackTrace(_logFileStream);
-					}
-					_logFileStream.println("---------------------------------------------------------------"); //$NON-NLS-1$
-					_logFileStream.flush();
-				}catch (Exception e) {}
-			}
-		}
-	}
-
-
-	/**
-	 * Logs a debug message
-	 *
-	 * @param minerName the name of the miner associated with this message
-	 * @param message Message text to be logged.
-	 */
-	public synchronized void logDebugMessage(String minerName, String message) {
-		if (!initialized)
-			initialize();
-		
-		String loggerLogLevel = System.getProperty("DSTORE_LOGGER_LOG_LEVEL"); //$NON-NLS-1$
-		if (loggerLogLevel != null){
-			try {
-				log_level = Integer.parseInt(loggerLogLevel);
-			}
-			catch (NumberFormatException e){
-				System.err.println("ServerLogger: "+e.toString()); //$NON-NLS-1$
-			}
-		}
-		if (DEBUG && log_level == LOG_DEBUG) {
-			if (_logFileStream != null) {
-				synchronized(writeLock) {
-					try {
-						_logFileStream.println(new Date());
-						_logFileStream.println("DEBUG " + minerName + ": " + message); //$NON-NLS-1$ //$NON-NLS-2$
-						_logFileStream.println("---------------------------------------------------------------"); //$NON-NLS-1$
-						_logFileStream.flush();
-					}catch (Exception e) {}
-				}
-			}
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java
deleted file mode 100644
index 5af28e2b2..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * Noriaki Takatsu  (IBM) - [227905] prevent double invocations of finished in ConncetionEstablisher
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * Noriaki Takatsu  (IBM) - [257666] [multithread] TCP/IP socket connection is not closed
- * David McKnight   (IBM) - [257666] modified original patch to simplify
- * Noriaki Takatsu  (IBM) - [283656] [dstore][multithread] Serviceability issue
- *******************************************************************************/
-
-package org.eclipse.dstore.core.server;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.util.Receiver;
-
-/**
- * The ServerReciever is responsible for recieving data from the client side.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- * @since 3.0 moved from non-API to API
- */
-public class ServerReceiver extends Receiver
-{
-
-	private ConnectionEstablisher _connection;
-
-	/**
-	 * Constructor
-	 *
-	 * @param socket the socket to receive from
-	 * @param connection the connection establisher
-	 */
-	public ServerReceiver(Socket socket, ConnectionEstablisher connection)
-	{
-		super(socket, connection.getDataStore());
-		_connection = connection;
-	}
-
-
-	/**
-	 * Implementation for handling the receiving on documents on
-	 * the server side.
-	 *
-	 * @param documentObject to tree root of received data.
-	 */
-	public void handleDocument(DataElement documentObject)
-	{
-		// parse request and determine what is wanted
-		for (int a = 0; a < documentObject.getNestedSize(); a++)
-		{
-			DataElement rootOutput = documentObject.get(a);
-
-			DataElement log = _dataStore.getLogRoot();
-			log.addNestedData(rootOutput, false);
-
-			if (rootOutput.getName().equals("C_EXIT")) //$NON-NLS-1$
-			{
-				finish();
-
-			}
-			else
-			{
-				_dataStore.command(rootOutput);
-			}
-		}
-	}
-
-	public void finish()
-	{
-		_dataStore.setConnected(false);
-	    super.finish();
-	    _connection.finished(this);
-	    try
-	    {
-	    	socket().close();
-	    }
-	    catch (IOException e){
-	    	if (_dataStore.getClient() != null) {
-				_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
-			}
-	    	System.out.println(e);
-	    }
-	}
-
-	/**
-	 * @see Receiver#finish()
-	 */
-	public void handleError(Throwable e)
-	{
-		if (_dataStore.getClient() != null) {
-			_dataStore.getClient().getLogger().logError(this.getClass().toString(), e.toString(), e);
-		}
-		System.out.println("RECEIVER ERROR"); //$NON-NLS-1$
-		e.printStackTrace();
-		System.out.println(e);
-		_connection.finished(this);
-		try
-	    {
-	    	socket().close();
-	    }
-	    catch (IOException IOe){
-	    	System.out.println(IOe);
-	    }
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SystemServiceManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SystemServiceManager.java
deleted file mode 100644
index 88f8fb1a4..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/SystemServiceManager.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- *  The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: Noriaki Takatsu and Masao Nishimoto
- *
- * Contributors:
- *   Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- *******************************************************************************/
-
-package org.eclipse.dstore.core.server;
-
-/**
- * @since 3.0
- */
-public class SystemServiceManager
-{
-	private static SystemServiceManager instance = null;
-	private static ISystemService _systemService;
-
-
-	/**
-     * Creates an instance of SystemServiceManager to hold the system-specific
-     * parts that needs unique implementations for this system.
-     *
-     */
-	private SystemServiceManager()
-    {}
-
-	/**
-     * Get the SystemServiceManager object for this system.
-     *
-     * @return the object of the SystemServiceManager
-     */
-	public static SystemServiceManager getInstance()
-	{
-		if (instance == null)
-		{
-			instance = new SystemServiceManager();
-		}
-		return instance;
-	}
-
-	/**
-     * Set the SystemService object for this system.
-     *
-     * @param systemService the object of the SystemService
-     */
-	public void setSystemService(ISystemService systemService)
-	{
-		_systemService = systemService;
-	}
-
-	/**
-     * Get the SystemService object for this system.
-     *
-     * @return the object of the SystemService stored in SystemServiceManager
-     */
-	public ISystemService getSystemService()
-	{
-		return _systemService;
-	}
-
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java
deleted file mode 100644
index 9f4697c8c..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/CommandGenerator.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- *******************************************************************************/
-
-package org.eclipse.dstore.core.util;
-
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreResources;
-
-/**
- * This class is used to generate command object instances from command
- * descriptors and arguments to commands. Command instances are instances of
- * command descriptors. Each command instance contains a set of data arguments
- * and a status object, that represents the current state of a command. After a
- * command instance is created, it is referenced in the command log for the
- * DataStore.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- * @since 3.0 moved from non-API to API
- */
-public class CommandGenerator
-{
-    private DataStore _dataStore = null;
-    private DataElement _log = null;
-
-    static private int _id = 0;
-
-	/**
-	 * Constructor
-	 */
-    public CommandGenerator()
-    {
-    }
-
-	/**
-	 * Sets the associated DataStore
-	 * @param dataStore the associated DataStore
-	 */
-    public void setDataStore(DataStore dataStore)
-    {
-        _dataStore = dataStore;
-        _log = _dataStore.getLogRoot();
-    }
-
-	/**
-	 * This method logs the current command object in the DataStore command log.  For each
-	 * logged command, a status object is created and returned.
-	 * @param commandObject the commandObject to log
-	 * @return the status object of the command
-	 */
-    public DataElement logCommand(DataElement commandObject)
-    {
-        try
-        {
-            // create time and status objects
-        	StringBuffer id = new StringBuffer(commandObject.getId());
-        	id.append(DataStoreResources.model_status);
-            _dataStore.createObject(
-                    commandObject,
-                   DataStoreResources.model_status,
-                   DataStoreResources.model_start,
-                    "", //$NON-NLS-1$
-                   	id.toString());
-
-            _log.addNestedData(commandObject, false);
-
-        }
-        catch (Exception e)
-        {
-            _dataStore.trace(e);
-        }
-
-        return commandObject;
-    }
-
-	/**
-	 * Creates a new command instance object from a command descriptor
-	 * @param commandDescriptor the descriptor of the command to create
-	 * @return the new command instance
-	 */
-    public DataElement createCommand(DataElement commandDescriptor)
-    {
-        if (commandDescriptor != null)
-        {
-            if (commandDescriptor.getType().equals(DE.T_COMMAND_DESCRIPTOR))
-            {
-                DataElement commandInstance = _dataStore.createObject(null, commandDescriptor.getName(), commandDescriptor.getValue(), commandDescriptor.getSource());
-                commandInstance.setDescriptor(commandDescriptor);
-                return commandInstance;
-            }
-            else
-            {
-                System.out.println("not cd -> " + commandDescriptor); //$NON-NLS-1$
-                return null;
-            }
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private void clearDeleted(DataElement element)
-    {
-    	for (int i = 0; i < element.getNestedSize(); i++)
-    	{
-    		DataElement child = element.get(i).dereference();
-    		if (child.isDeleted())
-    		{
-    			element.removeNestedData(child);
-    		}
-    	}
-    }
-
-	/**
-	 * Creates a new command from a command descriptor and it's arguments.
-	 *
-	 * @param commandDescriptor the command type of the new command
-	 * @param arguments the arguments for the command, besides the subject
-	 * @param dataObject the subject of the command
-	 * @param refArg indicates whether the subject should be represented as a reference or directly
-	 * @return the status object of the command
-	 */
-    public DataElement generateCommand(DataElement commandDescriptor, ArrayList arguments, DataElement dataObject, boolean refArg)
-    {
-
-        DataElement commandObject = createCommand(commandDescriptor);
-        if (commandObject != null)
-        {
-        	clearDeleted(dataObject);
-
-            commandObject.setAttribute(DE.A_VALUE, commandDescriptor.getName());
-
-            if (dataObject.isUpdated() && !dataObject.isSpirit())
-            {
-                _dataStore.createReference(commandObject, dataObject,DataStoreResources.model_contents);
-            }
-            else
-            {
-            	dataObject.setPendingTransfer(true);
-                commandObject.addNestedData(dataObject, false);
-            }
-
-            if (arguments != null)
-            {
-                for (int i = 0; i < arguments.size(); i++)
-                {
-                    DataElement arg = (DataElement) arguments.get(i);
-                    if (arg != null)
-                    {
-                        if (!arg.isUpdated() || arg.isSpirit())
-                        {
-                            commandObject.addNestedData(arg, false);
-                        }
-                        else
-                        {
-                            _dataStore.createReference(commandObject, arg, "argument"); //$NON-NLS-1$
-                        }
-                    }
-                }
-            }
-
-            return logCommand(commandObject);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-
-	/**
-	 * Creates a new command from a command descriptor and it's arguments.
-	 *
-	 * @param commandDescriptor the command type of the new command
-	 * @param arg the arguement for the command, besides the subject
-	 * @param dataObject the subject of the command
-	 * @param refArg indicates whether the subject should be represented as a reference or directly
-	 * @return the status object of the command
-	 */
-    public DataElement generateCommand(DataElement commandDescriptor, DataElement arg, DataElement dataObject, boolean refArg)
-    {
-        _id++;
-
-        DataElement commandObject = createCommand(commandDescriptor);
-        if (commandObject != null)
-        {
-            commandObject.setAttribute(DE.A_VALUE, commandDescriptor.getName());
-			clearDeleted(dataObject);
-            if ((refArg || dataObject.isUpdated()) && !dataObject.isSpirit())
-            {
-                _dataStore.createReference(commandObject, dataObject,DataStoreResources.model_contents);
-            }
-            else
-            {
-            	dataObject.setPendingTransfer(true);
-                commandObject.addNestedData(dataObject, false);
-            }
-
-            if (!arg.isUpdated() || arg.isSpirit())
-            {
-                commandObject.addNestedData(arg, false);
-            }
-            else
-            {
-                _dataStore.createReference(commandObject, arg, "argument"); //$NON-NLS-1$
-            }
-
-
-            return logCommand(commandObject);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-	/**
-	 * Creates a new command from a command descriptor and it's arguments.
-	 *
-	 * @param commandDescriptor the command type of the new command
-	 * @param dataObject the subject of the command
-	 * @param refArg indicates whether the subject should be represented as a reference or directly
-	 * @return the status object of the command
-	 */
-    public DataElement generateCommand(DataElement commandDescriptor, DataElement dataObject, boolean refArg)
-    {
-    	_id++;
-
-        DataElement commandObject = createCommand(commandDescriptor);
-        if (commandObject != null)
-        {
-            commandObject.setAttribute(DE.A_VALUE, commandDescriptor.getName());
-
-			clearDeleted(dataObject);
-            if ((refArg || dataObject.isUpdated()) && !dataObject.isSpirit())
-            {
-                _dataStore.createReference(commandObject, dataObject,DataStoreResources.model_arguments);
-            }
-            else
-            {
-            	dataObject.setPendingTransfer(true);
-                commandObject.addNestedData(dataObject, false);
-            }
-
-            return logCommand(commandObject);
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-	/**
-	 * Creates a response tree for transmitting a set of data from a server to a client.
-	 *
-	 * @param document the root of the response
-	 * @param objects the data contained in the response
-	 * @return the response tree root
-	 */
-    public DataElement generateResponse(DataElement document, ArrayList objects)
-    {
-        document.addNestedData(objects, false);
-        return document;
-    }
-
-	/**
-	 * Creates a response tree for transmitting a set of data from a server to a client.
-	 *
-	 * @param responseType the type of data to respond with
-	 * @param dataObject the child object in the response tree
-	 * @return the response tree root
-	 */
-    public DataElement generateResponse(String responseType, DataElement dataObject)
-    {
-        if (dataObject != null)
-        {
-            DataElement commandObject = _dataStore.createObject(null, "RESPONSE", responseType); //$NON-NLS-1$
-            commandObject.addNestedData(dataObject, true);
-            return commandObject;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-	/**
-	 * Creates a simple response object of the specified type
-	 *
-	 * @param responseType the type of data to respond with
-	 * @return the response object
-	 */
-    public DataElement generateResponse(String responseType)
-    {
-        DataElement commandObject = _dataStore.createObject(null, "RESPONSE", responseType); //$NON-NLS-1$
-        return commandObject;
-    }
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java
deleted file mode 100644
index bf6767605..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/Receiver.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight  (IBM)   [220123][dstore] Configurable timeout on irresponsiveness
- * David McKnight  (IBM)   [222003] Client remains connected after server terminates
- * Noriaki Takatsu (IBM)  - [220126] [dstore][api][breaking] Single process server for multiple clients
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- *******************************************************************************/
-
-package org.eclipse.dstore.core.util;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.net.Socket;
-import java.net.UnknownHostException;
-
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.IDataStorePreferenceListener;
-import org.eclipse.dstore.core.server.SecuredThread;
-import org.eclipse.dstore.internal.core.util.XMLparser;
-
-/**
- * This class is used for receiving data from a socket in the DataStore
- * communication layer.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @since 3.0 Moved from non-API to API
- */
-public abstract class Receiver extends SecuredThread implements IDataStorePreferenceListener
-{
-
-
-	private Socket _socket;
-
-	private XMLparser _xmlParser;
-	private BufferedInputStream _in;
-
-	protected boolean _canExit;
-
-	/**
-	 * Constructor
-	 * @param socket the socket to read from
-	 * @param dataStore the associated DataStore
-	 */
-	public Receiver(Socket socket, DataStore dataStore)
-	{
-		super(dataStore);
-		 setName("DStore Receiver"+getName()); //$NON-NLS-1$
-		_socket = socket;
-		_canExit = false;
-		_xmlParser = new XMLparser(dataStore);
-
-		try
-		{
-			_in = new BufferedInputStream(socket.getInputStream());
-		}
-		catch (UnknownHostException uhe)
-		{
-			//System.out.println("Receiver:" + uhe);
-		}
-		catch (IOException ioe)
-		{
-			//System.out.println("Receiver:" + ioe);
-		}
-
-		// keepalive preferences
-		String keepAliveResponseTimeout = System.getProperty(XMLparser.KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE);
-		if (keepAliveResponseTimeout != null){
-			preferenceChanged(XMLparser.KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE, keepAliveResponseTimeout);
-		}
-		String iosocketReadTimeout = System.getProperty(XMLparser.IO_SOCKET_READ_TIMEOUT_PREFERENCE);
-		if (iosocketReadTimeout != null){
-			preferenceChanged(XMLparser.IO_SOCKET_READ_TIMEOUT_PREFERENCE, iosocketReadTimeout);
-		}
-		String enableKeepAlive = System.getProperty(XMLparser.KEEPALIVE_ENABLED_PREFERENCE);
-		if (enableKeepAlive != null){
-			preferenceChanged(XMLparser.KEEPALIVE_ENABLED_PREFERENCE, enableKeepAlive);
-		}
-	}
-
-	/**
-	 * Called when a DataStore connection is terminated.
-	 */
-	public void finish()
-	{
-		_canExit = true;
-	}
-
-	/**
-	 * Indicates that the receiver can stop receiving data from the socket.
-	 * @return true if the receiver can stop
-	 */
-	public boolean canExit()
-	{
-		return _canExit;
-	}
-
-	/**
-	 * Called when the receiver thread is running
-	 */
-	public void run()
-	{
-		super.run();
-		try
-		{
-			while (!_canExit)
-			{
-				handleInput();
-			}
-
-			if (_canExit){
-				// is this an unexpected exit?
-				if (_dataStore.isConnected()){
-					// server exited without client exit
-					Exception e = new Exception("Server terminated unexpectedly"); //$NON-NLS-1$
-					handleError(e);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			_canExit = true;
-			e.printStackTrace();
-			handleError(e);
-		}
-	}
-
-	/**
-	 * Periodically called to receive data from the socket
-	 */
-	public void handleInput()
-	{
-		try
-		{
-			// wait on the socket
-			DataElement rootObject = _xmlParser.parseDocument(_in, _socket);
-
-			if (rootObject != null)
-			{
-				String type = rootObject.getType();
-				if (!type.equals("FILE")) //$NON-NLS-1$
-				{
-
-					handleDocument(rootObject);
-				}
-			}
-			else
-			{
-				// something really bad happened
-				_canExit = true;
-				if (_xmlParser.getPanicException() != null)
-					handleError(_xmlParser.getPanicException());
-			}
-		}
-		catch (IOException ioe)
-		{
-			_canExit = true;
-			handleError(ioe);
-		}
-		catch (Exception e)
-		{
-			handleError(e);
-		}
-	}
-
-	/**
-	 * Returns the associated socket
-	 * @return the socket
-	 */
-	public Socket socket()
-	{
-		return _socket;
-	}
-
-	/**
-	 * Implemented to provide a means of handling received input
-	 * @param documentObject the root object of the received data
-	 */
-	public abstract void handleDocument(DataElement documentObject);
-
-	/**
-	 * Implemented to provide a means of handling errors in the communication layer
-	 * @param e an exception that occurred
-	 */
-	public abstract void handleError(Throwable e);
-
-
-	public void preferenceChanged(String property, String value)
-	{
-		//System.out.println("setting preference: "+property + "="+value);
-		if (property.equals(XMLparser.IO_SOCKET_READ_TIMEOUT_PREFERENCE)){
-			int timeout = Integer.parseInt(value);
-			_xmlParser.setIOSocketReadTimeout(timeout);
-		}
-		else if (property.equals(XMLparser.KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE)){
-			int timeout = Integer.parseInt(value);
-			_xmlParser.setKeepaliveResponseTimeout(timeout);
-		}
-		else if (property.equals(XMLparser.KEEPALIVE_ENABLED_PREFERENCE)){
-			boolean enable = true;
-			if (value.equals("false")) //$NON-NLS-1$
-				enable = false;
-			_xmlParser.setEnableKeepalive(enable);
-		}
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/StringCompare.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/StringCompare.java
deleted file mode 100644
index 0a6876d4b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/StringCompare.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.dstore.core.util;
-
-/**
- * Utility class for comparing a wildcard string to another string
- */
-public class StringCompare
-{
-
-	/**
-	 * Constructor
-	 */
-	public StringCompare()
-	{
-	}
-
-	/**
-	 * Compare two strings
-	 * 
-	 * @param pattern the pattern to match
-	 * @param compareStr the string to compare against the pattern
-	 * @param noCase indicates whether the strings should be compared based on case
-	 * @return true if the compare string matches the pattern
-	 */
-	public static boolean compare(String pattern, String compareStr, boolean noCase)
-	{
-		if ((pattern == null) || (compareStr == null))
-			return false;
-
-		if (noCase)
-		{
-			pattern = pattern.toUpperCase();
-			compareStr = compareStr.toUpperCase();
-		}
-
-		int iText = 0;
-		int iPattern = 0;
-		int lastStar = 0;
-		int len = compareStr.length();
-
-		int patternLen = pattern.length();
-
-		while (iPattern < patternLen)
-		{
-			char p = pattern.charAt(iPattern++);
-			if (p == '*')
-			{
-
-				if (iPattern >= patternLen)
-				{
-					while (iText < len)
-					{
-						iText++;
-					}
-					return true;
-				}
-				else
-				{
-					lastStar = iPattern;
-				}
-			}
-			else
-			{
-				if (iText >= len)
-				{
-					return false;
-				}
-				else
-				{
-					char t = compareStr.charAt(iText++);
-					if (p == t)
-					{
-						if ((lastStar > 0) && (iPattern >= patternLen) && (iText < len))
-						{
-						}
-						else
-						{
-							continue;
-						}
-
-					}
-					else
-					{
-						if (lastStar == 0)
-						{
-							return false;
-						}
-					}
-
-					int matched = iPattern - lastStar - 1;
-					iPattern = lastStar;
-
-					iText -= matched;
-				}
-			}
-		}
-
-		if (iText >= len)
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/BaseSSLContext.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/BaseSSLContext.java
deleted file mode 100644
index d8dd51d54..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/BaseSSLContext.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2009 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- *
- * Contributors:
- * David McKnight  (IBM) - [259905][api] provide public API for getting/setting key managers for SSLContext
- ********************************************************************************/
-
-package org.eclipse.dstore.core.util.ssl;
-
-import javax.net.ssl.KeyManager;
-
-
-/**
- * @since 3.1
- */
-public class BaseSSLContext {
-	private static KeyManager[] _keyManagers;
-
-	public static void setKeyManagers(KeyManager[] keyManagers){
-		_keyManagers = keyManagers;
-	}
-
-	public static KeyManager[] getKeyManagers(){
-		return _keyManagers;
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreKeyStore.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreKeyStore.java
deleted file mode 100644
index 9b5108e2b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/DStoreKeyStore.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
- * David McKnight   (IBM) - [230013] [api][breaking] need to make DStoreKeyStore _instance private
- ********************************************************************************/
-
-package org.eclipse.dstore.core.util.ssl;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-
-
-/**
- * This class is used for managing the DStore keystore for use with the DStore communication framework.
- * 
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class DStoreKeyStore
-{
-	private static DStoreKeyStore _instance = new DStoreKeyStore();
-
-	public DStoreKeyStore()
-	{
-	}
-
-	public static DStoreKeyStore getInstance()
-	{
-		if (_instance == null)
-		{
-			_instance = new DStoreKeyStore();
-		}
-		return _instance;
-	}
-
-	public static KeyStore getKeyStore(String filePath, String password)
-	throws KeyStoreException, NoSuchAlgorithmException,
-	CertificateException, IOException, NoSuchProviderException
-
-	{
-		KeyStore keyStore= null;
-
-
-		if (filePath != null)
-		{
-			File keyStoreFile = new File(filePath);
-			
-			/* Do not stomp an existing file */
-			if(!keyStoreFile.exists()) 
-			{
-				keyStore =  KeyStore.getInstance("JKS"); //$NON-NLS-1$
-				keyStore.load(null, password.toCharArray());
-				persistKeyStore(keyStore, filePath, password);
-			}
-			else {
-				keyStore = loadKeyStore(filePath, password);
-			}		
-		}
-		
-		return keyStore;
-	}
-
-
-	public static KeyStore loadKeyStore(String pathname, String password)
-	   throws KeyStoreException,
-	           NoSuchAlgorithmException,
-	           CertificateException,
-	           IOException,
-	           NoSuchProviderException  {
-		
-		KeyStore ks=null;
-		File file=new File(pathname);
-		
-		/* Do not stomp an existing file */
-		if(file.exists()) {
-			ks=KeyStore.getInstance("JKS"); //$NON-NLS-1$
-			/* Initialize the keystore with no information */
-			FileInputStream is=new FileInputStream(file);
-			ks.load(is, password.toCharArray());
-			is.close();
-		}
-		return ks;
-	}
-	
-	public static Certificate loadCertificate(String certFilename) 
-	   throws CertificateException,
-	           FileNotFoundException {
-		
-		CertificateFactory factory=CertificateFactory.getInstance("X.509"); //$NON-NLS-1$
-		
-		return factory.generateCertificate(new FileInputStream(certFilename));
-	}
-	
-	public static void addCertificateToKeyStore(KeyStore ks, Certificate cert, String alias)
-		      throws KeyStoreException {
-		ks.setCertificateEntry(alias, cert);
-			
-	}
-	
-	public static void persistKeyStore(KeyStore ks, String pathname, String password) 
-		throws KeyStoreException,
-		        FileNotFoundException,
-		        NoSuchAlgorithmException,
-		        CertificateException,
-		        IOException {
-		FileOutputStream os=new FileOutputStream(pathname);
-		ks.store(os, password.toCharArray());
-		os.close();
-		
-		
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/IDataStoreTrustManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/IDataStoreTrustManager.java
deleted file mode 100644
index 785c7a64b..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/util/ssl/IDataStoreTrustManager.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- *
- * Contributors:
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- ********************************************************************************/
-package org.eclipse.dstore.core.util.ssl;
-
-import java.util.List;
-
-import javax.net.ssl.X509TrustManager;
-
-/**
- * Extracted interface from DataStoreTrustManager.
- * @since 3.0
- */
-public interface IDataStoreTrustManager extends X509TrustManager
-{
-	/**
-	 * Sets the path and password for the trust manager
-	 * @param filePath the path
-	 * @param password the password
-	 */
-	public void setKeystore(String filePath, String password);
-
-	/**
-	 * Returns the list of untrusted certificates
-	 * @return the list of untrusted certificates
-	 */
-	public List getUntrustedCerts();
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientAttributes.java
deleted file mode 100644
index a03f6c811..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientAttributes.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.client;
-
-import java.io.File;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.eclipse.dstore.core.model.DataStoreAttributes;
-
-/**
- * ClientAttributes is a container of communication related
- * information. 
- */
-public class ClientAttributes extends DataStoreAttributes
-{
-
-	/**
-	 * Constructor
-	 */
-	public ClientAttributes()
-	{
-		super();
-
-		try
-		{
-			String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$
-			if ((pluginPath != null) && (pluginPath.length() > 0))
-			{
-				setAttribute(A_PLUGIN_PATH, pluginPath + File.separator);
-			}
-
-			setAttribute(A_LOCAL_NAME, InetAddress.getLocalHost().getHostName());
-			setAttribute(A_LOCAL_PATH, "/tmp/"); //$NON-NLS-1$
-			setAttribute(A_HOST_NAME, "local"); //$NON-NLS-1$
-			setAttribute(A_HOST_PATH, "/"); //$NON-NLS-1$
-		}
-
-		catch (UnknownHostException e)
-		{
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientCommandHandler.java
deleted file mode 100644
index 8071ae40c..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientCommandHandler.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight  (IBM)   [220123][dstore] Configurable timeout on irresponsiveness
- * David McKnight  (IBM)   [222168][dstore] Buffer in DataElement is not sent
- * David McKnight  (IBM)   [246826][dstore] KeepAlive does not work correctly
- * David McKnight  (IBM)   [306853][dstore] RD/z client hang  after browse copy book command
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.client;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.model.CommandHandler;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreResources;
-import org.eclipse.dstore.internal.core.util.Sender;
-
-
-
-/**
- * The ClientCommandHandler is reponsible for maintaining
- * a queue of commands and periodically sending commands
- * from the queue to the server side.
- */
-public class ClientCommandHandler extends CommandHandler
-{
-
-	private Sender _sender;
-	protected DataElement _requestClassDocumentElement;
-	protected DataElement _keepAliveDocumentElement;
-	protected DataElement _confirmKeepAliveDocumentElement;
-	protected DataElement _pendingKeepAliveRequest;
-	protected DataElement _pendingKeepAliveConfirmation;
-
-	private static String[] _docAttributes =  { 
-		DataStoreResources.DOCUMENT_TYPE, 
-		"client.doc.root.id", //$NON-NLS-1$
-		"client.document", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _fileAttributes =  {
-		DataStoreResources.FILE_TYPE, 
-		"client.file.root.id", //$NON-NLS-1$
-		"client.file", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _classAttributes =  {
-		DataStoreResources.CLASS_TYPE, 
-		"client.class.root.id", //$NON-NLS-1$
-		"client.class", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _serializeAttributes =  {
-		DataStoreResources.SERIALIZED_TYPE, 
-		"client.serialized.root.id", //$NON-NLS-1$
-		"client.serialized", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _requestClassAttributes =  {
-		DataStoreResources.REQUEST_CLASS_TYPE, 
-		"client.requestclass.root.id", //$NON-NLS-1$
-		"client.requestclass", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _keepAliveAttributes =  {
-		DataStoreResources.KEEPALIVE_TYPE, 
-		"client.keepalive.root.id", //$NON-NLS-1$
-		"server.keepalive", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-		
-	private static String[] _confirmKeepAliveAttributes =  {
-		DataStoreResources.KEEPALIVECONFIRM_TYPE, 
-		"client.keepalive.confirm.root.id", //$NON-NLS-1$
-		"server.confirmkeepalive", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-		
-	
-	protected DataElement _fileDocumentElement;
-	protected DataElement _docDocumentElement;
-	protected DataElement _classDocumentElement;
-	protected DataElement _serializedDocumentElement;
-	
-	/**
-	 * Constructor
-	 * @param sender the Sender
-	 */
-	public ClientCommandHandler(Sender sender)
-	{
-		super();
-		_sender = sender;
-	}	
-	
-	
-	public void setDataStore(DataStore dataStore)
-	{
-		super.setDataStore(dataStore);
-		_fileDocumentElement = dataStore.createTransientObject(_fileAttributes);
-		_docDocumentElement = dataStore.createObject(null, _docAttributes);
-		_classDocumentElement = dataStore.createTransientObject(_classAttributes);
-		_serializedDocumentElement = dataStore.createTransientObject(_serializeAttributes);
-		_requestClassDocumentElement = dataStore.createTransientObject(_requestClassAttributes);
-		_keepAliveDocumentElement = dataStore.createTransientObject(_keepAliveAttributes);
-		_confirmKeepAliveDocumentElement = dataStore.createTransientObject(_confirmKeepAliveAttributes);
-	}
-
-	/**
-	 * Transmits the bytes of a file from the client to the server
-	 * @param bytes the bytes of a file to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or unicode
-	 * @param byteStreamHandlerId indicates wwhich byte stream handler should receive the bytes
-	 */
-	public synchronized void sendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		// send pending commands before file
-		if (_commands.size() > 0)
-			sendCommands();
-		
-		//DataElement document = _dataStore.createObject(null, DataStoreResources.FILE_TYPE, byteStreamHandlerId, fileName, fileName);
-		DataElement document = _fileDocumentElement;
-		document.setAttribute(DE.A_NAME, byteStreamHandlerId);
-		document.setAttribute(DE.A_VALUE, byteStreamHandlerId);
-		document.setAttribute(DE.A_SOURCE, fileName);
-		document.setPendingTransfer(true);
-		document.setParent(null);
-		_sender.sendFile(document, bytes, size, binary);
-	}
-	
-	/**
-	 * Transmits the bytes of a file from the client to the server
-	 * @param bytes the bytes of a file to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or unicode
-	 */
-	public synchronized void sendFile(String fileName, byte[] bytes, int size, boolean binary)
-	{
-		sendFile(fileName, bytes, size, binary, "default"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Appends bytes of a file from the client to the server
-	 * @param bytes the bytes of a file to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or unicode
-	 * @param byteStreamHandlerId indicates which byte stream handler should receive the bytes
-	 */
-	public synchronized void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		// send pending commands before file
-		if (_commands.size() > 0)
-			sendCommands();
-		
-		//DataElement document = _dataStore.createObject(null, DataStoreResources.FILE_TYPE, byteStreamHandlerId, fileName, fileName);
-
-		DataElement document = _fileDocumentElement;
-		document.setAttribute(DE.A_NAME, byteStreamHandlerId);
-		document.setAttribute(DE.A_VALUE, byteStreamHandlerId);
-		document.setAttribute(DE.A_SOURCE, fileName);
-		document.setPendingTransfer(true);
-		document.setParent(null);
-		_sender.sendAppendFile(document, bytes, size, binary);
-	}
-
-	
-	/**
-	 * Appends bytes of a file from the client to the server
-	 * @param bytes the bytes of a file to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes as binary or unicode
-	 */
-	public synchronized void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary)
-	{
-		sendAppendFile(fileName, bytes, size, binary, "default"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Called periodically to send the current queue of commands to the server
-	 */
-	public synchronized void sendCommands()
-	{
-		//DataElement commandRoot = _dataStore.createObject(null, DataStoreResources.DOCUMENT_TYPE, "client.doc"/*"client.doc." + _requests++*/);
-		DataElement commandRoot = _docDocumentElement;
-		commandRoot.removeNestedData();
-		commandRoot.setPendingTransfer(true);
-		commandRoot.setParent(null);
-		while (_commands.size() > 0)
-		{
-			DataElement command = null;
-			synchronized (_commands)
-			{
-				command = (DataElement)_commands.remove(0);
-			}
-
-			commandRoot.addNestedData(command, false);
-		}
-		
-		_sender.sendDocument(commandRoot, 3);
-		
-		if (_pendingKeepAliveConfirmation != null)
-		{
-			_sender.sendKeepAliveConfirmation(_pendingKeepAliveConfirmation);
-			_pendingKeepAliveConfirmation = null;
-		}
-		if (_pendingKeepAliveRequest != null)
-		{
-			_sender.sendKeepAliveRequest(_pendingKeepAliveRequest);
-			_pendingKeepAliveRequest = null;
-		}
-		
-		// finished sending commands, now send all classes that are waiting
-		// in the queue
-		while (_classesToSend != null && _classesToSend.size() > 0)
-		{
-			DataElement document = null;
-			synchronized (_classesToSend)
-			{
-				document = (DataElement)_classesToSend.remove(0);
-			}
-			_sender.sendClass(document);
-		}
-
-
-	}
-	
-	public void handle() 
-	{
-		if (!_commands.isEmpty() || _pendingKeepAliveConfirmation != null || _pendingKeepAliveRequest != null || !_classesToSend.isEmpty())
-		{
-			sendCommands();
-		}
-	}
-	
-	/**
-	 * Implemented to provide the means by which classes are sent
-	 * across the comm channel.
-	 * @param className the name of the class to send
-	 * @param classbyteStreamHandlerId the name of the byte stream handler to use to receive the class
-	 */
-	public synchronized void sendClass(String className, String classbyteStreamHandlerId)
-	{
-		// send pending commands before sending class
-		if (_commands.size() > 0)
-			sendCommands();
-				
-		DataElement document = _classDocumentElement;
-		document.setAttribute(DE.A_NAME, className);
-		document.setAttribute(DE.A_SOURCE, classbyteStreamHandlerId);
-		//document.setAttribute(DE.A_SOURCE, className);
-		document.setPendingTransfer(true);
-		document.setParent(null);
-		
-		addClassToSend(document);
-	}
-	
-	/**
-	 * Implemented to provide the means by which classes are requested and sent
-	 * across the comm channel.
-	 * @param className the name of the class to send
-	 */
-	public synchronized void sendClass(String className)
-	{
-		sendClass(className, "default"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Adds a class to the queue of classes (represented by DataElements) to
-	 * be sent to the server.
-	 * @param classElement the DataElement representing the class to be sent
-	 */
-	public void addClassToSend(DataElement classElement)
-	{
-		synchronized (_classesToSend)
-		{
-			if (!_classesToSend.contains(classElement))
-			{
-				_classesToSend.add(classElement);
-			}
-		}
-		notifyInput();
-	}
-
- 
-	public synchronized void sendClassInstance(IRemoteClassInstance runnable, String deserializebyteStreamHandlerId) 
-	{
-		// send pending commands before sending class
-		if (_commands.size() > 0)
-			sendCommands();
-				
-		DataElement document = _serializedDocumentElement;
-		document.setAttribute(DE.A_NAME, runnable.toString());
-		document.setAttribute(DE.A_SOURCE, deserializebyteStreamHandlerId);
-		document.setPendingTransfer(true);
-		document.setParent(null);		
-
-		
-		_sender.sendRemoteClassRunnable(document, runnable);
-	}
-
-	/**
-	 * Implemented to provide the means by which classes are requested
-	 * across the comm channel.
-	 * @param className the name of the class to request
-	 */
-	public void requestClass(String className) 
-	{
-		DataElement document = _requestClassDocumentElement;
-		document.setPendingTransfer(true);
-		document.setAttribute(DE.A_NAME, className);
-		document.setAttribute(DE.A_VALUE, className);
-		document.setParent(null);
-
-		_sender.requestClass(document);		
-	}
-
-
-	public void sendKeepAliveConfirmation() 
-	{
-		DataElement document = _confirmKeepAliveDocumentElement;
-		document.setPendingTransfer(true);
-		document.setAttribute(DE.A_NAME, "confirm"); //$NON-NLS-1$
-		document.setAttribute(DE.A_VALUE, "confirm"); //$NON-NLS-1$
-		document.setParent(null);
-		_pendingKeepAliveConfirmation = document;
-
-		handle(); // bypassing threading
-	}
-	
-	public void sendKeepAliveRequest() 
-	{
-		DataElement document = _keepAliveDocumentElement;
-		document.setPendingTransfer(true);
-		document.setAttribute(DE.A_NAME, "request"); //$NON-NLS-1$
-		document.setAttribute(DE.A_VALUE, "request"); //$NON-NLS-1$
-		document.setParent(null);
-		_pendingKeepAliveRequest = document;
-
-		handle(); // bypassing threading
-	}
-	
-	public synchronized void waitForInput() 
-	{
-		if (_commands.size() == 0 && _classesToSend.size() == 0 && _pendingKeepAliveConfirmation == null && _pendingKeepAliveRequest == null)
-		{
-			super.waitForInput();
-		}
-	}
-
-	/**
-	 * Indicates whether the xml generator should transfer the buffer attribute of a DataElement
-	 * @param flag true to transfer the buffer attribute
-	 */
-	public void setGenerateBuffer(boolean flag)
-	{
-		_sender.setGenerateBuffer(flag);
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientReceiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientReceiver.java
deleted file mode 100644
index 8f0b13147..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientReceiver.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.client;
-
-import java.net.Socket;
-
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.util.Receiver;
-
-/*
- * The ClientReciever is responsible for recieving data from
- * the server side.
- */
-public class ClientReceiver extends Receiver
-{
-
-	/**
-	 * Constructor
-	 */
-	public ClientReceiver(Socket socket, DataStore dataStore)
-	{
-		super(socket, dataStore);
-	}
-
-	/**
-	 * Called when new data is received from the server side.
-	 * @param documentObject the root object of incoming data
-	 */
-	public void handleDocument(DataElement documentObject)
-	{
-		if (documentObject.getName().equals("exit")) //$NON-NLS-1$
-		{
-			_canExit = true;
-		}
-		else
-		{
-			synchronized (documentObject)
-			{
-				for (int i = 0; i < documentObject.getNestedSize(); i++)
-				{
-					DataElement rootOutput = documentObject.get(i);
-					_dataStore.refresh(rootOutput);
-				}
-				documentObject.removeNestedData();
-				//_dataStore.deleteObject(documentObject.getParent(), documentObject);
-			}
-		}
-	}
-
-	/**
-	 * Called when an error occurs
-	 * @param e the exception that occurred
-	 */
-	public void handleError(Throwable e)
-	{
-		DataElement status = _dataStore.getStatus();
-		status.setAttribute(DE.A_NAME, e.getMessage());
-		_dataStore.refresh(status);
-		_dataStore.setConnected(false);
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientSSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientSSLProperties.java
deleted file mode 100644
index c4df4a8b5..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientSSLProperties.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.client;
-
-import org.eclipse.dstore.core.model.ISSLProperties;
-public class ClientSSLProperties implements ISSLProperties
-{
-	private boolean _enableSSL = false;
-	private boolean _disableServerSSL = false;
-	private String _daemonKeyStorePath;
-	private String _daemonKeyStorePassword;
-	
-	private String _serverKeyStorePath;
-	private String _serverKeyStorePassword;
-	
-	public ClientSSLProperties(boolean enableSSL, 
-							String daemonKeystore, String daemonPassword,
-								String serverKeystore, String serverPassword)
-	{
-		_enableSSL = enableSSL;
-		_daemonKeyStorePath = daemonKeystore;
-		_daemonKeyStorePassword = daemonPassword;
-		_serverKeyStorePath = serverKeystore;
-		_serverKeyStorePassword = serverPassword;
-	}
-	
-	public ClientSSLProperties(boolean enableSSL, boolean disableServerSSL,
-			String daemonKeystore, String daemonPassword,
-				String serverKeystore, String serverPassword)
-	{
-		_enableSSL = enableSSL;
-		_disableServerSSL = disableServerSSL;
-		_daemonKeyStorePath = daemonKeystore;
-		_daemonKeyStorePassword = daemonPassword;
-		_serverKeyStorePath = serverKeystore;
-		_serverKeyStorePassword = serverPassword;
-	}
-	
-	public ClientSSLProperties(boolean enableSSL, String keystore, String password)
-	{
-		_enableSSL = enableSSL;
-		_daemonKeyStorePath = keystore;
-		_daemonKeyStorePassword = password;
-
-		_serverKeyStorePath = keystore;
-		_serverKeyStorePassword = password;
-	}
-	
-	public ClientSSLProperties(boolean enableSSL, boolean disableServerSSL, String keystore, String password)
-	{
-		_enableSSL = enableSSL;
-		_disableServerSSL = disableServerSSL;
-		_daemonKeyStorePath = keystore;
-		_daemonKeyStorePassword = password;
-
-		_serverKeyStorePath = keystore;
-		_serverKeyStorePassword = password;
-	}
-	
-	
-	public boolean usingSSL()
-	{
-		return _enableSSL;
-	}
-	
-	public boolean usingServerSSL()
-	{
-		return !_disableServerSSL;
-	}
-
-
-	public String getDaemonKeyStorePassword()
-	{
-		return _daemonKeyStorePassword;
-	}
-
-	public String getDaemonKeyStorePath()
-	{
-		return _daemonKeyStorePath;
-	}
-
-	public String getServerKeyStorePassword()
-	{
-		return _serverKeyStorePassword;
-	}
-
-	public String getServerKeyStorePath()
-	{
-		return _serverKeyStorePath;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientUpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientUpdateHandler.java
deleted file mode 100644
index c873c442c..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/client/ClientUpdateHandler.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.client;
-
-import java.io.File;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.UpdateHandler;
-import org.eclipse.dstore.extra.DomainEvent;
-import org.eclipse.dstore.extra.IDomainNotifier;
-
-/**
- * The ClientUpdateHandler is contains a queue of data update requests
- * and periodically sends out domain notifications to domain listeners
- */
-public class ClientUpdateHandler extends UpdateHandler
-{
-	
-	/**
-	 * Constructor
-	 */
-	public ClientUpdateHandler()
-	{
-		super();
-		_waitIncrement = 200;
-	}
-
-	/**
-	 * Not applicable - this is only applicable on the server side
-	 */
-	public void updateFile(String path, byte[] bytes, int size, boolean binary)
-	{
-	}
-
-	/**
-	 * Not applicable - this is only applicable on the server side
-	 */
-	public void updateAppendFile(String path, byte[] bytes, int size, boolean binary)
-	{
-	}
-
-	/**
-	 * Not applicable - this is only applicable on the server side
-	 */
-	public void updateFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-	}
-
-	/**
-	 * Not applicable - this is only applicable on the server side
-	 */
-	public void updateAppendFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-	}
-	
-	/**
-	 * Notifies domain listeners that a file has been updated
-	 * @param file the updated file
-	 * @param object the element associated with the updated file
-	 */	
-	public void updateFile(File file, DataElement object)
-	{
-		IDomainNotifier notifier = _dataStore.getDomainNotifier();
-		notifier.fireDomainChanged(new DomainEvent(DomainEvent.FILE_CHANGE, object, DE.P_NESTED));
-	}
-
-	/**
-	 * Periodically called to notify domain listeners of updated data from the
-	 * server
-	 */
-	public void sendUpdates()
-	{
-		if (_dataStore != null && !isFinished())
-		{
-			while (_dataObjects.size() > 0)
-			{
-				DataElement object = null;
-				synchronized (_dataObjects)
-				{
-					if (_dataObjects.size() > 0)
-					{
-						object = (DataElement) _dataObjects.get(0);
-						_dataObjects.remove(object);
-					}
-				}
-
-				if ((object != null))
-				{
-					
-					if (!object.isUpdated() && !object.isDescriptor())
-					{
-
-						//DataElement parent = object.getParent();
-						//System.out.println("notifying "+parent);
-						notify(object);				
-					}
-					clean(object);
-				}
-			}
-		}
-	}
-
-	private void notify(DataElement object)
-	{	
-		if (object.isExpanded())
-		{
-			object.setUpdated(true);
-		}
-
-		object.setExpanded(true);
-
-		IDomainNotifier notifier = _dataStore.getDomainNotifier();
-
-		if (object.getNestedSize() == 0)
-		{
-			notifier.fireDomainChanged(new DomainEvent(DomainEvent.NON_STRUCTURE_CHANGE, object, DE.P_NESTED));
-
-		}
-		else
-		{
-			notifier.fireDomainChanged(new DomainEvent(DomainEvent.INSERT, object, DE.P_NESTED));
-		}
-	}
-	
-	/**
-	 * Implemented to provide the means by which classes are requested
-	 * across the comm channel. (Only applies to ServerUpdateHandler, so is a dummy method here)
-	 * @param className the name of the class to request
-	 */
-	public void requestClass(String className)
-	{
-	}
-
-	/**
-	 * Impleted to provide the means by which a class on the host is updated on the client
-	 * @param runnable
-	 * @param deserializebyteStreamHandlerId
-	 */
-	public synchronized void updateClassInstance(IRemoteClassInstance runnable, String deserializebyteStreamHandlerId)
-	{
-		notifyInput();
-	}
-
-	/**
-	 * Does not apply in this case. Use ClientCommandHandler.sendClass().
-	 */
-	public void sendClass(String className, String classByteStreamHandlerId) 
-	{		
-	}
-
-	/**
-	 * Does not apply in this case. Use ClientCommandHandler.sendClass().
-	 */
-	public void sendClass(String className) 
-	{
-	}
-
-	/**
-	 * Does not apply in this case. Use ClientCommandHandler.sendKeepAliveRequest().
-	 */
-	public void sendKeepAliveRequest() 
-	{
-	}
-
-	/**
-	 * Does not apply in this case. Use ClientCommandHandler.sendKeepAliveConfirmation().
-	 */
-	public void sendKeepAliveConfirmation() 
-	{
-	}
-
-	
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/DefaultByteConverter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/DefaultByteConverter.java
deleted file mode 100644
index 2b56aa9ea..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/DefaultByteConverter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.model;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.IByteConverter;
-
-/**
- * @author dmcknigh
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class DefaultByteConverter implements IByteConverter
-{	
-	private String _clientEncoding = DE.ENCODING_UTF_8;
-	private String _hostEncoding = System.getProperty("file.encoding"); //$NON-NLS-1$
-	public void setContext(File file)
-	{
-	}
-	
-	public void setHostEncoding(String hostEncoding)
-	{
-		_hostEncoding = hostEncoding;
-	}
-	
-	public void setClientEncoding(String clientEncoding)
-	{
-		_clientEncoding = clientEncoding;
-	}
-	
-	public byte[] convertHostBytesToClientBytes(byte[] buffer, int offset, int length)
-	{
-		byte[] convertedBytes =null;
-		try
-		{
-			convertedBytes = (new String(buffer, offset, length, _hostEncoding)).getBytes(_clientEncoding);
-		}
-		catch (UnsupportedEncodingException e)
-		{
-			try
-			{
-				convertedBytes = (new String(buffer, offset, length)).getBytes(_clientEncoding);
-			}
-			catch (UnsupportedEncodingException e2)
-			{
-				return buffer;
-			}
-		}
-		
-		return convertedBytes;
-	}
-	
-	public byte[] convertClientBytesToHostBytes(byte[] buffer, int offset, int length)
-	{
-		byte[] convertedBytes = null;
-		
-			try
-		{
-			convertedBytes = (new String(buffer, offset, length, _clientEncoding)).getBytes(_hostEncoding);
-		}
-		catch (UnsupportedEncodingException e)
-		{
-			try
-			{
-				convertedBytes = (new String(buffer, offset, length)).getBytes(_hostEncoding);
-			}
-			catch (UnsupportedEncodingException e2)
-			{
-				return buffer;
-			}
-		}
-		
-		return convertedBytes;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/SchemaRegistry.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/SchemaRegistry.java
deleted file mode 100644
index 73375a26e..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/model/SchemaRegistry.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.model;
-
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.IExternalLoader;
-import org.eclipse.dstore.core.model.ISchemaExtender;
-import org.eclipse.dstore.core.model.ISchemaRegistry;
-
-/**
- * SchemaRegistry implements the interface for external tools to contribute their
- * schemas to the DataStore. 
- */
-public class SchemaRegistry implements ISchemaRegistry
-{
-
-
-	private ArrayList _initializedDataStores = new ArrayList();
-	private ArrayList _extenders = new ArrayList();
-
-	/**
-	 * Registers a schema extender with the associated DataStores
-	 * @param extender the schema extender to register
-	 */
-	public void registerSchemaExtender(ISchemaExtender extender)
-	{
-		if (!_extenders.contains(extender))
-		{
-			_extenders.add(extender);
-			for (int i = 0; i < _initializedDataStores.size(); i++)
-			{
-				DataStore dataStore = (DataStore) _initializedDataStores.get(i);
-				DataElement schemaRoot = dataStore.getDescriptorRoot();
-				extender.extendSchema(schemaRoot);
-			}
-		}
-	}
-
-	/**
-	 * Calls extendSchema() on each of the registered schema extenders to
-	 * extend the schema of the specified DataStore
-	 * 
-	 * @param dataStore the DataStore whos schema will be updated
-	 */
-	public void extendSchema(DataStore dataStore)
-	{
-		if (!_initializedDataStores.contains(dataStore))
-		{
-			DataElement schemaRoot = dataStore.getDescriptorRoot();
-			for (int i = 0; i < _extenders.size(); i++)
-			{
-				ISchemaExtender extender = (ISchemaExtender) _extenders.get(i);
-				extender.extendSchema(schemaRoot);
-			}
-			_initializedDataStores.add(dataStore);
-		}
-	}
-
-	/**
-	 * Gets the <code>ExternalLoader</code> for the specified qualified classname
-	 * 
-	 * @param source the qualified classname
-	 * @return the external loader for the specified classname
-	 */
-	public IExternalLoader getLoaderFor(String source)
-	{
-		for (int i = 0; i < _extenders.size(); i++)
-		{
-			ISchemaExtender extender = (ISchemaExtender) _extenders.get(i);
-			IExternalLoader loader = extender.getExternalLoader();
-			if (loader.canLoad(source))
-			{
-				return loader;
-			}
-		}
-		return null;
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java
deleted file mode 100644
index eb5c3663d..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [244388] [dstore] Connection hangs when a miner not installed
- * David McKnight   (IBM) - [367264] [dstore] Trace should be written when load miner is failed.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.server;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.java.RemoteClassLoader;
-import org.eclipse.dstore.core.miners.Miner;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreAttributes;
-import org.eclipse.dstore.core.model.IExternalLoader;
-import org.eclipse.dstore.core.model.ISchemaExtender;
-import org.eclipse.dstore.core.model.ISchemaRegistry;
-import org.eclipse.dstore.internal.core.util.ExternalLoader;
-
-/**
- * MinerLoader is an implementation of <code>ISchemaRegistry</code> used for
- * loading and initializing miners. 
- */
-public class MinerLoader implements ISchemaRegistry
-{
-
-
-	private DataStore _dataStore;
-	private ArrayList _miners;
-	private ArrayList _minerList;
-	private ArrayList _minerFileList;
-	private ArrayList _connectedList;
-	private ArrayList _loaders;
-	private RemoteClassLoader _remoteLoader;
-	private ExternalLoader _externalRemoteLoader;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param dataStore the associated DataStore
-	 * @param loaders the list of <code>ExternalLoader</code>s used be the miner loader
-	 */
-	public MinerLoader(DataStore dataStore, ArrayList loaders)
-	{
-		_dataStore = dataStore;
-		_loaders = loaders;
-		_miners = new ArrayList();
-		_minerList = new ArrayList();
-		_minerFileList = new ArrayList();
-		_connectedList = new ArrayList();
-	}
-
-	/**
-	 * Loads all miners that are specified in the default <i>minerFile.dat</i> as
-	 * well as any others indicated by <code>DataStore.getMinersLocation</code> that
-	 * have not yet been loaded.
-	 */
-	public void loadMiners()
-	{
-		// load the miners
-		String pluginDir = _dataStore.getAttribute(DataStoreAttributes.A_PLUGIN_PATH);
-
-		// default location
-		String defaultMinerFile = pluginDir + File.separator + "minerFile.dat"; //$NON-NLS-1$
-		File defaultMF = new File(defaultMinerFile);
-		if (defaultMF.exists())
-		{
-			try
-			{
-				loadMiners(defaultMinerFile, DE.ENCODING_UTF_8);
-			}
-			catch (Exception e)
-			{
-				_dataStore.trace("failed to load minerFile.data with UTF-8.  Trying with native encoding"); //$NON-NLS-1$
-
-				try
-				{
-					loadMiners(defaultMinerFile, null);
-				}
-				catch (Exception ex)
-				{
-					_dataStore.trace(ex);
-				}				
-			}
-			_minerFileList.add(defaultMinerFile);
-		}
-
-		ArrayList minerLocations = _dataStore.getMinersLocation();
-
-		for (int i = 0; i < minerLocations.size(); i++)
-		{
-			String minersDir = (String) minerLocations.get(i);
-			String minerFile = null;
-			if (minersDir.endsWith(".dat")) //$NON-NLS-1$
-			{
-				minerFile = pluginDir + File.separator + minersDir;
-			}
-			else
-			{
-				minerFile = pluginDir + File.separator + minersDir + File.separator + "minerFile.dat"; //$NON-NLS-1$
-			}
-			//_dataStore.trace("load miners for " + minerFile);
-			if (!_minerFileList.contains(minerFile))
-			{
-				try
-				{
-					loadMiners(minerFile, DE.ENCODING_UTF_8);
-				}
-				catch (Exception e)
-				{
-					_dataStore.trace("failed to load minerFile.data with UTF-8.  Trying with native encoding"); //$NON-NLS-1$
-					try
-					{
-						loadMiners(minerFile, null);
-					}
-					catch (Exception ex)
-					{
-						_dataStore.trace(ex);
-					}
-				}
-				_minerFileList.add(minerFile);
-			}
-		}
-	}
-
-	/**
-	 * Loads that miners specified in a particular miner configuration file (i.e. <i>minerFile.dat</i>)
-	 * @param minerFile a file specifying a list of miners
-	 * @return a list of the loaded miners
-	 */
-	public ArrayList loadMiners(String minerFile, String encoding) throws Exception
-	{
-		// load the miners
-		ArrayList unconnectedMiners = new ArrayList();
-		File file = new File(minerFile);
-
-		FileInputStream inFile = new FileInputStream(file);
-		BufferedReader in = null;
-		if (encoding == null)
-		{
-			in = new BufferedReader(new InputStreamReader(inFile));
-		}
-		else
-		{
-			in = new BufferedReader(new InputStreamReader(inFile, encoding));
-		}
-
-		String name = null;
-		while ((name = in.readLine()) != null)
-		{
-			// check name
-			name = name.trim();
-
-			if (!name.startsWith("#") && (name.length() > 5)) //$NON-NLS-1$
-			{
-				Miner miner = loadMiner(name);
-				if (miner != null)
-				{
-					unconnectedMiners.add(miner);
-				}				
-			}
-		}
-
-		connectMiners(unconnectedMiners);
-		return _miners;
-	}
-	
-	
-	
-	public Miner loadMiner(String name)
-	{
-		Miner miner = null;
-		if (!_minerList.contains(name))
-		{
-			// only load new miners 
-			try
-			{
-				IExternalLoader loader = getLoaderFor(name);
-				if (loader != null)
-				{
-					// try to load and instantiate the miner
-					// the RemoteClassLoader will kick off a synchronous
-					// request to the client for any classes that cannot be found
-					// on the host.
-					Class theClass = loader.loadClass(name);
-					miner = (Miner) theClass.newInstance();
-					if (miner != null)
-					{
-						miner.setExternalLoader(loader);
-						_minerList.add(name);
-					}
-					else {
-						System.out.println("miner is null"); //$NON-NLS-1$
-					}
-				}
-			}
-			catch (NoClassDefFoundError e)
-			{
-				_dataStore.trace(e);
-				handleNoClassFound(e.getMessage().replace('/','.'));
-			}
-			catch (ClassNotFoundException e)
-			{
-				_dataStore.trace(e);
-				handleNoClassFound(name);
-			}					
-			catch (InstantiationException e)
-			{
-				_dataStore.trace(e);
-			}
-			catch (IllegalAccessException e)
-			{
-				_dataStore.trace(e);
-			}
-			catch (Exception e)
-			{
-				_dataStore.trace(e);
-			}
-		}
-		else
-		{
-		}
-		return miner;
-	}
-	
-	private void handleNoClassFound(String name)
-	{
-		if (_remoteLoader != null){
-			_remoteLoader.loadClassInThread(name);			
-		}
-	}
-
-	private void connectMiners(ArrayList unconnectedMiners)
-	{
-		// init list
-		for (int i = 0; i < _miners.size(); i++)
-		{
-			_connectedList.add(((Miner) _miners.get(i)).getMinerName());
-		}
-
-		while (unconnectedMiners.size() > 0)
-		{
-			Miner miner = (Miner) unconnectedMiners.get(0);
-			unconnectedMiners.remove(miner);
-			if (connectMiner(miner))
-			{
-				_dataStore.trace("connected " + miner.getMinerName()); //$NON-NLS-1$
-			}
-			else
-			{
-				unconnectedMiners.add(miner);
-			}
-		}
-
-	}
-
-	public boolean connectMiner(Miner miner)
-	{
-		boolean canConnect = true;
-		ArrayList dependencies = miner.getMinerDependencies();
-		for (int i = 0; i < dependencies.size(); i++)
-		{
-			String dependency = (String) dependencies.get(i);
-			if (!_connectedList.contains(dependency))
-			{
-				canConnect = false;
-			}
-		}
-
-		if (canConnect)
-		{
-			// set the datastore for the miner 
-			miner.setDataStore(_dataStore);
-			miner.extendSchema(_dataStore.getDescriptorRoot());
-			_dataStore.refresh(_dataStore.getDescriptorRoot());
-			_miners.add(miner);
-			_connectedList.add(miner.getMinerName());
-			miner.start();
-		}
-		return canConnect;
-	}
-
-	/**
-	 * Currently not used for the miner loader
-	 */
-	public void registerSchemaExtender(ISchemaExtender extender)
-	{
-	}
-
-	/**
-	 * Calls <code>extendSchema</code> on each of the loaded miners
-	 * 
-	 * @param dataStore the DataStore containing the base schema to extend
-	 */
-	public void extendSchema(DataStore dataStore)
-	{
-		DataElement schemaRoot = dataStore.getDescriptorRoot();
-		for (int i = 0; i < _miners.size(); i++)
-		{
-			Miner miner = (Miner) _miners.get(i);
-			miner.extendSchema(schemaRoot);
-		}
-		
-	}
-	
-	public ExternalLoader getExternalRemoteLoader()
-	{
-		if (_externalRemoteLoader == null)
-		{
-			_externalRemoteLoader = new ExternalLoader(getRemoteLoader(), "*"); //$NON-NLS-1$
-		}
-		return _externalRemoteLoader;
-	}
-	
-	public RemoteClassLoader getRemoteLoader()
-	{ 
-		return _dataStore.getRemoteClassLoader();
-	}
-
-	/**
-	 * Returns the <code>ExternalLoader</code> for a particular
-	 * class.
-	 * 
-	 * @param source a qualified classname
-	 * @return the loader for the specified class
-	 */
-	public IExternalLoader getLoaderFor(String source)
-	{
-		ExternalLoader remoteLoader = getExternalRemoteLoader();
-		
-		// for now we always return the RemoteClassLoader
-		
-		//if (remoteLoader.canLoad(source))
-		if(true)
-		{
-			return remoteLoader;
-		}
-		
-		for (int i = 0; i < _loaders.size(); i++)
-		{
-			ExternalLoader loader = (ExternalLoader) _loaders.get(i);
-			if (loader.canLoad(source))
-			{
-				return loader;
-			}
-			else
-			{
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Returns the loaded miners
-	 * 
-	 * @return the loaded miners
-	 */
-	public ArrayList getMiners()
-	{
-		return _miners;
-	}
-
-	/**
-	 * Returns the miner indicated with the specified name
-	 * 
-	 * @param name the qualified classname of the miner
-	 * @return the miner
-	 */
-	public Miner getMiner(String name)
-	{
-		for (int i = 0; i < _miners.size(); i++)
-		{
-			Miner miner = (Miner) _miners.get(i);
-			if (miner.getClass().getName().equals(name))
-			{
-				return miner;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Terminates the specified miner
-	 * 
-	 * @param name the qualified classname of the miner to terminate
-	 */
-	public void finishMiner(String name)
-	{
-		Miner miner = getMiner(name);
-		miner.finish();
-		_miners.remove(miner);
-	}
-
-	/**
-	 * Terminate all the miners
-	 */
-	public void finishMiners()
-	{
-		for (int i = 0; i < _miners.size(); i++)
-		{
-			Miner miner = (Miner) _miners.get(i);
-			miner.finish();
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java
deleted file mode 100644
index 6b0fa84fe..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerAttributes.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.server;
-
-import java.io.File;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.eclipse.dstore.core.model.DataStoreAttributes;
-
-/**
- * This class is used to store attributes that are required
- * for configurating a remote connection.
- */
-public class ServerAttributes extends DataStoreAttributes
-{
-
-	/**
-	 * Constructor
-	 */
-	public ServerAttributes()
-	{
-		super();
-
-		try
-		{
-			String pluginPath = System.getProperty("A_PLUGIN_PATH"); //$NON-NLS-1$
-			if (pluginPath != null) pluginPath = pluginPath.trim();
-			if ((pluginPath != null) && (pluginPath.length() > 0))
-			{
-			    File f = new File(pluginPath);
-			    try 
-			    {
-			        pluginPath = f.getCanonicalPath();
-			    }
-			    catch (Exception e)
-			    {
-			        pluginPath = f.getAbsolutePath();
-			    }
-			    
-				setAttribute(A_PLUGIN_PATH, pluginPath + File.separator);
-			}
-			else
-			{
-				setAttribute(A_PLUGIN_PATH, "/home/"); //$NON-NLS-1$
-			}
-
-			setAttribute(A_LOCAL_NAME, InetAddress.getLocalHost().getHostName());
-
-			setAttribute(A_HOST_NAME, "server_host"); //$NON-NLS-1$
-			setAttribute(A_HOST_PATH, "/home/"); //$NON-NLS-1$
-		}
-		catch (UnknownHostException e)
-		{
-		}
-
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java
deleted file mode 100644
index 34b100ab7..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java
+++ /dev/null
@@ -1,590 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- *  David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
- *  David McKnight   (IBM) - [244388] [dstore] Connection hangs when a miner not installed
- *  David McKnight   (IBM) - [278341] [dstore] Disconnect on idle causes the client hang
- *  Noriaki Takatsu  (IBM) - [283656] [dstore][multithread] Serviceability issue
- *  David McKnight   (IBM) - [294933] [dstore] RSE goes into loop
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.server;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.miners.Miner;
-import org.eclipse.dstore.core.model.CommandHandler;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreAttributes;
-import org.eclipse.dstore.core.model.DataStoreResources;
-import org.eclipse.dstore.core.model.DataStoreSchema;
-import org.eclipse.dstore.core.model.IDataStoreConstants;
-import org.eclipse.dstore.core.server.SystemServiceManager;
-
-/**
- * The ServerCommandHandler is reponsible for maintaining
- * a queue of commands and periodically routing commands
- * from the queue to the appropriate miners.
- */
-public class ServerCommandHandler extends CommandHandler
-{
-	public class ServerIdleThread extends Thread
-	{
-		private long _timeout;
-		private boolean _serverTimedOut = false;
-		
-		public ServerIdleThread(long timeout)
-		{
-			_timeout = timeout;			
-		}
-		
-		public void run()
-		{	
-			while (!_serverTimedOut)
-			{
-				waitForTimeout();
-			}
-			if (_serverTimedOut)
-			{
-				_dataStore.getCommandHandler().finish();
-				_dataStore.getUpdateHandler().finish();
-				_dataStore.finish();
-				System.out.println(ServerReturnCodes.RC_FINISHED);
-				if (_dataStore.getClient() != null) {
-					_dataStore.getClient().getLogger().logInfo(this.getClass().toString(), "Server timeout");
-				}
-				
-				// only exit if there's no service manager
-				if (SystemServiceManager.getInstance().getSystemService() == null){
-					System.exit(0);
-				}
-				else {
-					_dataStore.getClient().disconnectServerReceiver();
-				}
-			}
-		}
-		
-		protected synchronized void waitForTimeout()
-		{
-			try
-			{
-				wait(_timeout);
-			}
-			catch (InterruptedException e)
-			{
-				// whenver a new command comes through we interrupt this
-				// if we do timeout then it's time to shutdown the server
-				return;
-			}
-			_serverTimedOut = true;
-		}
-		
-	}
-
-
-	private ArrayList _loaders;
-	private MinerLoader _minerLoader;
-	private ServerIdleThread _serverIdleThread;
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param loaders a list of <code>ExternalLoader</code>s used for loading miners
-	 */
-	public ServerCommandHandler(ArrayList loaders)
-	{
-		super();
-		_loaders = loaders;
-	}
-
-	/**
-	 * Sets the associated DataStore
-	 * 
-	 * @param dataStore the associated DataStore
-	 */
-	public void setDataStore(DataStore dataStore)
-	{
-		super.setDataStore(dataStore);
-	}
-
-	/**
-	 * Loads the miners
-	 */
-	public void loadMiners()
-	{
-		if (_dataStore != null)
-		{
-			if (_minerLoader == null)
-			{
-				_minerLoader = new MinerLoader(_dataStore, _loaders);
-			}
-			// load the miners
-			_minerLoader.loadMiners();
-
-		}
-	}
-	
-	public Miner loadMiner(String minerId)
-	{
-	
-		if (_dataStore != null)
-		{
-			if (_minerLoader == null)
-			{
-				_minerLoader = new MinerLoader(_dataStore, _loaders);
-			}
-			
-			_dataStore.trace("loading "+minerId); //$NON-NLS-1$
-			// load and connect the miner
-			Miner miner = _minerLoader.loadMiner(minerId);
-			if (miner != null)
-			{
-				_minerLoader.connectMiner(miner);
-			}
-			return miner;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the list of loaded miners
-	 * 
-	 * @return the list of miners
-	 */
-	public ArrayList getMiners()
-	{
-		return _minerLoader.getMiners();
-	}
-
-	/**
-	 * Returns the specified miner
-	 * 
-	 * @param name the qualified classname of the miner to return
-	 * @return the miner
-	 */
-	public Miner getMiner(String name)
-	{
-		return _minerLoader.getMiner(name);
-	}
-
-	/**
-	 * Terminates a specified miner
-	 * 
-	 * @param name the qualified classname of the miner to terminate
-	 */
-	public void finishMiner(String name)
-	{
-		_minerLoader.finishMiner(name);
-	}
-
-	/**
-	 * Called when the DataStore session is finished or when there is
-	 * an unexpected error.
-	 */
-	public void finish()
-	{
-		if (_minerLoader != null)
-			_minerLoader.finishMiners();
-		super.finish();
-	}
-
-	private void clearDeleted(DataElement element, int depth)
-	{
-		if (depth > 0 && element != null)
-		{
-			for (int i = 0; i < element.getNestedSize(); i++)
-			{
-				DataElement child = element.get(i);
-				if (child != null)
-				{
-					if (child.isReference())
-						child = child.dereference();
-					
-					
-					if (child != null)
-					{
-						if (child.isDeleted())
-						{
-							element.removeNestedData(child);
-						}
-						else
-						{
-							clearDeleted(child, depth - 1);
-						}
-					}
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Called periodically to route the current queue of commands to the appropriate miners
-	 */
-	public void sendCommands()
-	{
-		// send commands to the appropriate miners
-		while (_commands.size() > 0)
-		{
-			DataElement command = null;
-
-			synchronized (_commands)
-			{
-				command = (DataElement) _commands.get(0);
-				clearDeleted(command, 2);
-				_commands.remove(command);
-			}
-
-			//DKM-status is always last
-			DataElement status = command.get(command.getNestedSize() - 1);
-			    //_dataStore.find(command, DE.A_TYPE,DataStoreResources.model_status"), 1);
-
-			String commandSource = command.getSource();
-			String commandName = command.getName();
-			_dataStore.trace(commandName);
-
-			if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET))
-			{
-				DataElement serverTicket = _dataStore.getTicket();
-				DataElement clientTicket = command.get(0);
-				String st = serverTicket.getName();
-				String ct = clientTicket.getName();
-
-				if (st == null || (ct != null && ct.equals(st)))
-				{
-					serverTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_valid);
-					clientTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_valid);
-
-					DataElement host = _dataStore.getHostRoot();
-					HashMap map = _dataStore.getHashMap();					
-					synchronized (map){
-						map.remove(host.getId());
-					}
-					host.setAttribute(DE.A_ID, "host." + serverTicket.getName()); //$NON-NLS-1$
-
-					synchronized (map){
-						map.put(host.getId(), host);
-					}
-					_dataStore.update(host);
-				}
-				else
-				{
-					serverTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_invalid);
-					clientTicket.setAttribute(DE.A_VALUE,DataStoreResources.model_invalid);
-				}
-				_dataStore.update(clientTicket);
-				_dataStore.startDataElementRemoverThread();
-				status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(DataStoreSchema.C_SET))
-			{
-				//DataElement dataObject = command.get(0);
-				status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(DataStoreSchema.C_MODIFY))
-			{
-				DataElement dataObject = command.get(0);
-				DataElement original = _dataStore.find(dataObject.getId());
-				original.setAttributes(dataObject.getAttributes());
-				status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(DataStoreSchema.C_SET_HOST))
-			{
-				DataElement dataObject = command.get(0);
-
-				DataElement original = _dataStore.getHostRoot();
-				original.setAttributes(dataObject.getAttributes());
-
-				_dataStore.setAttribute(DataStoreAttributes.A_LOCAL_PATH, dataObject.getSource());
-				_dataStore.setAttribute(DataStoreAttributes.A_HOST_PATH, dataObject.getSource());
-				status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(DataStoreSchema.C_ADD_MINERS))
-			{
-				DataElement location = command.get(1);
-				_dataStore.addMinersLocation(location);
-				status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(DataStoreSchema.C_ACTIVATE_MINER))
-			{
-				DataElement minerId = command.get(0);
-				String minerName = minerId.getName();
-				Miner miner = loadMiner(minerName);		
-				if (miner != null){
-					miner.initMiner(status);
-				}
-				else { // failed to load miner
-					status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-					status.setAttribute(DE.A_VALUE, DataStoreResources.model_failed);
-				}
-				//System.out.println("finished initing "+miner.getMinerName());
-				//status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(DataStoreSchema.C_SET_PREFERENCE))
-			{
-				DataElement dataObject = command.get(0);
-				String property = dataObject.getName();
-				String value = dataObject.getValue();
-				_dataStore.setPreference(property, value);
-			}
-			else if (commandName.equals(DataStoreSchema.C_QUERY_INSTALL))
-			{
-				// determine where dstore is located
-				status.setAttribute(DE.A_SOURCE, _dataStore.getAttribute(DataStoreAttributes.A_PLUGIN_PATH));
-				status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(DataStoreSchema.C_QUERY_CLIENT_IP))
-			{
-				// determine where dstore is connected to
-				status.setAttribute(DE.A_SOURCE, _dataStore.getRemoteIP());
-				status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(DataStoreSchema.C_QUERY_JVM))
-			{
-				// get jvm stats
-				// check memory consuption
-				// if we're running low, try to free some
-				Runtime runtime = Runtime.getRuntime();
-				runtime.gc();
-				long freeMem = runtime.freeMemory();
-				long totalMem = runtime.totalMemory();
-				long maxMem = runtime.maxMemory();
-			
-			
-				StringBuffer statsBuffer = new StringBuffer();
-				statsBuffer.append(freeMem);
-				statsBuffer.append(',');
-				statsBuffer.append(totalMem);
-				statsBuffer.append(',');
-				statsBuffer.append(maxMem);
-				statsBuffer.append(',');
-				statsBuffer.append(_dataStore.getNumElements());
-				statsBuffer.append(',');
-				
-				// last 7 dataelements created
-				List lastCreated = _dataStore.getLastCreatedElements();
-				for (int i = 0; i < lastCreated.size(); i++)
-				{
-					DataElement element = (DataElement)lastCreated.get(i);
-					statsBuffer.append(element.getName());
-					statsBuffer.append(":"); //$NON-NLS-1$
-					statsBuffer.append("id="+element.getId()); //$NON-NLS-1$
-					statsBuffer.append(";"); //$NON-NLS-1$
-				}
-			
-				
-				status.setAttribute(DE.A_SOURCE, statsBuffer.toString());
-				status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(DataStoreSchema.C_SCHEMA))
-			{
-				loadMiners();
-
-				DataElement schemaRoot = _dataStore.getDescriptorRoot();
-
-				// update all descriptor objects
-				_dataStore.refresh(schemaRoot);
-				status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
-			}
-			else if (commandName.equals(IDataStoreConstants.C_START_SPIRIT))
-			{
-				_dataStore.receiveStartSpiritCommand();
-				status.setAttribute(DE.A_NAME, DataStoreResources.model_done);
-			}
-			else if (_dataStore.validTicket() && _minerLoader != null)
-			{
-				if (status != null)
-				{
-					boolean failure = false;
-					ArrayList miners = _minerLoader.getMiners();
-					for (int j = 0;(j < miners.size()) && !failure; j++)
-					{
-						Miner miner = (Miner) miners.get(j);
-					
-						if (commandSource.equals("*") || commandSource.equals(miner.getClass().getName())) //$NON-NLS-1$
-						{
-							if (_dataStore.isAutoRefreshOn())
-							{
-								_dataStore.enableAutoRefresh(false);
-							}
-							/*
-							status = miner.command(command);
-
-							if ((status != null) && status.getAttribute(DE.A_NAME).equals(DataStoreResources.model_incomplete))
-							{
-								failure = true;
-							}
-							*/
-							miner.requestCommand(command);
-							
-							
-						
-						}
-
-					}
-					if (commandName.equals(DataStoreSchema.C_INIT_MINERS))
-					{
-						// old way was to submit this command for all miners at once
-						// now we wait til activateMiner call is made per each miner
-						// for backward compatibility, we still call init miners
-						// so we need to make sure, in cases were miners are loaded dynamically,
-						// that we set this to done if there's no miners to init
-						status.setAttribute(DE.A_NAME, DataStoreResources.model_done);
-					}
-				}
-
-			}
-
-			_dataStore.refresh(status);
-
-		}
-	}
-
-	/**
-	 * Set the contents of a file with the specified file
-	 * @param fileName the name of the target file
-	 * @param file the source file 
-	 */
-	public void sendFile(String fileName, File file)
-	{
-		//_dataStore.saveFile(fileName, file);
-	}
-
-	/**
-	 * Sets the contents of a file with bytes sent from the client
-	 * @param fileName the name of the file to append to
-	 * @param bytes the bytes of a file to insert
-	 * @param size the number of bytes to insert
-	 * @param binary indicates whether to insert the bytes as binary or unicode
-	 */
-	public void sendFile(String fileName, byte[] bytes, int size, boolean binary)
-	{
-		sendFile(fileName, bytes, size, binary, "default"); //$NON-NLS-1$
-	}
-	
-/**
-	 * Sets the contents of a file with bytes sent from the client
-	 * @param fileName the name of the file to append to
-	 * @param bytes the bytes of a file to insert
-	 * @param size the number of bytes to insert
-	 * @param binary indicates whether to insert the bytes as binary or unicode
-	 * @param byteStreamHandlerId indicates which byte stream handler should receive the bytes
-	 */
-	public void sendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		_dataStore.saveFile(fileName, bytes, size, binary, byteStreamHandlerId);
-	}
-
-	/**
-	 * Appends bytes sent from the client to a file
-	 * @param fileName the name of the file to append to
-	 * @param bytes the bytes of a file to append
-	 * @param size the number of bytes to append
-	 * @param binary indicates whether to append the bytes as binary or unicode
-	 */
-	public void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary)
-	{
-		sendAppendFile(fileName, bytes, size, binary, "default"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Appends bytes sent from the client to a file
-	 * @param fileName the name of the file to append to
-	 * @param bytes the bytes of a file to append
-	 * @param size the number of bytes to append
-	 * @param binary indicates whether to append the bytes as binary or unicode
-	 * @param byteStreamHandlerId indicates which byte stream handler should receive the bytes
-	 */
-	public void sendAppendFile(String fileName, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		_dataStore.appendToFile(fileName, bytes, size, binary);
-	}
-
-	/**
-	 * Implemented to provide the means by which classes are requested and sent
-	 * across the comm channel.
-	 * @param className the name of the class to request
-	 */
-	public synchronized void sendClass(String className)
-	{
-		sendClass(className, "default"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Implemented to provide the means by which classes are requested and sent
-	 * across the comm channel.
-	 * @param className the name of the class to request
-	 */
-	public synchronized void sendClass(String className, String classByteStreamHandlerId)
-	{
-		//_dataStore.sendClass(className, classByteStreamHandlerId);
-	}
-
-	public void sendClassInstance(IRemoteClassInstance runnable, String classByteStreamHandlerId) 
-	{
-		notifyInput();
-	}
-
-	/**
-	 * Does not apply to server. Use ServerUpdateHandler.requestClass().
-	 */
-	public void requestClass(String className) 
-	{
-	}
-	
-	/**
-	 * Does not apply to server. Use ServerUpdateHandler.sendKeepAliveConfirmation().
-	 */
-	public void sendKeepAliveConfirmation() 
-	{
-	}
-	
-	/**
-	 * Does not apply to server. Use ServerUpdateHandler.sendKeepAliveRequest().
-	 */
-	public void sendKeepAliveRequest() 
-	{
-	}
-	
-
-	/**
-	 * Overridden so that ServerIdleThread knows when new commands are received
-	 */
-	public void addCommand(DataElement command, boolean immediate)
-	{
-		super.addCommand(command, immediate);
-		
-		int serverIdleShutdownTimeout = _dataStore.getServerIdleShutdownTimeout();
-		if (serverIdleShutdownTimeout > 0)
-		{
-			if (_serverIdleThread != null)
-			{
-				// new command so restart timeout
-				_serverIdleThread.interrupt();
-			}
-			else
-			{
-				_serverIdleThread = new ServerIdleThread(serverIdleShutdownTimeout);
-				_serverIdleThread.start();
-			}
-		}		
-	}
-	
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReturnCodes.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReturnCodes.java
deleted file mode 100644
index 3b9ceaccf..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerReturnCodes.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.server;
-
-/**
- * This class contains a list of server return codes that are used
- * to negociate server communication with a client
- */
-public class ServerReturnCodes
-{
-	public static final String RC_DSTORE_SERVER_MAGIC = "DStore Server Starting..."; //$NON-NLS-1$
-
-	public static final String RC_SUCCESS = "Server Started Successfully"; //$NON-NLS-1$
-
-	public static final String RC_UNKNOWN_HOST_ERROR = "Unknown host error"; //$NON-NLS-1$
-	public static final String RC_BIND_ERROR = "Error binding socket"; //$NON-NLS-1$
-	public static final String RC_GENERAL_IO_ERROR = "General IO error creating socket"; //$NON-NLS-1$
-	public static final String RC_CONNECTION_ERROR = "Connection error"; //$NON-NLS-1$
-
-	public static final String RC_SECURITY_ERROR = "Security error creating socket"; //$NON-NLS-1$
-
-	public static final String RC_FINISHED = "Server Finished"; //$NON-NLS-1$
-	
-	public static final String RC_JRE_VERSION_ERROR = "JRE 1.4 or higher required"; //$NON-NLS-1$
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerSSLProperties.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerSSLProperties.java
deleted file mode 100644
index 0e4089921..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerSSLProperties.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.server;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.dstore.core.model.ISSLProperties;
-
-
-public class ServerSSLProperties implements ISSLProperties
-{
-	private boolean _enableSSL = false;
-	private boolean _disableServerSSL = false;
-	
-	private String _daemonKeyStorePath;
-	private String _daemonKeyStorePassword;
-
-	private String _serverKeyStorePath;
-	private String _serverKeyStorePassword;
-
-	
-	private static final String ENABLE_SSL    = "enable_ssl";	 //$NON-NLS-1$
-	private static final String DISABLE_SERVER_SSL = "disable_server_ssl"; //$NON-NLS-1$
-	
-	private static final String DAEMON_KEYSTORE_FILE = "daemon_keystore_file"; //$NON-NLS-1$
-	private static final String DAEMON_KEYSTORE_PASSWORD = "daemon_keystore_password"; //$NON-NLS-1$
-
-	private static final String SERVER_KEYSTORE_FILE = "server_keystore_file"; //$NON-NLS-1$
-	private static final String SERVER_KEYSTORE_PASSWORD = "server_keystore_password"; //$NON-NLS-1$
-		
-	
-	public ServerSSLProperties() 
-	{
-		try 
-		{ 
-			ResourceBundle properties = ResourceBundle.getBundle("ssl"); //$NON-NLS-1$
-			_enableSSL = properties.getString(ENABLE_SSL).trim().equals("true"); //$NON-NLS-1$
-			if (_enableSSL)
-			{
-				try
-				{
-					_disableServerSSL = properties.getString(DISABLE_SERVER_SSL).trim().equals("true"); //$NON-NLS-1$
-				}
-				catch (Exception e)
-				{
-					
-				}
-				
-				try
-				{
-					_daemonKeyStorePath = properties.getString(DAEMON_KEYSTORE_FILE).trim();
-					_daemonKeyStorePassword = properties.getString(DAEMON_KEYSTORE_PASSWORD).trim();
-				}
-				catch (Exception e)
-				{					
-				}
-				
-				if (!_disableServerSSL)
-				{
-					try
-					{
-						_serverKeyStorePath = properties.getString(SERVER_KEYSTORE_FILE).trim();
-						_serverKeyStorePassword = properties.getString(SERVER_KEYSTORE_PASSWORD).trim();			
-					}
-					catch (Exception e)
-					{
-					}
-				}
-				
-				if (_daemonKeyStorePath == null && _serverKeyStorePath != null)
-				{
-					_daemonKeyStorePath = _serverKeyStorePath;
-					_daemonKeyStorePassword = _serverKeyStorePassword;
-				}
-				if (!_disableServerSSL && _serverKeyStorePath == null && _daemonKeyStorePath != null)
-				{
-					_serverKeyStorePath = _daemonKeyStorePath;
-					_serverKeyStorePassword = _daemonKeyStorePassword;
-				}
-				
-			}
-			
-			if (_enableSSL)
-			{
-				System.out.println("SSL Settings"); //$NON-NLS-1$
-				System.out.println("[daemon keystore:\t"+_daemonKeyStorePath+"]"); //$NON-NLS-1$ //$NON-NLS-2$
-				System.out.println("[daemon keystore pw:\t"+_daemonKeyStorePassword+"]"); //$NON-NLS-1$ //$NON-NLS-2$
-				if (!_disableServerSSL)
-				{
-					System.out.println("[server keystore:\t"+_serverKeyStorePath+"]"); //$NON-NLS-1$ //$NON-NLS-2$
-					System.out.println("[server keystore pw:\t"+_serverKeyStorePassword+"]");					 //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		} 
-		catch (Exception e) 
-		{
-			e.printStackTrace();
-		}
-	}
-	
-	
-	public boolean usingSSL()
-	{
-		return _enableSSL;
-	}
-	
-	public boolean usingServerSSL()
-	{
-		return !_disableServerSSL;
-	}
-	
-	
-	public String getDaemonKeyStorePath()
-	{
-		return _daemonKeyStorePath;
-	}
-	
-	public String getServerKeyStorePath()
-	{
-		return _serverKeyStorePath;
-	}
-	
-	public String getDaemonKeyStorePassword()
-	{
-		return _daemonKeyStorePassword;
-	}
-	
-	public String getServerKeyStorePassword()
-	{
-		return _serverKeyStorePassword;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java
deleted file mode 100644
index 83682c723..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerUpdateHandler.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight  (IBM)   [222168][dstore] Buffer in DataElement is not sent
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * David McKnight  (IBM)   [246826][dstore] KeepAlive does not work correctly
- * David McKnight    (IBM)  - [358301] [DSTORE] Hang during debug source look up
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.server;
-
-import java.net.Socket;
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreResources;
-import org.eclipse.dstore.core.model.UpdateHandler;
-import org.eclipse.dstore.core.util.CommandGenerator;
-import org.eclipse.dstore.internal.core.util.Sender;
-
-/**
- * The ServerUpdateHandler is contains a queue of data update requests
- * and periodically transmits it's queue to the client
- */
-public class ServerUpdateHandler extends UpdateHandler
-{
-
-
-	private ArrayList _senders;
-	private CommandGenerator _commandGenerator;
-	protected DataElement _classDocumentElement;
-	protected DataElement _keepAliveDocumentElement;
-	protected DataElement _confirmKeepAliveDocumentElement;
-	protected DataElement _pendingKeepAliveRequest;
-	protected DataElement _pendingKeepAliveConfirmation;
-	
-	private static String[] _keepAliveAttributes =  {
-			DataStoreResources.KEEPALIVE_TYPE, 
-			"server.keepalive.root.id", //$NON-NLS-1$
-			"server.keepalive", //$NON-NLS-1$
-			"doc", //$NON-NLS-1$
-			"", //$NON-NLS-1$
-			"", //$NON-NLS-1$
-			DataStoreResources.FALSE,
-			"2"}; //$NON-NLS-1$
-	
-	private static String[] _confirmKeepAliveAttributes =  {
-		DataStoreResources.KEEPALIVECONFIRM_TYPE, 
-		"server.keepalive.confirm.root.id", //$NON-NLS-1$
-		"server.confirmkeepalive", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _docAttributes =  { 
-		DataStoreResources.DOCUMENT_TYPE, 
-		"server.doc.root.id", //$NON-NLS-1$
-		"server.document", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _fileAttributes =  {
-		DataStoreResources.FILE_TYPE, 
-		"server.file.root.id", //$NON-NLS-1$
-		"server.file", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _classAttributes =  {
-		DataStoreResources.CLASS_TYPE, 
-		"server.class.root.id", //$NON-NLS-1$
-		"server.class", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _requestClassAttributes =  {
-		DataStoreResources.REQUEST_CLASS_TYPE, 
-		"server.requestclass.root.id", //$NON-NLS-1$
-		"server.requestclass", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	private static String[] _serializeAttributes =  {
-		DataStoreResources.SERIALIZED_TYPE, 
-		"server.serialized.root.id", //$NON-NLS-1$
-		"server.serialized", //$NON-NLS-1$
-		"doc", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		"", //$NON-NLS-1$
-		DataStoreResources.FALSE,
-		"2"}; //$NON-NLS-1$
-	
-	protected DataElement _fileDocumentElement;
-	protected DataElement _docDocumentElement;
-	protected DataElement _requestClassDocumentElement;
-	protected DataElement _serializedDocumentElement;
-
-	/**
-	 * Constructor
-	 */
-	public ServerUpdateHandler()
-	{
-		_senders = new ArrayList();
-		_commandGenerator = new CommandGenerator();
-
-	}
-
-	/**
-	 * Sets the associated DataStore
-	 */
-	public void setDataStore(DataStore dataStore)
-	{
-		super.setDataStore(dataStore);
-		_commandGenerator.setDataStore(dataStore);
-		_fileDocumentElement = dataStore.createTransientObject(_fileAttributes);
-		_docDocumentElement = dataStore.createObject(null, _docAttributes);
-		_requestClassDocumentElement = dataStore.createTransientObject(_requestClassAttributes);
-		_serializedDocumentElement = dataStore.createTransientObject(_serializeAttributes);
-		_classDocumentElement = dataStore.createTransientObject(_classAttributes);
-		_keepAliveDocumentElement = dataStore.createTransientObject(_keepAliveAttributes);
-		_confirmKeepAliveDocumentElement = dataStore.createTransientObject(_confirmKeepAliveAttributes);
-
-	}
-
-	/**
-	 * Add a sender to the list of senders.  Normally there is only one
-	 * client for the server, which requires one <code>Sender</code>.  If
-	 * there are more than one clients, then this is how senders are added.
-	 * 
-	 * @param sender a sender connected to a socket
-	 */
-	public void addSender(Sender sender)
-	{
-		_senders.add(sender);
-	}
-
-	/**
-	 * Remove a sender from the list of senders.
-	 * @param sender the sender to remove
-	 */
-	public void removeSender(Sender sender)
-	{
-		_senders.remove(sender);
-		if (_senders.size() == 0)
-		{
-			finish();
-		}
-	}
-
-	/**
-	 * Sends bytes to the specified file on the client.
-	 * 
-	 * @param path the name of the file on the client
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes and binary or text
-	 */
-	public synchronized void updateFile(String path, byte[] bytes, int size, boolean binary)
-	{
-		updateFile(path, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER);
-	}
-	
-	/**
-	 * Sends bytes to the specified file on the client.
-	 * 
-	 * @param path the name of the file on the client
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes and binary or text
-	 * @param byteStreamHandlerId indicates the byte stream handler to receive the bytes
-	 * 
-	 */
-	public synchronized void updateFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		//DataElement document = _dataStore.createObject(null, DataStoreResources.FILE_TYPE, byteStreamHandlerId, path, path);
-		DataElement document = _fileDocumentElement;
-		document.setAttribute(DE.A_NAME, byteStreamHandlerId);
-		document.setAttribute(DE.A_VALUE, byteStreamHandlerId);
-		document.setAttribute(DE.A_SOURCE, path);
-		document.setPendingTransfer(true);
-		document.setParent(null);
-
-		for (int j = 0; j < _senders.size(); j++)
-		{
-			Sender sender = (Sender) _senders.get(j);
-			sender.sendFile(document, bytes, size, binary);
-		}
-	}
-
-	/**
-	 * Appends bytes to the specified file on the client.
-	 * 
-	 * @param path the name of the file on the client
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes and binary or text
-	 */
-	public synchronized void updateAppendFile(String path, byte[] bytes, int size, boolean binary)
-	{
-		updateAppendFile(path, bytes, size, binary, DataStoreResources.DEFAULT_BYTESTREAMHANDLER);
-	}
-	
-/**
-	 * Appends bytes to the specified file on the client.
-	 * 
-	 * @param path the name of the file on the client
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 * @param binary indicates whether to send the bytes and binary or text
-	 * @param byteStreamHandlerId indicates the byte stream handler to receive the bytes
-	 */
-	public synchronized void updateAppendFile(String path, byte[] bytes, int size, boolean binary, String byteStreamHandlerId)
-	{
-		//DataElement document = _dataStore.createObject(null, DataStoreResources.FILE_TYPE, byteStreamHandlerId, path, path);
-		DataElement document = _fileDocumentElement;
-		document.setAttribute(DE.A_NAME, byteStreamHandlerId);
-		document.setAttribute(DE.A_VALUE, byteStreamHandlerId);
-		document.setAttribute(DE.A_SOURCE, path);
-		document.setPendingTransfer(true);
-		document.setParent(null);
-		
-		for (int j = 0; j < _senders.size(); j++)
-		{
-			Sender sender = (Sender) _senders.get(j);
-			sender.sendAppendFile(document, bytes, size, binary);
-		}
-	}
-	
-
-	/**
-	 * Periodically called on the handler thread to sends data updates.
-	 */
-	public void handle()
-	{
-		if (!_dataObjects.isEmpty() || _pendingKeepAliveConfirmation != null || _pendingKeepAliveRequest != null || !_classesToSend.isEmpty())
-		{
-			try {
-				sendUpdates();
-			}
-			catch (OutOfMemoryError e){
-				System.exit(-1);
-			}
-		}
-	}
-
-	/**
-	 * Periodically called to send data in the queue from the server to the client
-     */
-	public void sendUpdates()
-	{
-		synchronized (_dataObjects)
-		{
-			//DataElement document = _dataStore.createObject(null, DataStoreResources.DOCUMENT_TYPE, "server.doc");
-			DataElement document = _docDocumentElement;
-			document.removeNestedData();
-			document.setPendingTransfer(true);
-			document.setUpdated(true);
-			document.setParent(null);
-			
-			_commandGenerator.generateResponse(document, _dataObjects);
-
-			for (int j = 0; j < _senders.size(); j++)
-			{
-				Sender sender = (Sender) _senders.get(j);
-				sender.sendDocument(document, 5);
-				if (_pendingKeepAliveConfirmation != null)
-				{
-					sender.sendKeepAliveConfirmation(_pendingKeepAliveConfirmation);
-					_pendingKeepAliveConfirmation = null;
-				}
-				if (_pendingKeepAliveRequest != null)
-				{
-					sender.sendKeepAliveRequest(_pendingKeepAliveRequest);
-					_pendingKeepAliveRequest = null;
-				}
-			}
-
-			for (int i = 0; i < _dataObjects.size(); i++)
-			{
-				DataElement obj = (DataElement) _dataObjects.get(i);
-				clean(obj);
-			}
-
-			_dataObjects.clear();
-			//_dataStore.getLogRoot().removeNestedData();
-			//_dataStore.getTempRoot().removeNestedData();
-		}
-		
-		// finished sending updates, now send all classes that are waiting
-		// in the queue
-		while (_classesToSend.size() > 0)
-		{
-			DataElement document = null;
-			synchronized (_classesToSend)
-			{
-				document = (DataElement)_classesToSend.remove(0);
-				for (int i = 0; i < _senders.size(); i++)
-				{
-					Sender sender = (Sender) _senders.get(i);
-					sender.sendClass(document);
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * Removes the sender that is associated with the specified socket.  This causes
-	 * A disconnect for the client that is associated with this socket.
-	 * 
-	 * @param socket the socket on which a sender communicates
-	 */
-	public void removeSenderWith(Socket socket)
-	{
-		for (int i = 0; i < _senders.size(); i++)
-		{
-			Sender sender = (Sender) _senders.get(i);
-			if (sender.socket() == socket)
-			{
-				// sender sends last ack before death
-				DataElement document = _dataStore.createObject(null, DataStoreResources.DOCUMENT_TYPE, "exit", "exit"); //$NON-NLS-1$ //$NON-NLS-2$
-				sender.sendDocument(document, 2);
-				removeSender(sender);
-			}
-		}
-	}
-	
-	/**
-	 * Implemented to provide the means by which classes are sent
-	 * across the comm channel.
-	 * @param className the name of the class to request
-	 */
-	public synchronized void requestClass(String className)
-	{
-		DataElement document = _requestClassDocumentElement;
-		document.setPendingTransfer(true);
-		document.setAttribute(DE.A_NAME, className);
-		document.setAttribute(DE.A_VALUE, className);
-		document.setParent(null);
-		//DataElement document = _dataStore.createObject(null, DataStoreResources.REQUEST_CLASS_TYPE, className);
-
-		for (int j = 0; j < _senders.size(); j++)
-		{
-			Sender sender = (Sender) _senders.get(j);
-			sender.requestClass(document);
-		}
-		
-	}
-	
-
-	public synchronized void updateClassInstance(IRemoteClassInstance runnable, String deserializebyteStreamHandlerId) 
-	{
-		DataElement document = _serializedDocumentElement;
-		document.setAttribute(DE.A_NAME, runnable.toString());
-		document.setAttribute(DE.A_SOURCE, deserializebyteStreamHandlerId);
-		document.setPendingTransfer(true);
-		document.setParent(null);		
-
-		for (int j = 0; j < _senders.size(); j++)
-		{
-			Sender sender = (Sender) _senders.get(j);
-			sender.sendRemoteClassRunnable(document, runnable);
-		}
-		notifyInput();
-	}
-
-	/**
-	 * Implemented to provide the means by which classes are sent
-	 * across the comm channel.
-	 * @param className the name of the class to send
-	 * @param classByteStreamHandlerId the name of the byte stream handler to use to receive the class
-	 */
-	public synchronized void sendClass(String className, String classByteStreamHandlerId) 
-	{
-		// send pending updates before sending class
-		if (_dataObjects.size() > 0)
-			sendUpdates();
-				
-		DataElement document = _classDocumentElement;
-		document.setAttribute(DE.A_NAME, className);
-		document.setAttribute(DE.A_SOURCE, classByteStreamHandlerId);
-		document.setPendingTransfer(true);
-		document.setParent(null);
-		
-		addClassToSend(document);
-	}
-	
-	/**
-	 * Adds a class to the queue of classes (represented by DataElements) to
-	 * be sent to the client.
-	 * @param classElement the DataElement representing the class to be sent
-	 */
-	public void addClassToSend(DataElement classElement)
-	{
-		synchronized (_classesToSend)
-		{
-			if (!_classesToSend.contains(classElement))
-			{
-				_classesToSend.add(classElement);
-			}
-		}
-	}
-
-	/**
-	 * Implemented to provide the means by which classes are requested and sent
-	 * across the comm channel.
-	 * @param className the name of the class to send
-	 */
-	public synchronized void sendClass(String className) 
-	{
-		sendClass(className, "default"); //$NON-NLS-1$
-	}
-
-	public void sendKeepAliveRequest() 
-	{
-		DataElement document = _keepAliveDocumentElement;
-		document.setPendingTransfer(true);
-		document.setAttribute(DE.A_NAME, "request"); //$NON-NLS-1$
-		document.setAttribute(DE.A_VALUE, "request"); //$NON-NLS-1$
-		document.setParent(null);
-		_pendingKeepAliveRequest = document;
-		
-		handle(); // bypassing threading
-	}
-
-	public void sendKeepAliveConfirmation() 
-	{
-		DataElement document = _confirmKeepAliveDocumentElement;
-		document.setPendingTransfer(true);
-		document.setAttribute(DE.A_NAME, "confirm"); //$NON-NLS-1$
-		document.setAttribute(DE.A_VALUE, "confirm"); //$NON-NLS-1$
-		document.setParent(null);
-		_pendingKeepAliveConfirmation = document;
-				
-		handle(); // bypassing threading
-	}
-
-	public synchronized void waitForInput()
-	{
-		if (_dataObjects.size() == 0 && _classesToSend.size() == 0 && _pendingKeepAliveConfirmation == null && _pendingKeepAliveRequest == null)
-		{
-			super.waitForInput();
-		}
-	}
-	
-	/**
-	 * Indicates whether the xml generator should transfer the buffer attribute of a DataElement
-	 * @param flag true to transfer the buffer attribute
-	 */
-	public void setGenerateBuffer(boolean flag)
-	{
-		for (int i = 0; i < _senders.size(); i++)
-		{
-			Sender sender = (Sender)_senders.get(i);
-			sender.setGenerateBuffer(flag);
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java
deleted file mode 100644
index 620fccc0d..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- *  David McKnight  (IBM)  - [202822] don't need to remove children from map here
- *  David McKnight  (IBM)  - [255390] check memory to determine whether to queue
- *  David McKnight  (IBM)  - [261644] [dstore] remote search improvements
- *  David McKnight   (IBM) - [294933] [dstore] RSE goes into loop
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.Handler;
-import org.eclipse.dstore.core.model.IDataStoreConstants;
-
-public class DataElementRemover extends Handler 
-{
-	private LinkedList _queue;
-	private static int numRemoved = 0;
-	private static int numDisconnected = 0;
-	private static int numCreated = 0;
-	private static int numGCed = 0;
-	
-	// The following determine how DataElements are chosen to be removed once they
-	// are in the queue for removal. 	
-	// The queue is checked every _intervalTime milliseconds and all elements
-	// that are older than _expiryTime milliseconds are removed.
-	public static final int DEFAULT_EXPIRY_TIME = 600; // in seconds
-	public static final int DEFAULT_INTERVAL_TIME = 60; // in seconds
-	private int _intervalTime = DEFAULT_INTERVAL_TIME * 10;
-	private int _expiryTime = DEFAULT_EXPIRY_TIME * 10;
-	public static final String EXPIRY_TIME_PROPERTY_NAME = "SPIRIT_EXPIRY_TIME"; //$NON-NLS-1$
-	public static final String INTERVAL_TIME_PROPERTY_NAME = "SPIRIT_INTERVAL_TIME"; //$NON-NLS-1$
-	public MemoryManager _memoryManager;
-	
-	public DataElementRemover(DataStore dataStore)
-	{
-		super();
-		_memoryManager = MemoryManager.getInstance(dataStore);
-		_dataStore = dataStore;
-		_queue = new LinkedList();
-		getTimes();
-		setWaitTime(_intervalTime);
-		DataElement spiritnode = _dataStore.createObjectDescriptor(_dataStore.getDescriptorRoot(), IDataStoreConstants.DATASTORE_SPIRIT_DESCRIPTOR);
-		_dataStore.createCommandDescriptor(spiritnode, "StartSpirit", "DataElementRemover", IDataStoreConstants.C_START_SPIRIT); //$NON-NLS-1$ //$NON-NLS-2$
-		_dataStore.refresh(_dataStore.getDescriptorRoot());
-	}
-	
-	protected void getTimes()
-	{
-		try
-		{
-			String expiryTime = System.getProperty(EXPIRY_TIME_PROPERTY_NAME);
-			if (expiryTime != null && !expiryTime.equals("")) _expiryTime = Integer.parseInt(expiryTime) * 1000;			 //$NON-NLS-1$
-		}
-		catch (Exception e)
-		{
-			System.out.println("Invalid spirit expiry time property, using default."); //$NON-NLS-1$
-			_expiryTime = DEFAULT_EXPIRY_TIME;
-		}
-		try
-		{
-			String intervalTime = System.getProperty(INTERVAL_TIME_PROPERTY_NAME);
-			if (intervalTime != null && !intervalTime.equals("")) _intervalTime = Integer.parseInt(intervalTime) * 1000;			 //$NON-NLS-1$
-		}
-		catch (Exception e)
-		{
-			System.out.println("Invalid spirit interval time property, using default."); //$NON-NLS-1$
-			_intervalTime = DEFAULT_INTERVAL_TIME;
-		}
-	}
-	
-	public static void addToRemovedCount()
-	{
-		numRemoved++;
-	}
-	
-	public static void addToCreatedCount()
-	{
-		numCreated++;
-	}
-	
-	public static void addToGCedCount()
-	{
-		numGCed++;
-	}
-
-	
-	public synchronized void addToQueueForRemoval(DataElement element)
-	{
-		synchronized (_queue) 
-		{
-			if(isMemoryThresholdExceeded()) {
-				if(element.isSpirit()) {
-					unmap(element);
-				}
-				
-				// do immediate clearing of queue since we're low on memory
-				clearQueue(true);
-				return;
-			}
-			if (_dataStore.isDoSpirit() && _dataStore == element.getDataStore())
-			{
-				QueueItem item = new QueueItem(element, System.currentTimeMillis());
-				_queue.add(item);
-			}
-		}
-		notifyInput();
-	}
-
-	private boolean isMemoryThresholdExceeded(){
-		return _memoryManager.isThresholdExceeded();
-	}
-	
-	public void handle()
-	{
-		clearQueue(false);
-	}
-	
-	public synchronized void clearQueue(boolean force)
-	{
-		synchronized (_queue)
-		{
-			_dataStore.memLog("           "); //$NON-NLS-1$
-			int disconnected = 0;
-			if (!_dataStore.isDoSpirit())
-			{
-				if (_queue.size() > 0) 
-				{
-					_dataStore.memLog("Clearing queue of size " + _queue.size() + ". DSTORE_SPIRIT_ON not set or set to false."); //$NON-NLS-1$ //$NON-NLS-2$
-					_queue.clear();
-				}
-				_dataStore.memLog("Total heap size: " + Runtime.getRuntime().totalMemory()); //$NON-NLS-1$
-				_dataStore.memLog("Elements created so far: " + numCreated); //$NON-NLS-1$
-				_dataStore.memLog("Elements disconnected so far: " + numDisconnected); //$NON-NLS-1$
-				_dataStore.memLog("Spirit elements cleaned so far: " + numRemoved); //$NON-NLS-1$
-				_dataStore.memLog("DataElements GCed so far: " + numGCed); //$NON-NLS-1$
-				return;
-			}
-			_dataStore.memLog("Total heap size before disconnection: " + Runtime.getRuntime().totalMemory()); //$NON-NLS-1$
-			
-			_dataStore.memLog("Size of queue: " + _queue.size()); //$NON-NLS-1$
-			
-			ArrayList toRefresh = new ArrayList();
-			while (_queue.size() > 0 && (force || System.currentTimeMillis() - ((QueueItem) _queue.getFirst()).timeStamp > _expiryTime))
-			{
-				DataElement toBeDisconnected = ((QueueItem) _queue.removeFirst()).dataElement;
-				if (!toBeDisconnected.isSpirit()) 
-				{
-					toBeDisconnected.setSpirit(true);
-					toBeDisconnected.setUpdated(false);
-					DataElement parent = toBeDisconnected.getParent();
-					if (!toRefresh.contains(parent))
-					{
-						//System.out.println("disconnect parent:"+parent.getName());
-						toRefresh.add(toBeDisconnected.getParent());
-					}
-						//_dataStore.refresh(toBeDisconnected);
-					disconnected++;
-					numDisconnected++;
-				}
-				else
-				{
-					//_dataStore.memLog(toBeDisconnected.toString());
-				}
-				unmap(toBeDisconnected);
-			}
-	
-			_dataStore.refresh(toRefresh);
-			
-			_dataStore.memLog("Disconnected " + disconnected + " DataElements."); //$NON-NLS-1$ //$NON-NLS-2$
-			_dataStore.memLog("Elements created so far: " + numCreated); //$NON-NLS-1$
-			_dataStore.memLog("Elements disconnected so far: " + numDisconnected); //$NON-NLS-1$
-			_dataStore.memLog("Spirit elements cleaned so far: " + numRemoved); //$NON-NLS-1$
-			_dataStore.memLog("DataElements GCed so far: " + numGCed); //$NON-NLS-1$
-			System.gc();
-		}
-	}
-	
-	private void unmap(DataElement element)
-	{	 
-		HashMap map = _dataStore.getHashMap();					
-		synchronized (map){
-			map.remove(element.getId());
-		}
-	}
-	
-	
-	protected class QueueItem
-	{
-		public DataElement dataElement;
-		public long timeStamp;
-		
-		public QueueItem(DataElement element, long stamp)
-		{
-			dataElement = element;
-			timeStamp = stamp;
-		}
-	}
-	
-	/**
-	 * Runs the handler loop in a thread.
-	 */
-	public void run()
-	{
-		while (_keepRunning)
-		{
-			try
-			{
-				Thread.sleep(100000); // wait 100 seconds
-				Thread.yield();
-			}
-			catch (InterruptedException e)
-			{
-				e.printStackTrace();
-				finish();
-				return;
-			}
-			handle();
-		}
-	}
-}
-
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ExternalLoader.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ExternalLoader.java
deleted file mode 100644
index f798277f3..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ExternalLoader.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util;
-
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.java.RemoteClassLoader;
-import org.eclipse.dstore.core.model.IExternalLoader;
-import org.eclipse.dstore.core.util.StringCompare;
-
-
-/**
- * ExternalLoader is a <code>ClassLoader</code> wrapper used for loading external
- * tools that are not in the same classpath as the DataStore.  Each ExternalLoader
- * contains a <i>load scope</i>, a list of classpaths that it's class loader is able
- * to load.
- */
-public class ExternalLoader implements IExternalLoader
-{
-
-	private ClassLoader _classLoader;
-	private ArrayList _loadScope;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param classLoader the classloader
-	 * @param loadScope the scope in which the classloader can load classes
-	 */
-	public ExternalLoader(ClassLoader classLoader, String loadScope)
-	{
-		_classLoader = classLoader;
-		_loadScope = new ArrayList();
-		_loadScope.add(loadScope);
-	}
-
-	/**
-	 * Constructor
-	 * 
-	 * @param classLoader the classloader
-	 * @param loadScope the scope in which the classloader can load classes
-	 */
-	public ExternalLoader(ClassLoader classLoader, ArrayList loadScope)
-	{
-		_classLoader = classLoader;
-		_loadScope = loadScope;
-	}
-
-	/**
-	 * Indicates whether this external loader can load a particular class
-	 * @param source a qualified classname
-	 * @return true if it can load the clas
-	 */
-	public boolean canLoad(String source)
-	{
-		if (_classLoader instanceof RemoteClassLoader)
-		{
-			return true;
-		}
-		
-		boolean result = false;
-		if (_loadScope != null)
-		{
-			for (int i = 0; i < _loadScope.size(); i++)
-			{
-				String scope = (String) _loadScope.get(i);
-				result = StringCompare.compare(scope, source, true);
-				if (result)
-				{
-					return result;
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Loads the specified class
-	 * @param source a qualified classname
-	 * @return the loaded class
-	 * @throws ClassNotFoundException
-	 */
-	public Class loadClass(String source) throws ClassNotFoundException
-	{
-		try
-		{	
-			return _classLoader.loadClass(source);
-		}
-		catch (NoClassDefFoundError e)
-		{
-			throw new ClassNotFoundException(source);
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ISender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ISender.java
deleted file mode 100644
index 064a6f8d7..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ISender.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util;
-
-import org.eclipse.dstore.core.model.DataElement;
-
-public interface ISender
-{
-
-
-  public void sendDocument(String document);
-  public void sendDocument(DataElement objectRoot, int depth);
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/MemoryManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/MemoryManager.java
deleted file mode 100644
index b5412e27e..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/MemoryManager.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight
- *
- * Contributors:
- * David McKnight  (IBM)  - [261644] [dstore] remote search improvements
- * David McKnight  (IBM)  - [277764] [dstore][regression] IllegalAccessException thrown when connecting to a running server
- ********************************************************************************/
-
-package org.eclipse.dstore.internal.core.util;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.server.SystemServiceManager;
-
-public class MemoryManager {
-	private Object mbean;
-	private static MemoryManager _instance;
-	private DataStore _dataStore;
-
-	private MemoryManager(DataStore dataStore) {
-		init();
-		_dataStore = dataStore;
-	}
-
-	public static MemoryManager getInstance(DataStore dataStore){
-		if (_instance == null){
-			_instance = new MemoryManager(dataStore);
-		}
-		return _instance;
-	}
-
-	private void init(){
-		String thresholdString = System.getProperty("search.threshold"); //$NON-NLS-1$
-		double threshold = 0.8;
-		if(thresholdString != null && thresholdString.length() > 0) {
-			threshold = Integer.parseInt(thresholdString) / 100.0;
-		}
-
-		// do we have java 1.5?
-		try {
-			Class factoryClass = Class.forName("java.lang.management.ManagementFactory"); //$NON-NLS-1$
-			Method method = factoryClass.getDeclaredMethod("getMemoryPoolMXBeans", new Class[0]);  //$NON-NLS-1$
-
-			List list = (List)method.invoke(null, null);
-
-			for(int i = 0;i < list.size(); i++) {
-				Object mbObj = list.get(i);
-				Class mbClass = mbObj.getClass();
-
-				
-				Method getSupportedMethod = mbClass.getDeclaredMethod("isUsageThresholdSupported", new Class[0]);  //$NON-NLS-1$
-				getSupportedMethod.setAccessible(true);
-				Boolean usageThresholdSupported = (Boolean)getSupportedMethod.invoke(mbObj, null);
-				if (usageThresholdSupported.booleanValue()){
-
-					Method getTypeMethod = mbClass.getDeclaredMethod("getType", new Class[0]);  //$NON-NLS-1$
-
-					getTypeMethod.setAccessible(true);
-					Object typeObj = getTypeMethod.invoke(mbObj, null);
-					Class memoryType = Class.forName("java.lang.management.MemoryType");  //$NON-NLS-1$
-					Field field = memoryType.getField("HEAP");  //$NON-NLS-1$
-					Object fieldObj = field.get(typeObj);
-
-					if (fieldObj.equals(typeObj)){
-						Method getUsageMethod = mbClass.getDeclaredMethod("getUsage", new Class[0]);  //$NON-NLS-1$
-						getUsageMethod.setAccessible(true);
-						Object usageObj = getUsageMethod.invoke(mbObj, null);
-
-						Class usageClass = usageObj.getClass();
-						Method getMaxMethod = usageClass.getDeclaredMethod("getMax", new Class[0]);  //$NON-NLS-1$
-						getMaxMethod.setAccessible(true);
-						Long maxObj = (Long)getMaxMethod.invoke(usageObj, null);
-
-						Method setThresholdMethod = mbClass.getDeclaredMethod("setUsageThreshold", new Class[] { long.class });  //$NON-NLS-1$
-						Object[] args = new Object[1];
-						args[0] = new Long((long)(maxObj.longValue() * threshold));
-
-						setThresholdMethod.setAccessible(true);
-						setThresholdMethod.invoke(mbObj, args);
-						mbean = mbObj;
-						break;
-					}
-				}
-			}
-		}
-		catch (Exception e){
-			// java version to old so no mbean created - will use fallback
-		}
-	}
-
-	public boolean isThresholdExceeded() {
-
-		if (mbean != null){
-			try {
-				Method method = mbean.getClass().getMethod("isUsageThresholdExceeded", new Class[0]);  //$NON-NLS-1$
-				Boolean exceeded = (Boolean)method.invoke(mbean, null);
-				return exceeded.booleanValue();
-			}
-			catch (Exception e){
-				return false;
-			}
-		}
-		else {
-			// no Java 1.5 available, so this is the fallback
-			Runtime runtime = Runtime.getRuntime();
-			long freeMem = runtime.freeMemory();
-
-			if (freeMem < 10000){
-
-				return true;
-			}
-			return false;
-		}
-	}
-
-	public void checkAndClearupMemory()
-	{
-		int count = 0;
-		while(count < 5 && isThresholdExceeded()) {
-			System.gc();
-			try {
-				Thread.sleep(2000);
-			} catch (InterruptedException e) {
-			}
-			count ++;
-			_dataStore.trace("CLEAN free mem="+Runtime.getRuntime().freeMemory());  //$NON-NLS-1$
-		}
-		if(count == 5) {
-
-
-			_dataStore.trace("Out of memory - shutting down"); //$NON-NLS-1$
-
-			Exception e = new Exception();
-			_dataStore.trace(e);
-
-			/*
-			 * show the end of the log
-			DataElement logRoot = _dataStore.getLogRoot();
-			List nestedData = logRoot.getNestedData();
-			for (int i = nestedData.size() - 10; i < nestedData.size(); i++){
-				DataElement cmd = (DataElement)nestedData.get(i);
-				System.out.println(cmd);
-			}
-			*/
-
-			if (SystemServiceManager.getInstance().getSystemService() == null)
-				System.exit(-1);
-		}
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Pattern.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Pattern.java
deleted file mode 100644
index 22d66ae7c..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Pattern.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util;
-
-import java.util.ArrayList;
-
-/**
- * This class is used to define a wildcard string pattern.  Strings 
- * can be compared against a pattern to determine whether they match
- * or not.
- */ 
-public class Pattern
-{
-
-	private String _pattern;
-	private ArrayList _subMatches;
-	private ArrayList _matchSchema;
-
-	/**
-	 * Constructor
-	 * @param pattern a wildcard string
-	 * @param matchSchema 
-	 */
-	public Pattern(String pattern, ArrayList matchSchema)
-	{
-		_pattern = pattern;
-
-		_matchSchema = matchSchema;
-	}
-
-	/**
-	 * Returns a list of submatches
-	 * @return a list of submatches
-	 */
-	public ArrayList getSubMatches()
-	{
-		return _subMatches;
-	}
-
-	/**
-	 * Returns a submatch
-	 * @param attribute an attribute to match
-	 * @return a submatch
-	 */
-	public String getSubMatch(String attribute)
-	{
-		// find attribute index in match schema
-		int index = _matchSchema.indexOf(attribute);
-		if ((index >= 0) && (index < _subMatches.size()))
-		{
-			Object match = _subMatches.get(index);
-			return new String((String) match);
-		}
-		else
-		{
-			return new String("null"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Checks whther a compare string matches the pattern
-	 * @param compareStr to string to compare
-	 * @return true if there is a match
-	 */
-	public boolean matches(String compareStr)
-	{
-		String currentMatch = new String(""); //$NON-NLS-1$
-		_subMatches = new ArrayList();
-
-		int iText = 0;
-		int iPattern = 0;
-		int lastStar = 0;
-		int len = compareStr.length();
-
-		int patternLen = _pattern.length();
-
-		while (iPattern < patternLen)
-		{
-			char p = _pattern.charAt(iPattern++);
-			if (p == '*')
-			{
-				if (currentMatch.length() > 0)
-				{
-					_subMatches.add(new String(currentMatch));
-				}
-				currentMatch = new String(""); //$NON-NLS-1$
-
-				if (iPattern >= patternLen)
-				{
-					while (iText < len)
-					{
-						currentMatch += compareStr.charAt(iText++);
-					}
-					_subMatches.add(new String(currentMatch));
-
-					return true;
-				}
-				else
-				{
-					lastStar = iPattern;
-				}
-			}
-			else
-			{
-				if (iText >= len)
-				{
-					return false;
-				}
-				else
-				{
-					char t = compareStr.charAt(iText++);
-					if (p == t)
-					{
-						if ((lastStar > 0) && (iPattern >= patternLen) && (iText < len))
-						{
-						}
-						else
-						{
-							continue;
-						}
-
-					}
-					else
-					{
-						currentMatch += t;
-						if (lastStar == 0)
-						{
-							return false;
-						}
-					}
-
-					int matched = iPattern - lastStar - 1;
-					iPattern = lastStar;
-
-					iText -= matched;
-				}
-			}
-		}
-
-		if (iText >= len)
-		{
-			_subMatches.add(new String(currentMatch));
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java
deleted file mode 100644
index 5a35757a5..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sender.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight  (IBM)   [222168][dstore] Buffer in DataElement is not sent
- * David McKnight  (IBM)   [305218][dstore] problem reading double-byte characters through data socket layer
- * David McKnight  (IBM)   [307541][dstore] fix for Bug 305218 breaks RDz connections
- * David McKnight  (IBM)   [347412][dstore] Need an option to set TCP NODELAYACKS
- * David McKnight  (IBM)   [350315][dstore] regress change made for bug 305218
- * David McKnight    (IBM)  - [358301] [DSTORE] Hang during debug source look up
- * David McKnight  (IBM)   [360847] [dstore] need to add tracing and fixes to enable remote class transfer
- * David McKnight   (IBM)  - [367449] [dstore] allow custom encoding for data transport layer
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-
-/**
- * This class is used for sending data to a socket in the DataStore 
- * communication layer.
- */
-public class Sender implements ISender
-{
-
-	private Socket _socket;
-	private PrintStream _outFile;
-	private BufferedWriter _outData;
-	private XMLgenerator _xmlGenerator;
-	private DataStore _dataStore;
-	
-	/**
-	 * Constructor
-	 * @param socket the associated socket
-	 * @param dataStore the associated DataStore
-	 */
-	public Sender(Socket socket, DataStore dataStore)
-	{
-		_socket = socket;
-		_dataStore = dataStore;
-
-		_xmlGenerator = new XMLgenerator(_dataStore);
-		try
-		{
-			String noDelayStr = System.getProperty("DSTORE_TCP_NO_DELAY"); //$NON-NLS-1$
-			if (noDelayStr != null && noDelayStr.length() > 0){
-				try {
-					boolean noDelay = Boolean.valueOf(noDelayStr).booleanValue();
-					_socket.setTcpNoDelay(noDelay); 
-					
-					noDelay = _socket.getTcpNoDelay();
-					_dataStore.trace("tcp no delay set to " + noDelay); //$NON-NLS-1$
-				}
-				catch (Exception e){					
-				}
-			}
-			int bufferSize = _socket.getSendBufferSize();
-			_xmlGenerator.setBufferSize(bufferSize);
-		}
-		catch (SocketException e)
-		{
-		}
-		try
-		{
-			_outFile = new PrintStream(_socket.getOutputStream());
-			
-			String encoding = DE.ENCODING_UTF_8;	
-			String serverEncoding = System.getProperty("DSTORE_SERVER_ENCODING"); //$NON-NLS-1$
-			if (serverEncoding != null && serverEncoding.length() > 0){
-				encoding = serverEncoding;
-			}
-			
-			OutputStreamWriter writer = new OutputStreamWriter(_socket.getOutputStream(), encoding);
-			_outData = new BufferedWriter(writer);
-
-			_xmlGenerator.setFileWriter(_outFile);
-			_xmlGenerator.setDataWriter(_outData);
-			_xmlGenerator.setGenerateBuffer(false);
-			InetSocketAddress address = (InetSocketAddress)socket.getRemoteSocketAddress();
-			if (address != null)
-			{
-				if (address.getAddress() != null)
-				{
-					String remoteIP = address.getAddress().getHostAddress();
-					_dataStore.setRemoteIP(remoteIP);
-				}
-				else
-				{
-					String remoteIP = address.getHostName();
-					_dataStore.setRemoteIP(remoteIP);
-				}
-			}
-			else
-			{
-				String remoteIP = socket.getInetAddress().getHostAddress();
-				_dataStore.setRemoteIP(remoteIP);
-			}
-		}
-		catch (java.io.IOException e)
-		{
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Returns the associated socket
-	 * @return the socket
-	 */
-	public Socket socket()
-	{
-		return _socket;
-	}
-
-	/**
-	 * Sends a string through the socket
-	 * @param document the string to send
-	 */
-	public void sendDocument(String document)
-	{
-		synchronized (_outData)
-		{
-			try
-			{
-				_outData.write(document, 0, document.length());
-				_outData.flush();
-			}
-			catch (IOException e)
-			{
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Sends the bytes of a file through the socket
-	 * @param objectRoot the object representing the file to send
-	 * @param bytes the bytes to send over the socket
-	 * @param size the number of bytes to send over the socket
-	 * @param binary indicates whether to send the bytes and binary or text
-	 */
-	public void sendFile(DataElement objectRoot, byte[] bytes, int size, boolean binary)
-	{
-
-		synchronized (_outData)
-		{
-			synchronized (_outFile)
-			{
-
-				_xmlGenerator.empty();
-				_xmlGenerator.generate(objectRoot, bytes, size, false, binary);
-				_xmlGenerator.flushData();
-			}
-		}
-	}
-	
-	/**
-	 * Sends a class through the socket
-	 * @param classElement the object representing the class to send
-	 */
-	public void sendClass(DataElement classElement)
-	{
-		String className = classElement.getName();
-
-		ArrayList loaders = _dataStore.getLocalClassLoaders();
-		if (loaders == null) 
-		{
-			// could not get the registered classLoaders. Fail.
-			generateEmptyClass(classElement);
-			return;
-		}
-		
-		InputStream classInStream = null;
-		className = className.replace('.', '/');
-		className = className + ".class"; //$NON-NLS-1$
-		URL classLocation = null;
-		for (int i = 0; i < loaders.size(); i++)
-		{
-			ClassLoader loader = (ClassLoader) loaders.get(i);
-		
-			classInStream = loader.getResourceAsStream(className);
-			classLocation = loader.getResource(className);
-			
-			if (classInStream == null && classLocation != null){
-				try {
-					String file = classLocation.getFile();
-					File f = new File(file);
-					if (f.exists()){
-						classInStream = new FileInputStream(f);
-					}
-				} catch (Exception e) {
-					_dataStore.trace(e);
-				}
-			}
-			if (classInStream != null && classLocation != null) break;
-		}
-		if (classLocation == null || classInStream == null) 
-		{
-			// could not load the class with any of the class loaders. Fail.
-			generateEmptyClass(classElement);
-			return;
-		}
-		
-		// got a stream to read the classfile. Now read the class into a buffer.
-		BufferedInputStream bufInputStream = new BufferedInputStream(classInStream);
-
-		try
-		{
-			int classSize = bufInputStream.available();
-			byte[] bytes = new byte[classSize];
-			int result = 0;
-			result = bufInputStream.read(bytes);
-			
-			if (result != classSize)
-			{
-				generateEmptyClass(classElement);
-				return; // throw new IOException("Could not read class from BufferedInputStream: " + className);
-			}
-		
-			synchronized (_outData)
-			{
-				synchronized (_outFile)
-				{
-
-					_xmlGenerator.empty();
-					_xmlGenerator.generate(classElement, bytes, classSize);
-					_xmlGenerator.flushData();
-				}
-			}
-		}
-		catch (IOException e)
-		{
-			generateEmptyClass(classElement);
-			return;
-		}
-	}
-	
-	/**
-	 * Generates an empty class and sends it across the pipe, as a signal that the
-	 * class could not be found or loaded or read on the client.
-	 * @param classElement
-	 */
-	private void generateEmptyClass(DataElement classElement)
-	{
-		_xmlGenerator.empty();
-		_xmlGenerator.generate(classElement, new byte[0], 0);
-		_xmlGenerator.flushData();
-	}
-
-	/**
-	 * Sends the bytes of a file through the socket to be appended to a file on the other end
-	 * 
-	 * @param objectRoot the object representing the file to send
-	 * @param bytes the bytes to send over the socket
-	 * @param size the number of bytes to send over the socket
-	 * @param binary indicates whether to send the bytes and binary or text
-	 */
-	public void sendAppendFile(DataElement objectRoot, byte[] bytes, int size, boolean binary)
-	{
-		synchronized (_outData)
-		{
-
-			synchronized (_outFile)
-			{
-				_xmlGenerator.empty();
-				_xmlGenerator.generate(objectRoot, bytes, size, true, binary);
-				_xmlGenerator.flushData();
-			}
-		}
-	}
-
-	/**
-	 * Sends a DataStore tree of data through the socket
-	 * 
-	 * @param objectRoot the root of the tree to send
-	 * @param depth the depth of the tree to send
-	 */
-	public void sendDocument(DataElement objectRoot, int depth)
-	{
-		synchronized (_outData)
-		{
-			synchronized (_outFile)
-			{
-				try {
-					_xmlGenerator.empty();
-					_xmlGenerator.generate(objectRoot, depth);
-					_xmlGenerator.flushData();
-				}
-				catch (OutOfMemoryError e){
-					System.exit(-1);
-				}
-			}
-
-		}
-
-//		if (objectRoot.getParent() != null)
-	//		objectRoot.getDataStore().deleteObject(objectRoot.getParent(), objectRoot);
-	}
-	
-	/**
-	 * Requests a class from the client
-	 */
-	public void requestClass(DataElement classRequest)
-	{
-		synchronized (_outData)
-		{
-			synchronized (_outFile)
-			{
-
-				_xmlGenerator.empty();
-				_xmlGenerator.generateClassRequest(classRequest);
-				_xmlGenerator.flushData();
-			}
-		}
-	}
-
-	public void sendRemoteClassRunnable(DataElement objectRoot, IRemoteClassInstance runnable) 
-	{
-		synchronized (_outData)
-		{
-			synchronized (_outFile)
-			{
-				_xmlGenerator.empty();
-				_xmlGenerator.generateSerializedObject(objectRoot, runnable);
-				_xmlGenerator.flushData();
-			}
-		}
-	}
-
-	public void sendKeepAliveRequest(DataElement document) 
-	{
-		synchronized (_outData)
-		{
-			synchronized (_outFile)
-			{
-				_xmlGenerator.empty();
-				_xmlGenerator.generate(document, 2);
-				_xmlGenerator.flushData();
-			}
-		}
-	}
-
-	public void sendKeepAliveConfirmation(DataElement document) 
-	{
-		synchronized (_outData)
-		{
-			synchronized (_outFile)
-			{
-				_xmlGenerator.empty();
-				_xmlGenerator.generate(document, 2);
-				_xmlGenerator.flushData();
-			}
-		}
-	}
-	
-
-	/**
-	 * Indicates whether the xml generator should transfer the buffer attribute of a DataElement
-	 * @param flag true to transfer the buffer attribute
-	 */
-	public void setGenerateBuffer(boolean flag)
-	{
-		_xmlGenerator.setGenerateBuffer(flag);
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sorter.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sorter.java
deleted file mode 100644
index c87584090..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/Sorter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util;
-
-import java.util.ArrayList;
-
-import org.eclipse.dstore.core.model.DataElement;
-
-/**
- * Utility class used for sorting a list of DataElements based on 
- * their depth attributes.
- */
-public class Sorter
-{
-
-	/**
-	 * Sort a list of DataElements based on their depth attributes
-	 * @param list a list of DataElements
-	 * @return a sorted list of DataElements
-	 */
-	public static ArrayList sort(ArrayList list)
-	{
-		ArrayList sortedList = new ArrayList(list.size());
-		while (list.size() > 0)
-		{
-			DataElement first = findFirst(list);
-			sortedList.add(first);
-		}
-
-		return sortedList;
-	}
-
-	/**
-	 * Find the DataElement with the highest depth in the list
-	 * @param list a list of DataElements
-	 * @return the DataElement with the highest depth
-	 */
-	private static DataElement findFirst(ArrayList list)
-	{
-		DataElement result = null;
-		for (int i = 0; i < list.size(); i++)
-		{
-			DataElement item = (DataElement) list.get(i);
-			if (item != null)
-			{
-				int depth = item.depth();
-				if ((result == null) || (depth > result.depth()))
-				{
-					result = item;
-				}
-			}
-		}
-
-		list.remove(result);
-		return result;
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLgenerator.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLgenerator.java
deleted file mode 100644
index da0261f75..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLgenerator.java
+++ /dev/null
@@ -1,694 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight     (IBM)       - [232233] [dstore] Buffer in DataElement is not retained
- * David McKnight     (IBM)       - [245481] [dstore] CR/LF not restored for new client/old server
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.io.PrintStream;
-import java.util.Stack;
-
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreResources;
-
-/**
- * <p>
- * This class is used to serialize data and send it either
- * to a file or a socket.  
- * </p>
- * <p>
- * When a DataStore tree needs to be transmitted, it's DataElements are 
- * converted to XML before sending.  Only those elements which have changed and
- * are thus out of synch with the DataStore on the other end of the socket are
- * actually transferred.
- * </p>
- * <p>
- * When a byte stream or file needs to be transmitted, bytes are
- * either send as is if binary transfer is requested or as unicode if 
- * binary transfer is not requested.
- * </p>
- */
-public class XMLgenerator
-{
-
-	private int _state;
-
-	private StringBuffer _document;
-
-	private int _indent;
-	private Stack _tagStack;
-
-	private PrintStream _fileWriter;
-	private BufferedWriter _dataWriter;
-
-	private int _bufferSize;
-	private boolean _generateBuffer;
-	private boolean _ignoreDeleted;
-
-	private DataStore _dataStore;
-
-	public static final int EMPTY = 0;
-	public static final int OPEN = 1;
-	public static final int CLOSE = 2;
-	public static final int BODY = 3;
-
-	/**
-	 * Constructor
-	 * @param dataStore the associated DataStore
-	 */
-	public XMLgenerator(DataStore dataStore)
-	{
-		_dataStore = dataStore;
-		_state = EMPTY;
-		_bufferSize = 100000;
-
-		_document = new StringBuffer(_bufferSize);
-
-		_indent = 0;
-		_generateBuffer = true;
-		_ignoreDeleted = false;
-		_tagStack = new Stack();
-	}
-
-	/**
-	 * Indicate whether DataElements marked as deleted should be sent.
-	 * @param flag whether deleted elements should be sent
-	 */
-	public void setIgnoreDeleted(boolean flag)
-	{
-		_ignoreDeleted = flag;
-	}
-
-	/**
-	 * Sets the file writer used for file transfer
-	 * @param writer the file writer used for file transfer
-	 */
-	public void setFileWriter(PrintStream writer)
-	{
-		_fileWriter = writer;
-	}
-
-	/**
-	 * Sets the data writer used for XML transfer
-	 * @param writer the data writer used for XML transfer
-	 */
-	public void setDataWriter(BufferedWriter writer)
-	{
-		_dataWriter = writer;
-	}
-
-	/**
-	 * Set the buffer size
-	 * @param size of the buffer used for transmitting packets
-	 */
-	public void setBufferSize(int size)
-	{
-		_bufferSize = size;
-	}
-
-	/**
-	 * Indicate whether the buffer attribute of each DataElement should be
-	 * transferred
-	 * @param flag whether the buffer should be transferred
-	 */
-	public void setGenerateBuffer(boolean flag)
-	{
-		_generateBuffer = flag;
-	}
-
-	private void append(char c)
-	{
-		_document.append(c);
-	}
-	
-	private void append(String buffer)
-	{
-		_document.append(buffer);
-	}
-
-	private void append(StringBuffer buffer)
-	{
-		_document.append(buffer);
-	}
-
-	private void nextLine()
-	{
-		if (_dataWriter != null)
-		{
-			_document.append('\n');
-
-			int length = _document.length();
-			if (length > _bufferSize)
-			{
-				flushData();
-			}
-		}
-	}
-
-	/**
-	 * Send all buffered data through the pipe.
-	 */
-	public void flushData()
-	{
-		if (_document.length() > 0 && _dataWriter != null)
-		{
-			try
-			{
-				_dataWriter.write(_document.toString(), 0, _document.length());
-				_dataWriter.write('\n');
-				_dataWriter.flush();
-				_document.setLength(0);
-			}
-			catch (Exception e)
-			{
-				_dataStore.trace(e);
-				_dataWriter = null;
-			}
-		}
-	}
-
-	private void indent()
-	{
-		for (int i = 0; i < _indent; i++)
-		{
-			append(' ');
-		}
-	}
-
-	private void startTag(String name)
-	{
-		if (_state == OPEN)
-		{
-			append('>');
-			_indent++;
-		}
-		if (_state == CLOSE)
-		{
-			_indent--;
-		}
-		if (_state == BODY)
-		{
-			nextLine();
-		}
-		indent();
-		if (_document == null)
-		{
-			append('<');
-			append(name);
-		}
-		else
-		{
-			append('<');
-			append(name);
-		}
-		_tagStack.push(name);
-		_state = OPEN;
-	}
-
-	private void endTag(String name)
-	{
-		String top = (String) _tagStack.pop();
-		if (_state == CLOSE)
-		{
-		}
-		else if (_state == OPEN)
-		{
-			if (top == name)
-			{
-				append("/>"); //$NON-NLS-1$
-				if (_tagStack.empty())
-				{
-					_state = CLOSE;
-				}
-				else
-				{
-					_state = BODY;
-				}
-			}
-		}
-		else if (_state == BODY)
-		{
-			if (top == name)
-			{
-				nextLine();
-				_indent--;
-				indent();
-				append("</"); //$NON-NLS-1$
-				append(name);
-				append('>');
-				if (_tagStack.empty())
-				{
-					_state = CLOSE;
-				}
-			}
-		}
-	}
-
-	private void addAttribute(String name, String value)
-	{
-		if (_state != OPEN)
-		{
-		}
-
-		StringBuffer niceValue = null;
-		if (value != null)
-		{
-			niceValue = prepareStringForXML(value);
-
-			append(' ');
-			append(name);
-			append("=\""); //$NON-NLS-1$
-			append(niceValue);
-			append('"');
-		}
-		else
-		{
-			append(' ');
-			append(name);
-			append("=\"\""); //$NON-NLS-1$
-		}
-
-	}
-	
-	private void addReferenceTypeAttribute(DataElement object)
-	{
-		if (object.isSpirit())
-		{
-			addAttribute(DE.P_REF_TYPE, DataStoreResources.SPIRIT);
-		}
-		else
-		{
-			if (object.isReference())
-			{
-				if (_dataStore.getReferenceTag() != null && _dataStore.getReferenceTag().equals(DE.P_REF_TYPE)) addAttribute(DE.P_REF_TYPE, DataStoreResources.REFERENCE);
-				else addAttribute(DE.P_REF_TYPE, DataStoreResources.TRUE);
-			}
-			else 
-			{
-				if (_dataStore.getReferenceTag() != null && _dataStore.getReferenceTag().equals(DE.P_REF_TYPE)) addAttribute(DE.P_REF_TYPE, DataStoreResources.VALUE);
-				else addAttribute(DE.P_REF_TYPE, DataStoreResources.FALSE);
-			}
-		}
-	}
-
-	private void addFile(byte[] bytes, int size, boolean binary)
-	{
-		if (_state == OPEN)
-		{
-			append('>');
-
-			_indent++;
-			_state = BODY;
-		}
-		if (_state == BODY)
-		{
-			flushData();
-
-			// send everything across
-			if (binary)
-			{
-				_fileWriter.write(bytes, 0, size);
-				_fileWriter.flush();
-			}
-			else
-			{
-				try
-				{
-					_dataWriter.write(new String(bytes), 0, size);
-					_dataWriter.flush();
-				}
-				catch (IOException e)
-				{
-					_dataStore.trace(e);
-				}
-			}
-		}
-		else if (_state == EMPTY)
-		{
-		}
-		else if (_state == CLOSE)
-		{
-		}
-	}
-
-	private void addData(StringBuffer data)
-	{
-		if (_state == OPEN)
-		{
-			append('>');
-
-			_indent++;
-			_state = BODY;
-		}
-		if (_state == BODY)
-		{
-			if (_generateBuffer && data != null && (data.length() > 0))
-			{
-				StringBuffer text = prepareStringForXML(data);
-				if (text != null && text.length() > 0)
-				{
-					nextLine();
-					indent();
-					append("<Buffer>"); //$NON-NLS-1$
-					nextLine();
-					append(text.toString());
-					nextLine();
-					append("</Buffer>"); //$NON-NLS-1$
-				}
-			}
-			else
-			{
-				append(""); //$NON-NLS-1$
-			}
-		}
-		else if (_state == EMPTY)
-		{
-		}
-		else if (_state == CLOSE)
-		{
-		}
-	}
-
-	/**
-	 * Returns the current serialized document
-	 * @return the current document
-	 */
-	public StringBuffer document()
-	{
-		return _document;
-	}
-
-	/**
-	 * Clears the current serlized document
-	 */
-	public void empty()
-	{
-		_indent = 0;
-		_document.delete(0, _document.length());
-	}
-
-	/**
-	 * Converts special characters to appropriate representation in XML
-	 * @param input buffer to convert
-	 * @return the converted buffer
-	 */
-	public static StringBuffer prepareStringForXML(StringBuffer input)
-	{
-		StringBuffer output = new StringBuffer();
-
-		for (int idx = 0; idx < input.length(); idx++)
-		{
-			char currChar = input.charAt(idx);
-			switch (currChar)
-			{
-				case '&' :
-					output.append(XMLparser.STR_AMP);
-					break;
-				case '"' :
-					output.append(XMLparser.STR_QUOTE);
-					break;
-				case '\'' :
-					output.append(XMLparser.STR_APOS);
-					break;
-				case '<' :
-					output.append(XMLparser.STR_LT);
-					break;
-				case '>' :
-					output.append(XMLparser.STR_GT);
-					break;
-				case ';' :
-					output.append(XMLparser.STR_SEMI);
-					break;
-				case '\n':
-					output.append(XMLparser.STR_NL);
-					break;
-				case '\r':
-					output.append(XMLparser.STR_CR);
-					break;
-				case '\0':
-					output.append(XMLparser.STR_EOL);
-					break;
-				default :
-					output.append(currChar);
-					break;
-			}
-		}
-
-		return output;
-	}
-
-	/**
-	 * Converts special characters to appropriate representation in XML
-	 * @param input buffer to convert
-	 * @return the converted buffer
-	 */
-	public static StringBuffer prepareStringForXML(String input)
-	{
-		StringBuffer output = new StringBuffer();
-
-		for (int idx = 0; idx < input.length(); idx++)
-		{
-			char currChar = input.charAt(idx);
-			switch (currChar)
-			{
-			case '&' :
-				output.append(XMLparser.STR_AMP);
-				break;
-			case '"' :
-				output.append(XMLparser.STR_QUOTE);
-				break;
-			case '\'' :
-				output.append(XMLparser.STR_APOS);
-				break;
-			case '<' :
-				output.append(XMLparser.STR_LT);
-				break;
-			case '>' :
-				output.append(XMLparser.STR_GT);
-				break;
-			case ';' :
-				output.append(XMLparser.STR_SEMI);
-				break;
-			case '\n':
-				output.append(XMLparser.STR_NL);
-				break;
-			case '\r':	
-				output.append(XMLparser.STR_CR);
-				break;
-			case '\0':
-				output.append(XMLparser.STR_EOL);
-				break;
-				default :
-					output.append(currChar);
-					break;
-			}
-		}
-
-		return output;
-	}
-
-	/**
-	 * Generate an tags for a file transfer and send bytes over the pipe.
-	 * 
-	 * @param object the element representing the file transfer
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 * @param isAppend indicates whether bytes should be appended or not to a file on the other end of the pipe
-	 * @param binary indicates whether the bytes should be sent as binary or text
-	 */
-	public synchronized void generate(DataElement object, byte[] bytes, int size, boolean isAppend, boolean binary)
-	{
-		String tagType = XMLparser.STR_FILE;
-		if (isAppend)
-		{
-			tagType += ".Append"; //$NON-NLS-1$
-		}
-		if (binary)
-		{
-			tagType += ".Binary"; //$NON-NLS-1$
-		}
-
-		if (object != null)
-		{
-			startTag(tagType);
-			addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE));
-			addAttribute(DE.P_ID, object.getAttribute(DE.A_ID));
-			addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME));
-			addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE));
-			addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE));
-			addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION));
-
-			addReferenceTypeAttribute(object);
-
-			addAttribute(DE.P_DEPTH, "" + size); //$NON-NLS-1$
-			addFile(bytes, size, binary);
-
-			endTag(tagType);
-		}
-	}
-	
-	/**
-	 * Generate tags for class transfer and send bytes over the pipe.
-	 * 
-	 * @param object the element representing the class transfer
-	 * @param bytes the bytes to send
-	 * @param size the number of bytes to send
-	 */
-	public synchronized void generate(DataElement object, byte[] bytes, int size)
-	{
-		String tagType = XMLparser.STR_CLASS;
-
-		if (object != null)
-		{
-			startTag(tagType);
-			addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE));
-			addAttribute(DE.P_ID, object.getAttribute(DE.A_ID));
-			addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME));
-			addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE));
-			addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE));
-			addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION));
-
-			addReferenceTypeAttribute(object);
-
-			addAttribute(DE.P_DEPTH, "" + size); //$NON-NLS-1$
-			addFile(bytes, size, true);
-
-			endTag(tagType);
-		}
-	}
-
-	/**
-	 * Serializes and sends a DataStore tree through the pipe
-	 * 
-	 * @param object the root of the DataStore tree to send
-	 * @param depth the depth of the tree to send
-	 */
-	public void generate(DataElement object, int depth)
-	{
-		if ((object != null) && (depth >= 0))
-		{
-			String tagType = XMLparser.STR_DATAELEMENT;
-
-			if (object.isUpdated() && !object.isPendingTransfer())
-			{
-			}
-			else
-			{
-				if (object.isDeleted() && _ignoreDeleted)
-				{
-				}
-				else
-				{
-					object.setPendingTransfer(false);
-					
-					startTag(tagType);
-					addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE));
-					addAttribute(DE.P_ID, object.getAttribute(DE.A_ID));
-					addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME));
-					addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE));
-					addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE));
-					addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION));
-
-					addReferenceTypeAttribute(object);
-
-					addAttribute(DE.P_DEPTH, "" + object.depth()); //$NON-NLS-1$
-					addData(object.getBuffer());
-					object.setUpdated(true);
-
-					if (!object.isReference() && depth >= 0)
-					{
-						for (int i = 0; i < object.getNestedSize(); i++)
-						{
-							generate(object.get(i), depth - 1);
-						}
-					}
-
-					// end generation
-					endTag(tagType);
-				}
-			}
-		}
-	}
-
-	public void generateClassRequest(DataElement object)
-	{
-		String tagType = XMLparser.STR_REQUEST_CLASS;
-		if (object != null)
-		{
-			startTag(tagType);
-			addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE));
-			addAttribute(DE.P_ID, object.getAttribute(DE.A_ID));
-			addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME));
-			addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE));
-			addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE));
-			addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION));
-
-			addReferenceTypeAttribute(object);
-			_state = BODY;
-			endTag(tagType);
-		}
-		
-	}
-
-	public void generateSerializedObject(DataElement object, IRemoteClassInstance runnable)
-	{
-		String tagType = XMLparser.STR_SERIALIZED;
-		if (object != null)
-		{
-			startTag(tagType);
-			addAttribute(DE.P_TYPE, object.getAttribute(DE.A_TYPE));
-			addAttribute(DE.P_ID, object.getAttribute(DE.A_ID));
-			addAttribute(DE.P_NAME, object.getAttribute(DE.A_NAME));
-			addAttribute(DE.P_VALUE, object.getAttribute(DE.A_VALUE));
-			addAttribute(DE.P_SOURCE, object.getAttribute(DE.A_SOURCE));
-			addAttribute(DE.P_SOURCE_LOCATION, object.getAttribute(DE.A_SOURCE_LOCATION));
-
-			addReferenceTypeAttribute(object);
-			
-			try
-			{
-				PipedInputStream pin = new PipedInputStream();
-				PipedOutputStream pout = new PipedOutputStream(pin);
-				ObjectOutputStream outStream = new ObjectOutputStream(pout);
-				outStream.writeObject(runnable);
-					
-				
-				int size = pin.available();
-				byte[] bytes = new byte[size];
-				int nRead = pin.read(bytes, 0, size);
-				addAttribute(DE.P_DEPTH, "" + nRead); //$NON-NLS-1$
-				addFile(bytes, nRead, true);
-				
-				outStream.close();
-				pin.close();
-				
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			endTag(tagType);
-		}		
-	}
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java
deleted file mode 100644
index 87f5255b2..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/XMLparser.java
+++ /dev/null
@@ -1,1125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight  (IBM)   [220123][dstore] Configurable timeout on irresponsiveness
- * David McKnight  (IBM)   [221601][dstore] xmlparser needs to be able to handle very large attributes
- * David McKnight  (IBM)   [222163][dstore] Special characters from old server are not restored
- * David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
- * David McKnight  (IBM)   [246826][dstore] KeepAlive does not work correctly
- * David McKnight  (IBM)   [305218][dstore] problem reading double-byte characters through data socket layer
- * David McKnight  (IBM)   [307541][dstore] fix for Bug 305218 breaks RDz connections
- * David McKnight  (IBM)   [322407][dstore] Connection dropped automatically when idle
- * David McKnight  (IBM)   [350315][dstore] regress change made for bug 305218
- * David McKnight    (IBM)  - [358301] [DSTORE] Hang during debug source look up
- * David McKnight   (IBM)  - [367449] [dstore] allow custom encoding for data transport layer
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreResources;
-
-/**
- * <p>
- * This class is used to deserialize data received from a file or a socket.  
- * </p>
- * <p>
- * When tags indicate that data is being received, the byte stream is deserialized
- * as a DataStore tree.  When deserialized data maps to existing DataElements in 
- * the DataStore, those elements are updated directly.  Any deserialized data 
- * that maps to within an existing DataElement, that does not already exist, gets
- * created under the existing DataElement.  When parsing DataElement XML, there is
- * no intermediate DOM - rather the DOM is the DataStore itself.  
- * </p>
- * <p>
- * When tags indicate that a byte stream or file is being received, bytes are
- * sent the the current DataStore <code>ByteStreamHandler</code> to be saved on disk.
- * </p>
- */
-public class XMLparser
-{
-	public static final String KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE = "DSTORE_KEEPALIVE_RESPONSE_TIMEOUT"; //$NON-NLS-1$
-	public static final String IO_SOCKET_READ_TIMEOUT_PREFERENCE = "DSTORE_IO_SOCKET_READ_TIMEOUT"; //$NON-NLS-1$
-	public static final String KEEPALIVE_ENABLED_PREFERENCE = "DSTORE_KEEPALIVE_ENABLED"; //$NON-NLS-1$
-	
-	public int IO_SOCKET_READ_TIMEOUT = 3600000;
-	public long KEEPALIVE_RESPONSE_TIMEOUT = 60000;
-	
-	public static final boolean VERBOSE_KEEPALIVE = false;
-	
-	private DataStore _dataStore;
-	private DataElement _rootDataElement;
-	private Stack _tagStack;
-	private Stack _objStack;
-
-	private boolean _isFile;
-	private boolean _isClass;
-	private boolean _isRequestClass;
-	private boolean _isKeepAlive;
-	private boolean _isKeepAliveConfirm;
-	private boolean _isSerialized;
-	
-	private String _tagType;
-
-	private byte[] _byteBuffer;
-	private byte[] _fileByteBuffer;
-	private int _maxBuffer;
-
-	private boolean _panic = false;
-	private Throwable _panicException = null;
-	
-	private boolean _isKeepAliveCompatible = false;
-	private boolean _isKeepAliveEnabled = true;
-	private boolean _firstTime = true;
-	
-	private KeepAliveRequestThread _kart = null;
-	private KeepAliveRequestThread _initialKart = null;
-	
-	public static String STR_DATAELEMENT = "DataElement"; //$NON-NLS-1$
-
-	public static String STR_BUFFER_START = "<Buffer>"; //$NON-NLS-1$
-	public static String STR_BUFFER_END   = "</Buffer>"; //$NON-NLS-1$
-	public static String STR_BUFFER       = "Buffer"; //$NON-NLS-1$
-
-	public static String STR_STATUS       = "status"; //$NON-NLS-1$
-	public static String STR_STATUS_DONE  = "done"; //$NON-NLS-1$
-	public static String STR_STATUS_ALMOST_DONE = "almost done"; //$NON-NLS-1$
-	
-	public static String STR_FILE         = "File"; //$NON-NLS-1$
-	public static String STR_CLASS		   = "Class"; //$NON-NLS-1$
-	public static String STR_REQUEST_CLASS= "RequestClass"; //$NON-NLS-1$
-	public static String STR_SERIALIZED   = "Serialized"; //$NON-NLS-1$
-	
-	public static String STR_AMP = "&amp;"; //$NON-NLS-1$
-	public static String STR_QUOTE = "&quot;"; //$NON-NLS-1$
-	public static String STR_APOS = "&apos;"; //$NON-NLS-1$
-	public static String STR_LT = "&lt;"; //$NON-NLS-1$
-	public static String STR_GT = "&gt;"; //$NON-NLS-1$
-	public static String STR_SEMI = "&#59;"; //$NON-NLS-1$
-
-	public static String STR_NL = "&#92;&#110;";	 //$NON-NLS-1$
-	public static String STR_CR = "&#92;&#114;"; //$NON-NLS-1$
-	public static String STR_EOL = "&#92;&#48;"; //$NON-NLS-1$
-	
-	/**
-	 * Constructor
-	 * @param dataStore the associated DataStore
-	 */
-	public XMLparser(DataStore dataStore)
-	{
-		_dataStore = dataStore;
-		_tagStack = new Stack();
-		_objStack = new Stack();
-		_maxBuffer = 100000;
-		_byteBuffer = new byte[_maxBuffer];
-				
-	}
-
-	/**
-	 * Set whether to enable keepalive
-	 * @param enable <code>true</code> to enable keepalive
-	 */
-	public void setEnableKeepalive(boolean enable){
-		// if false, we ignore the keepalive stuff
-		_isKeepAliveCompatible = enable;
-		_isKeepAliveEnabled = enable;
-	}
-	
-	/**
-	 * Set the keepalive response timeout
-	 * @param timeout the time to wait for a response after 
-	 *        initiating a keepalive request
-	 */
-	public void setKeepaliveResponseTimeout(int timeout){
-		// the new value will be picked up on the next readLine() call
-		KEEPALIVE_RESPONSE_TIMEOUT = timeout;
-	}
-
-	/**
-	 * Set the socket read timeout
-	 * @param timeout the time to wait before initiating a keepalive request
-	 */
-	public void setIOSocketReadTimeout(int timeout){
-		// the new value will be picked up on the next readLine() call
-		IO_SOCKET_READ_TIMEOUT = timeout; 		
-	}
-	
-	/**
-	 * Read a file from the pipe
-	 * @param reader the pipe reader
-	 * @param size the number of bytes to read
-	 * @param path the path of the file where the received bytes should be inserted
-	 */
-	public void readFile(BufferedInputStream reader, int size, String path, String byteStreamHandlerId)
-	{
-	/*
-		Runtime rt = Runtime.getRuntime();
-		//long totalMem = rt.totalMemory();
-		long freeMem = rt.freeMemory();
-	
-		if (size * 100 > freeMem)
-		{
-			rt.gc();
-		}
-		*/
-		if (_fileByteBuffer == null || _fileByteBuffer.length < size)
-		{
-			try 
-			{
-				_fileByteBuffer = new byte[size];
-			}
-			catch (OutOfMemoryError e)
-			{
-				System.exit(-1);
-			}
-		}
-
-		int written = 0;
-		while (written < size)
-		{
-			try
-			{
-				int read = reader.read(_fileByteBuffer, written, size - written);
-				written += read;
-			}
-			catch (SocketException se)
-			{
-			    // DKM- socket exception means connection is gone
-			    //  need bail now!
-			    _dataStore.trace(se);
-				handlePanic(se);
-				return;
-			}
-			catch (IOException e)
-			{
-				_dataStore.trace(e);
-				handlePanic(e);
-			}
-			catch (Error err)
-			{
-				System.out.println("error!");  //$NON-NLS-1$
-				handlePanic(err);
-			}
-		}
-
-		if (_tagType.startsWith("File.Append")) //$NON-NLS-1$
-		{
-			boolean binary = _tagType.equals("File.Append.Binary"); //$NON-NLS-1$
-			_dataStore.appendToFile(path, _fileByteBuffer, size, binary, byteStreamHandlerId);
-		}
-		else
-		{
-			boolean binary = _tagType.equals("File.Binary"); //$NON-NLS-1$
-			_dataStore.saveFile(path, _fileByteBuffer, size, binary, byteStreamHandlerId);
-		}
-	}
-
-	public boolean readInstance(BufferedInputStream reader, int size, String classbyteStreamHandlerId)
-	{
-		byte[] buffer = new byte[size];
-		int written = 0;
-
-		while (written < size)
-		{
-			try
-			{
-				int read = reader.read(buffer, written, size - written);
-				written += read;
-			}
-			catch (SocketException se)
-			{
-			    // DKM- socket exception means connection is gone
-			    //  need bail now!
-			    _dataStore.trace(se);
-				handlePanic(se);
-				return false;
-			}
-			catch (IOException e)
-			{
-				_dataStore.trace(e);
-				handlePanic(e);
-				return false;
-			}
-		}
-		_dataStore.saveClassInstance(buffer, size, classbyteStreamHandlerId);
-		return true;
-	}
-	
-	/**
-	 * Read a class file from the pipe
-	 * @param reader the pipe reader
-	 * @param size the number of bytes to read
-	 * @param className the name of the class defined by the byte array.
-	 * @param classbyteStreamHandlerId the name of the classByteStreamHandler that will receive the bytes of the file.
-	 * @return whether the operation is successful
-	 */
-	public boolean readClass(BufferedInputStream reader, int size, String className, String classbyteStreamHandlerId)
-	{
-		byte[] buffer = new byte[size];
-		int written = 0;
-
-		while (written < size)
-		{
-			try
-			{
-				int read = reader.read(buffer, written, size - written);
-				written += read;
-			}
-			catch (SocketException se)
-			{
-			    // DKM- socket exception means connection is gone
-			    //  need bail now!
-			    _dataStore.trace(se);
-				handlePanic(se);
-				return false;
-			}
-			catch (IOException e)
-			{
-				_dataStore.trace(e);
-				handlePanic(e);
-				return false;
-			}
-		}
-		_dataStore.saveClass(className, buffer, size, classbyteStreamHandlerId);
-		return true;
-	}
-	
-	/**
-	 * Reads a line from the pipe
-	 * 
-	 * @param reader the pipe reader
-	 * @return the line received
-	 */
-	public String readLine(BufferedInputStream reader, Socket socket)
-	{
-		boolean done = false;
-		int offset = 0;
-
-		try
-		{
-		    boolean inquotes = false;
-			while (!done)
-			{
-				if (_isKeepAliveEnabled)
-				{
-					if (_firstTime)
-					{
-						_initialKart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT, socket);
-						_firstTime = false;
-						if (VERBOSE_KEEPALIVE) System.out.println("Starting initial KeepAlive thread."); //$NON-NLS-1$
-						_initialKart.start();
-						continue;
-					}
-					else if (_initialKart != null)
-					{
-						if (_initialKart.isAlive()){							
-							int currentTimeout = socket.getSoTimeout();
-							if (currentTimeout != IO_SOCKET_READ_TIMEOUT){
-								if (VERBOSE_KEEPALIVE) System.out.println("Resetting timeout from " + currentTimeout + " to " + IO_SOCKET_READ_TIMEOUT); //$NON-NLS-1$ //$NON-NLS-2$
-								socket.setSoTimeout(IO_SOCKET_READ_TIMEOUT);
-							}
-						}
-						
-						if (!_initialKart.isAlive()){
-							if (!_initialKart.failed())
-							{
-								_isKeepAliveCompatible = true;
-								if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive compatible."); //$NON-NLS-1$
-								_initialKart = null;
-							}			
-							else
-							{
-								_isKeepAliveCompatible = false;
-								if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive incompatible."); //$NON-NLS-1$
-								_initialKart = null;
-							}
-						}				
-					}
-				}
-				
-				int in = -1;
-				
-				if (_isKeepAliveEnabled && _isKeepAliveCompatible)
-				{	
-					if (_kart == null || !_kart.isAlive()){  // normal read wait
-						socket.setSoTimeout(IO_SOCKET_READ_TIMEOUT);
-					}
-					/* the SoTimeout is set in the kart before sleeping
-					else { // read wait time when awaking a keepalive response
-						// otherwise, if IO_SOCKET_READ_TIMEOUT is bigger we don't get out of here until IO_SOCKET_READ_TIMEOUT is complete
-						socket.setSoTimeout((int)KEEPALIVE_RESPONSE_TIMEOUT);
-					}
-					*/
-					
-					try
-					{
-						in = reader.read();
-					}
-					catch (InterruptedIOException e)
-					{
-						if ((_kart != null) && _kart.failed())
-						{
-							done = true;
-							if (_dataStore.isVirtual()) handlePanic(new Exception("KeepAlive request to server wasnt answered in time.")); //$NON-NLS-1$
-							else handlePanic(new Exception("KeepAlive request to client wasnt answered in time.")); //$NON-NLS-1$
-							return null;
-						}
-						else
-						{
-							if (_kart == null || !_kart.isAlive()){
-								_kart = new KeepAliveRequestThread(KEEPALIVE_RESPONSE_TIMEOUT, socket);
-								if (VERBOSE_KEEPALIVE) System.out.println("No activity on socket. KeepAlive thread started."); //$NON-NLS-1$
-								_kart.start();
-								continue;
-							}							
-						}
-					}
-				}
-				else // no keepalive
-				{
-					in = reader.read();
-				}
-
-				if (in == -1)
-				{
-					done = true;
-					Exception e = new Exception("The connection to the server has been lost."); //$NON-NLS-1$
-					handlePanic(e);
-				}
-				else
-				{
-				    if (in <= 0)
-				    {
-				        done = true;
-				    }
-				    else
-				    {
-				    	if (_kart != null) _kart.interrupt();
-				    }
-					byte aByte = (byte) in;
-					switch (aByte)
-					{
-						case '"':
-						    inquotes = !inquotes;
-						    break;
-						case '\n':
-						case '\r':
-						case '\0':
-						    if (!inquotes)
-						        done = true;
-						    break;
-						default:				       
-							break;
-					}
-
-					if (offset >= _maxBuffer)
-					{
-						int newMaxBuffer = 2 * _maxBuffer;
-						byte[] newBuffer = new byte[newMaxBuffer];
-						System.arraycopy(_byteBuffer, 0, newBuffer, 0, _maxBuffer);
-						_maxBuffer = newMaxBuffer;
-						_byteBuffer = newBuffer;
-					}
-					_byteBuffer[offset] = aByte;
-					offset++;  
-				}
-			}
-		}
-		catch (IOException e)
-		{
-			_dataStore.trace(e);
-			done = true;
-
-			handlePanic(e);
-
-			return null;
-		}
-
-		if (offset > 0)
-		{
-			String result = null;	
-			
-			String encoding = DE.ENCODING_UTF_8;
-			String serverEncoding = System.getProperty("DSTORE_SERVER_ENCODING"); //$NON-NLS-1$
-			if (serverEncoding != null && serverEncoding.length() > 0){
-				encoding = serverEncoding;				
-			}
-			try
-			{
-				result = new String(_byteBuffer, 0, offset, encoding);
-			}
-			catch (IOException e)
-			{
-				_dataStore.trace(e);
-			}	
-
-			return result;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Called if an exception occurs during reading of the pipe
-	 * @param e the Exception
-	 */
-	private void handlePanic(Throwable e)
-	{
-		_panic = true;
-		_panicException = e;
-	}
-
-	/**
-	 * Returns the communications exception if one occurred
-	 * @return a exception
-	 */
-	public Throwable getPanicException()
-	{
-		return _panicException;
-	}
-
-	/**
-	 * This method gets called to receive data from the pipe.  It deserializes
-	 * DataStore XML documents, creating the appropriate DataElements in appropriate
-	 * places in the DataStore tree.  If files are being transmitted it creates
-	 * the appropriate files using the DataStore <code>ByteStreamHandler</code>.
-	 * 
-	 * @param reader the pipe reader
-	 * @return the root DataElement of the parsed document
-	 * @throws IOException
-	 */
-	public DataElement parseDocument(BufferedInputStream reader, Socket socket) throws IOException
-	{
-		_tagStack.clear();
-		_objStack.clear();
-
-		_rootDataElement = null;
-		_isFile = false;
-		_isClass = false;
-		_isRequestClass = false;
-		_isKeepAlive = false;
-		_isKeepAliveConfirm = false;
-		_isSerialized = false;
-		_tagType = STR_DATAELEMENT;
-
-		DataElement parent = null;
-		String matchTag = null;
-
-		boolean done = false;
-		try {
-			while (!done)
-			{
-				String xmlTag = readLine(reader, socket);
-				
-				if (xmlTag != null)
-				{
-					String trimmedTag = xmlTag.trim();
-					if (trimmedTag.length() > 0){
-					
-					if (_dataStore.getReferenceTag() == null)
-					{
-						if (trimmedTag.indexOf(DE.P_ISREF + "=") > -1) _dataStore.setReferenceTag(DE.P_ISREF); //$NON-NLS-1$
-						else if (trimmedTag.indexOf(DE.P_REF_TYPE + "=") > -1) _dataStore.setReferenceTag(DE.P_REF_TYPE); //$NON-NLS-1$
-					}
-	
-					if (!_tagStack.empty())
-					{
-						matchTag = (String) _tagStack.peek();
-					}
-					if (trimmedTag.equals(STR_BUFFER_START))
-					{
-						_tagType = STR_BUFFER;
-						_tagStack.push(STR_BUFFER_END);
-					}
-					else if (trimmedTag.equals(STR_BUFFER_END))
-					{
-						_tagType = STR_DATAELEMENT;
-						_tagStack.pop();
-					}
-					else if (_tagType.equals(STR_BUFFER))
-					{
-						String buffer = convertStringFromXML(xmlTag);
-						if (parent != null)
-							parent.appendToBuffer(buffer);
-					}
-					else if ((matchTag != null) && trimmedTag.equals(matchTag))
-					{
-						if (parent != null && parent.getType().equals(STR_STATUS))
-						{
-							if (parent.getName().equals(STR_STATUS_ALMOST_DONE))
-							{
-								
-								parent.setAttribute(DE.A_NAME, STR_STATUS_DONE);
-								if (parent.getValue().equals(STR_STATUS_ALMOST_DONE))
-								{
-									parent.setAttribute(DE.A_VALUE,STR_STATUS_DONE);
-								}
-								if (_dataStore.isWaiting(parent))
-								{
-									_dataStore.stopWaiting(parent);
-									parent.notifyUpdate();
-								}
-							}
-						}
-						
-						if (parent != null && parent.getNestedSize() > 0 && _dataStore.isVirtual())
-						{
-							List toDelete = new ArrayList();
-							List nested = parent.getNestedData();
-							synchronized (nested)
-							{
-								for (int s= 0; s < nested.size(); s++)
-								{
-									DataElement element = (DataElement)nested.get(s);
-									if (element.isSpirit())
-									{
-										boolean addedToDelete = false;
-										String name = element.getName();
-										String value = element.getValue();
-										
-										// delete this element if there's another one with the same name and value
-										for (int n = 0; n < parent.getNestedSize() && !addedToDelete; n++)
-										{
-											if (n != s)
-											{
-												DataElement compare = parent.get(n);
-												String cname = compare.getName();
-												String cvalue = compare.getValue();
-												if (!compare.isSpirit() &&  cname.equals(name) && cvalue.equals(value))										
-												{
-													toDelete.add(element);
-													addedToDelete = true;
-												}
-											}
-										}
-									}
-								}					
-								
-								// delete elements
-								for (int d = 0; d < toDelete.size(); d++)
-								{
-									DataElement delement = (DataElement)toDelete.get(d);
-									_dataStore.deleteObject(parent,delement);
-								}
-							}
-						}
-	
-						_tagStack.pop();
-						if (_tagStack.empty())
-						{
-							done = true;
-						}
-						else if (_tagStack.size() == 1)
-						{
-							parent = _rootDataElement;
-						}
-						else
-						{
-							parent = (DataElement) _objStack.pop();
-						}
-	
-					}
-					else
-					{
-						xmlTag = xmlTag.trim();
-	
-						if (xmlTag.length() > 3)
-						{
-	
-							try
-							{
-								if (parent != null)
-								{
-									if (_objStack.contains(parent))
-									{
-									}
-									else
-									{
-										_objStack.push(parent);
-									}
-								}
-	
-								DataElement result = parseTag(xmlTag, parent);
-	
-								if (_panic)
-								{
-									return null;
-								}
-	
-								if (result != null)
-								{
-								    result.setUpdated(true);
-	
-									if (parent == null && _rootDataElement == null)
-									{
-										_rootDataElement = result;
-										_rootDataElement.setParent(null);
-									}
-	
-									parent = result;
-	
-									if (_isFile)
-									{
-										int size = result.depth();
-										String path = result.getSource();
-										
-										String  byteStreamHandler = result.getName();
-										if (path.equals(byteStreamHandler))
-										{
-										    // older client or server, fall back to default
-										    byteStreamHandler = DataStoreResources.DEFAULT_BYTESTREAMHANDLER;
-										}
-										readFile(reader, size, path, byteStreamHandler);
-										
-										_isFile = false;
-										//_dataStore.deleteObject(parent, result);
-									}
-									else if (_isClass)
-									{
-										int size = result.depth();
-										
-										String classbyteStreamHandler = result.getSource();
-	
-										if (result.getName() != null)
-										{
-											readClass(reader, size, result.getName(), classbyteStreamHandler);
-										}
-										_isClass = false;
-									}
-									else if (_isRequestClass)
-									{
-										result.getDataStore().sendClass(result.getName());
-										_isRequestClass = false;
-									}
-									else if (_isKeepAlive)
-									{
-										if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive request received, sending confirmation."); //$NON-NLS-1$									
-										result.getDataStore().sendKeepAliveConfirmation();
-										_isKeepAlive = false;
-									}
-									else if (_isKeepAliveConfirm )
-									{
-										if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive confirmation received."); //$NON-NLS-1$
-										if (_initialKart != null) _initialKart.interrupt();
-										_isKeepAliveConfirm = false;
-									}
-									else if (_isSerialized)
-									{
-										int size = result.depth();
-										String classbyteStreamHandler = result.getSource();
-										if (result.getName() != null)
-										{
-											readInstance(reader, size, classbyteStreamHandler);
-										}
-										_isSerialized = false;
-									}
-	
-									StringBuffer endTag = new StringBuffer("</"); //$NON-NLS-1$
-									endTag.append(_tagType);
-									endTag.append('>');
-									_tagStack.push(endTag.toString());
-								}
-							}
-							catch (Exception e)
-							{
-								e.printStackTrace();
-								_dataStore.trace(e);
-								return _rootDataElement;
-							}
-						}
-					}
-				}
-				}
-	
-				if (_panic)
-					return null;
-			}
-		}
-		catch (OutOfMemoryError e){
-			System.exit(-1);
-		}
-
-		DataElement result = _rootDataElement;
-		_rootDataElement.setParent(null); // this root is transient
-
-		_rootDataElement = null;
-		return result;
-	}
-
-	/**
-	 * Deserializes a single DataElement from the XML stream.
-	 * 
-	 * @param fullTag the DataElement XML tag
-	 * @param parent the DataElement that container for the deserialized DataElement
-	 * @return the parsed DataElement
-	 */
-	protected synchronized DataElement parseTag(String fullTag, DataElement parent)
-	{
-		if (!fullTag.startsWith("<")) //$NON-NLS-1$
-			return null;
-
-		try
-		{
-			fullTag = fullTag.substring(1, fullTag.length() - 1);
-		}
-		catch (Exception e)
-		{
-			return null;
-		}
-
-		// get type
-		int nextSpace = fullTag.indexOf(' ');
-		if (nextSpace > 0)
-		{
-			String[] attributes = new String[DE.A_SIZE];
-
-			// tag type
-			String tagType = fullTag.substring(0, nextSpace);
-			if (tagType.startsWith(STR_FILE))
-			{
-				_isFile = true;
-				_tagType = tagType;
-			}
-			else if (tagType.startsWith(STR_CLASS))
-			{
-				_isClass = true;
-				_tagType = tagType;
-			}
-			else if (tagType.startsWith(STR_REQUEST_CLASS))
-			{
-				_isRequestClass = true;
-				_tagType = tagType;
-			}
-			else if (tagType.startsWith(STR_SERIALIZED))
-			{
-				_isSerialized = true;
-				_tagType = tagType;
-			}
-
-			int index = 0;
-			int nextQuote = 0;
-			int nextnextQuote = nextSpace;
-			while ((index < DE.A_SIZE) && (nextQuote >= 0))
-			{
-				nextQuote = fullTag.indexOf('\"', nextnextQuote + 1);
-				nextnextQuote = fullTag.indexOf('\"', nextQuote + 1);
-
-				if ((nextQuote >= 0) && (nextnextQuote > nextQuote) && (fullTag.length() > nextnextQuote))
-				{
-					String attribute = fullTag.substring(nextQuote + 1, nextnextQuote);
-					attributes[index] = convertStringFromXML(attribute);
-					index++;
-				}
-			}
-
-			DataElement result = null;
-			if (attributes.length == DE.A_SIZE)
-			{
-				String type = attributes[DE.A_TYPE];
-				if (type.equals(DataStoreResources.KEEPALIVE_TYPE))
-				{
-					_isKeepAlive= true;
-					result = _dataStore.createTransientObject(attributes);
-				}
-				else if (type.equals(DataStoreResources.KEEPALIVECONFIRM_TYPE))
-				{
-					_isKeepAliveConfirm = true;
-					result = _dataStore.createTransientObject(attributes);
-				}
-				
-				else if (type.equals(DataStoreResources.DOCUMENT_TYPE))
-				{
-					String id = attributes[DE.A_ID];
-					if (_dataStore.contains(id))
-					{
-						result = _dataStore.find(id);
-						result.removeNestedData();
-					}
-					else
-					{						
-						result = _dataStore.createObject(null, attributes);
-					}
-				}
-
-				else if (_isFile || _isClass || _isSerialized || parent == null)
-				{
-					result = _dataStore.createTransientObject(attributes);
-				}			
-				else
-				{
-					String refType = attributes[DE.A_REF_TYPE];
-					boolean isSpirit = false;
-					if (refType != null) isSpirit = refType.equals(DataStoreResources.SPIRIT);
-					
-					if ((refType != null) && (refType.equals(DataStoreResources.TRUE) || refType.equals(DataStoreResources.REFERENCE)))
-					{
-						// new reference
-						String origId = attributes[DE.A_NAME];
-						if (_dataStore.contains(origId))
-						{
-
-							DataElement to = _dataStore.find(origId);
-							result = _dataStore.createReference(parent, to, attributes[DE.A_TYPE], false);
-						}
-						else
-						{
-							// creating reference to unknown object
-							result = _dataStore.createObject(parent, attributes);
-						}
-					}
-					else
-					{
-						String id = attributes[DE.A_ID];
-						if (id == null)
-						{
-							handlePanic(new Exception(fullTag));
-							return null;
-						}
-	
-						if (_dataStore.contains(id))
-						{
-							result = _dataStore.find(id);
-	
-							// treat status special test
-							String name = attributes[DE.A_NAME];
-							String value = attributes[DE.A_VALUE];
-							if (type.equals(STR_STATUS) && name.equals(STR_STATUS_DONE))
-							{
-								attributes[DE.A_NAME] = STR_STATUS_ALMOST_DONE;
-								if (value.equals(STR_STATUS_DONE))
-								{
-									attributes[DE.A_VALUE] = STR_STATUS_ALMOST_DONE;
-								}
-								
-								result.setAttributes(attributes);
-							}
-							else
-							{
-								if (isSpirit)
-								{
-									if (!_dataStore.isVirtual()) attributes[DE.A_REF_TYPE] = DataStoreResources.VALUE;
-									result.setSpirit(_dataStore.isVirtual());
-								}
-								else
-								{
-									result.setSpirit(false);
-								}
-								result.setAttributes(attributes);
-							}
-	
-							if (parent == _rootDataElement)
-							{
-								DataElement rParent = result.getParent();
-								parent = rParent;
-	
-								_rootDataElement.addNestedData(result, false);
-							}
-							else
-							{
-								if (result.getParent() == null)
-								{
-									if (result != _dataStore.getRoot())
-									{
-										result.setParent(parent);
-									}
-								}
-							}
-	
-							if (parent != null)
-							{
-								parent.addNestedData(result, true);
-							}
-							else
-							{
-								if (result != _dataStore.getRoot())
-								{
-									_dataStore.trace("parent of " + result.getName() + " is NULL!"); //$NON-NLS-1$ //$NON-NLS-2$
-								}
-								else
-								{
-									result.setParent(null);
-								}
-							}
-							if (result.isDeleted())
-								//_dataStore.deleteObject(result.getParent(), result);
-								result.delete();
-						}
-						else
-						{
-							// new object
-							if (_dataStore.isVirtual()) 
-							{
-								result = _dataStore.find(parent, DE.A_NAME, attributes[DE.A_NAME], 1);
-							}
-							if (isSpirit)
-							{
-								if (!_dataStore.isVirtual()) attributes[DE.A_REF_TYPE] = DataStoreResources.VALUE;
-								result = _dataStore.createObject(parent, attributes);
-								result.setSpirit(_dataStore.isVirtual());
-							}
-							else
-							{
-								result = _dataStore.createObject(parent, attributes);
-								result.setSpirit(false);
-							}
-
-					
-						}
-
-					}
-				}
-			}
-
-			if (result != null && result.isDeleted())
-			{
-				_dataStore.deleteObject(parent, result);
-			}
-
-			return result;
-		}
-
-		return null;
-	}
-
-	
-	public static String replaceSpecial(String input)
-	{
-		int indexOfAmp = input.indexOf('&');
-		int indexOfSemi = input.indexOf(';');
-		if (indexOfAmp >= 0 && indexOfSemi > indexOfAmp)
-		{
-			String converted = input.replaceAll(STR_AMP, "&") //$NON-NLS-1$
-									.replaceAll(STR_SEMI, ";") //$NON-NLS-1$
-									.replaceAll(STR_QUOTE, "\"") //$NON-NLS-1$
-									.replaceAll(STR_APOS, "\'") //$NON-NLS-1$
-									.replaceAll(STR_LT, "<") //$NON-NLS-1$
-									.replaceAll(STR_GT, ">") //$NON-NLS-1$
-									.replaceAll(STR_NL, "\n") //$NON-NLS-1$
-									.replaceAll(STR_CR, "\r") //$NON-NLS-1$
-									.replaceAll(STR_EOL, "\0"); //$NON-NLS-1$
-			return converted;
-		}
-		else
-		{
-			return input;
-		}
-	}
-	
-	/**
-	 * Converts XML special character representations to the appropriate characters
-	 * @param input buffer to convert
-	 * @return the converted buffer
-	 */
-	public static String convertStringFromXML(String input)
-	{
-		if (input.indexOf('&') > -1)
-		{
-			return replaceSpecial(input);
-			/*
-			StringBuffer result = new StringBuffer();
-			
-			String[] tokens = splitString(input);
-			for (int i = 0; i < tokens.length; i++)
-			{
-				String token = tokens[i];
-				if (token.equals(STR_AMP_TRIMMED))
-				{
-					result.append('&');
-				}
-				else if (token.equals(STR_SEMI_TRIMMED))
-				{
-					result.append(';');
-				}
-				else if (token.equals(STR_QUOTE_TRIMMED))
-				{
-					result.append('"');
-				}
-				else if (token.equals(STR_APOS_TRIMMED))
-				{
-					result.append('\'');
-				}
-				else if (token.equals(STR_LT_TRIMMED))
-				{
-					result.append('<');
-				}
-				else if (token.equals(STR_GT_TRIMMED))
-				{
-					result.append('>');
-				}
-				else
-					result.append(token); 
-			}
-			
-	
-			return result.toString();
-			*/
-		}
-		else
-		{
-			return input;
-		}
-	}
-	
-	public class KeepAliveRequestThread extends Thread
-	{
-		private long _timeout;
-		private boolean _failed;
-		private Socket _socket;
-		
-		public KeepAliveRequestThread(long timeout, Socket socket)
-		{
-			_timeout = timeout;
-			_failed = false;
-			_socket = socket;
-		}
-		
-		public void run()
-		{
-			_dataStore.sendKeepAliveRequest();			
-			try
-			{
-				_socket.setSoTimeout((int)_timeout);
-				sleep(_timeout);
-			}
-			catch (SocketException e){
-			}
-			catch (InterruptedException e)
-			{
-				if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive thread interrupted."); //$NON-NLS-1$
-				return;
-			}
-			if (VERBOSE_KEEPALIVE) System.out.println("KeepAlive thread failed to be interrupted."); //$NON-NLS-1$
-			_failed = true;			
-		}
-		
-		public boolean failed()
-		{
-			return _failed;
-		}
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreKeyManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreKeyManager.java
deleted file mode 100644
index d96fc5a6f..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreKeyManager.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2009 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- * 
- * Contributors:
- * David McKnight  (IBM)  - [264858][dstore] OpenRSE always picks the first trusted certificate
- ********************************************************************************/
-package org.eclipse.dstore.internal.core.util.ssl;
-
-import java.net.Socket;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-
-import javax.net.ssl.X509KeyManager;
-
-public class DStoreKeyManager implements X509KeyManager {
-	
-	private X509KeyManager _keyManager;
-	private String _defaultAlias;
-	
-	public DStoreKeyManager(X509KeyManager keyManager, String defaultAlias){
-		_keyManager = keyManager;
-		_defaultAlias = defaultAlias;
-	}
-	
-	public String chooseClientAlias(String[] keyType, Principal[] issuers,
-			Socket socket) {
-		if (_defaultAlias != null){
-			return _defaultAlias;
-		}
-		else {
-			return _keyManager.chooseClientAlias(keyType, issuers, socket);
-		}
-	}
-
-	public String chooseServerAlias(String keyType, Principal[] issuers,
-			Socket socket) {
-		if (_defaultAlias != null){
-			return _defaultAlias;
-		}
-		else {
-			return _keyManager.chooseServerAlias(keyType, issuers, socket);
-		}
-	}
-
-	public X509Certificate[] getCertificateChain(String alias) {
-		return _keyManager.getCertificateChain(alias);
-	}
-
-	public String[] getClientAliases(String keyType, Principal[] issuers) {
-		return _keyManager.getClientAliases(keyType, issuers);
-	}
-
-	public PrivateKey getPrivateKey(String alias) {
-		return _keyManager.getPrivateKey(alias);
-	}
-
-	public String[] getServerAliases(String keyType, Principal[] issuers) {
-		return _keyManager.getServerAliases(keyType, issuers);
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreSSLContext.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreSSLContext.java
deleted file mode 100644
index b794bc08c..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DStoreSSLContext.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * Noriaki Takatsu  (IBM) - [259905][api] Provide a facility to use its own keystore
- * David McKnight  (IBM) - [259905][api] provide public API for getting/setting key managers for SSLContext
- * David McKnight  (IBM)  - [264858][dstore] OpenRSE always picks the first trusted certificate
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util.ssl;
-
-import java.security.KeyStore;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509KeyManager;
-
-import org.eclipse.dstore.core.util.ssl.BaseSSLContext;
-import org.eclipse.dstore.core.util.ssl.DStoreKeyStore;
-import org.eclipse.dstore.core.util.ssl.IDataStoreTrustManager;
-
-
-public class DStoreSSLContext
-{
-	
-	public static SSLContext getServerSSLContext(String filePath, String password)
-	{
-		SSLContext serverContext = null;
-
-		try
-		{
-			KeyManager[] keyManagers = BaseSSLContext.getKeyManagers();
-			if (keyManagers == null)
-			{
-				KeyStore ks = DStoreKeyStore.getKeyStore(filePath, password);
-				String keymgrAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
-				KeyManagerFactory kmf = KeyManagerFactory.getInstance(keymgrAlgorithm);
-				kmf.init(ks, password.toCharArray());								
-	
-				serverContext = SSLContext.getInstance("SSL"); //$NON-NLS-1$
-				
-				keyManagers = kmf.getKeyManagers();
-				
-				// read optional system property that indicates a default certificate alias
-				String defaultAlias = System.getProperty("DSTORE_DEFAULT_CERTIFICATE_ALIAS"); //$NON-NLS-1$
-				if (defaultAlias != null){
-					KeyManager[] x509KeyManagers = new X509KeyManager[10];
-				
-					for(int i=0;i<keyManagers.length; i++){
-						if(keyManagers[i] instanceof X509KeyManager){						
-							x509KeyManagers[i] = new DStoreKeyManager((X509KeyManager)keyManagers[i], defaultAlias);
-						}
-					}								
-					serverContext.init(x509KeyManagers, null, null);
-				}
-				else {
-					serverContext.init(keyManagers, null, null);
-				}
-			}
-			else
-			{
-				serverContext = SSLContext.getInstance("SSL"); //$NON-NLS-1$
-				serverContext.init(keyManagers, null, null);
-			}
-			
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-
-		return serverContext;
-	}
-	
-	public static SSLContext getClientSSLContext(String filePath, String password, IDataStoreTrustManager trustManager)
-	{
-		SSLContext clientContext = null;
-
-		try
-		{
-			trustManager.setKeystore(filePath, password);			
-			clientContext = SSLContext.getInstance("SSL"); //$NON-NLS-1$
-			TrustManager[] mgrs = new TrustManager[1];
-			mgrs[0] = trustManager;
-			
-			
-			KeyManager[] keyManagers = BaseSSLContext.getKeyManagers();
-			clientContext.init(keyManagers, mgrs, null);
-			}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-	
-		return clientContext;		
-	}
-	
-
-}
diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DataStoreTrustManager.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DataStoreTrustManager.java
deleted file mode 100644
index 23b934638..000000000
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/ssl/DataStoreTrustManager.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
- * David McKnight   (IBM) - [264858] [dstore] OpenRSE always picks the first trusted certificate
- * Noriaki Takatsu  (IBM) - [315333] [dstore] Correct Chained Certificates are rejected in the Client
- *******************************************************************************/
-
-package org.eclipse.dstore.internal.core.util.ssl;
-
-import java.security.KeyStore;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.eclipse.dstore.core.util.ssl.DStoreKeyStore;
-import org.eclipse.dstore.core.util.ssl.IDataStoreTrustManager;
-
-public class DataStoreTrustManager implements IDataStoreTrustManager
-{
-	private KeyStore _keystore;
-	private List _untrustedCerts;
-	private List _verifyExceptions;
-	
-	//private X509Certificate _untrustedCert;
-	//private Exception _verifyException;
-	
-	private List _trustedCerts;
-
-	public DataStoreTrustManager()
-	{
-		_trustedCerts = new ArrayList();
-		_untrustedCerts = new ArrayList();
-		_verifyExceptions = new ArrayList();
-	}
-	
-
-	public void setKeystore(String filePath, String password)
-	{
-		try
-		{
-			KeyStore ks = DStoreKeyStore.getKeyStore(filePath, password);
-			_keystore = ks;
-			loadTrustedCertificates();
-		}
-		catch (Exception e)
-		{
-			
-		}
-	}
-	
-	private void loadTrustedCertificates()
-	{
-		_trustedCerts.clear();
-		try
-		{
-			Enumeration aliases = _keystore.aliases();
-	
-			while (aliases.hasMoreElements())
-			{
-				String alias = (String) (aliases.nextElement());
-				
-				/* The alias may be either a key or a certificate */
-				java.security.cert.Certificate cert = _keystore.getCertificate(alias);
-				_trustedCerts.add(cert);
-			}
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-	}
-
-	
-	public List getUntrustedCerts()
-	{
-		return _untrustedCerts;
-	}
-	
-	public List getVerifyExceptions()
-	{
-		return _verifyExceptions;
-	}
-
-	private void checkTrusted(X509Certificate[] certs, String arg1) throws CertificateException
-	{
-		_untrustedCerts.clear();
-		_verifyExceptions.clear();
-		
-
-		for (int i = 0; i < certs.length; i++)
-		{
-			X509Certificate cert = certs[i];
-			boolean foundMatch = false;
-			if (_trustedCerts.size() > 0)
-			{
-		
-				for (int j = 0; j < _trustedCerts.size() && !foundMatch; j++)
-				{
-					X509Certificate tcert = (X509Certificate)_trustedCerts.get(j);
-					try
-					{
-						cert.verify(tcert.getPublicKey());
-						foundMatch = true;					
-					}
-					catch (Exception e)
-					{		
-					}
-				}									
-			}	
-			if (!foundMatch)
-			{
-				_untrustedCerts.add(cert);
-			}
-		}	
-		if (_trustedCerts.size() == 0 || _untrustedCerts.size() > 0)
-		{
-			throw new CertificateException();
-		}
-	}
-	
-	public void checkClientTrusted(X509Certificate[] certs, String arg1) throws CertificateException
-	{
-		checkTrusted(certs, arg1);
-
-	}
-
-	public void checkServerTrusted(X509Certificate[] certs, String arg1) throws CertificateException
-	{
-		checkTrusted(certs,arg1);
-	}
-
-	public X509Certificate[] getAcceptedIssuers()
-	{
-		return null;
-	}
-
-
-
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath
deleted file mode 100644
index 089217cde..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/dstore/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.cvsignore b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.project b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.project
deleted file mode 100644
index 1e7ae5944..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.connectorservice.dstore</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/.api_filters b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/.api_filters
deleted file mode 100644
index b92dee4eb..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/.api_filters
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.rse.connectorservice.dstore" version="2">
-    <resource path="src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java" type="org.eclipse.rse.connectorservice.dstore.DStoreConnectorService">
-        <filter id="572522506">
-            <message_arguments>
-                <message_argument value="ConnectionStatus"/>
-                <message_argument value="DStoreConnectorService"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 381fc6eb0..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
deleted file mode 100644
index ddd543917..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.connectorservice.dstore;singleton:=true
-Bundle-Version: 3.1.100.qualifier
-Bundle-Activator: org.eclipse.rse.internal.connectorservice.dstore.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.rse.services.dstore;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.dstore.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.dstore.extra;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.rse.core;bundle-version="[3.0.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Export-Package: 
- org.eclipse.rse.connectorservice.dstore,
- org.eclipse.rse.connectorservice.dstore.util,
- org.eclipse.rse.internal.connectorservice.dstore;x-internal:=true,
- org.eclipse.rse.internal.connectorservice.dstore.ui.propertypages;x-internal:=true
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/about.html b/rse/plugins/org.eclipse.rse.connectorservice.dstore/about.html
deleted file mode 100644
index d4cc693f9..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties
deleted file mode 100644
index 7911f574b..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties
deleted file mode 100644
index 928d1e7e8..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-#  Copyright (c) 2000, 2009 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE DStore Connector Service
-providerName = Eclipse.org - DSDP
-
-# START NON-TRANSLATABLE
-PreferencePage.Datastore = DataStore
-# END NON-TRANSLATABLE
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.xml b/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.xml
deleted file mode 100644
index 219eb8b28..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2008 IBM Corporation and others. All rights reserved.
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Initial Contributors:
-The following IBM employees contributed to the Remote System Explorer component 
-that contains this file: David McKnight
-
-Contributors:
--->
-<?eclipse version="3.0"?>
-<plugin>
-	<extension
-		point="org.eclipse.ui.preferencePages">
-      <page
-            name="%PreferencePage.Datastore"
-            category="org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage"
-            class="org.eclipse.rse.internal.connectorservice.dstore.ui.propertypages.DStorePreferencePage"
-            id="org.eclipse.rse.connectorservice.DStorePreferences">
-      </page>
-    </extension>
-</plugin>
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
deleted file mode 100644
index 3d8c7234a..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
+++ /dev/null
@@ -1,1594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
- * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
- * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
- * David McKnight   (IBM)        - [202822] need to enable spiriting on the server side
- * David McKnight   (IBM)        - [199565] taking out synchronize for internalConnect
- * David McKnight   (IBM)        - [205986] attempt SSL before non-SSL for daemon connect
- * David McKnight   (IBM)        - [186363] get rid of obsolete calls to SubSystem.connect()
- * David McKnight   (IBM)        - [196624] dstore miner IDs should be String constants rather than dynamic lookup
- * David McKnight   (IBM)        - [216596] dstore preferences (timeout, and others)
- * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
- * David McKnight   (IBM)        - [218685] [api][breaking][dstore] Unable to connect when using SSL.
- * David McKnight  (IBM)         - [220123][dstore] Configurable timeout on irresponsiveness
- * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
- * David McKnight   (IBM)        - [220123] [api][dstore] Configurable timeout on irresponsiveness
- * David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
- * David Dykstal (IBM) - [225089][ssh][shells][api] Canceling connection leads to exception
- * David McKnight   (IBM)        - [227406] [dstore] DStoreFileService must listen to buffer size preference changes
- * David McKnight   (IBM)        - [228334][api][breaking][dstore] Default DataStore connection timeout is too short
- * David McKnight   (IBM)        - [235756] [dstore] Unable to connect to host with SSL via REXEC
- * David McKnight   (IBM)        - [244116] [dstore][daemon][ssl]  Connecting to RSE server doesn't complete when the connection is SSL
- * David McKnight   (IBM)        - [233160] [dstore] SSL/non-SSL alert are not appropriate
- * David Dykstal (IBM) [235284] Cancel password change causes problem
- * David McKnight   (IBM)        - [267236] [dstore] Can't connect after a wrong password
- * David McKnight   (IBM)        - [274688] [api][dstore] DStoreConnectorService.internalConnect() needs to be cleaned up
- * David McKnight   (IBM)        - [258529] Unable to display connection failure error message
- * David McKnight   (IBM)        - [306989] [dstore] workspace in strange condition if expanding projects during  logon
- * David McKnight   (IBM)        - [313653] [dstore] Not Secured using SSL message appears twice per connect
- *******************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.security.cert.X509Certificate;
-import java.util.List;
-
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.dstore.core.client.ClientConnection;
-import org.eclipse.dstore.core.client.ConnectionStatus;
-import org.eclipse.dstore.core.java.IRemoteClassInstance;
-import org.eclipse.dstore.core.java.RemoteClassLoader;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.IDataStoreConstants;
-import org.eclipse.dstore.core.model.IDataStoreProvider;
-import org.eclipse.dstore.core.model.ISSLProperties;
-import org.eclipse.dstore.internal.core.client.ClientSSLProperties;
-import org.eclipse.dstore.internal.core.util.XMLparser;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.rse.connectorservice.dstore.util.ConnectionStatusListener;
-import org.eclipse.rse.connectorservice.dstore.util.StatusMonitor;
-import org.eclipse.rse.connectorservice.dstore.util.StatusMonitorFactory;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.comm.ISystemKeystoreProvider;
-import org.eclipse.rse.core.comm.SystemKeystoreProviderManager;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.SystemSignonInformation;
-import org.eclipse.rse.core.subsystems.CommunicationsEvent;
-import org.eclipse.rse.core.subsystems.IRemoteServerLauncher;
-import org.eclipse.rse.core.subsystems.IServerLauncher;
-import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.ServerLaunchType;
-import org.eclipse.rse.core.subsystems.SubSystem;
-import org.eclipse.rse.dstore.universal.miners.IUniversalDataStoreConstants;
-import org.eclipse.rse.internal.connectorservice.dstore.Activator;
-import org.eclipse.rse.internal.connectorservice.dstore.ConnectorServiceResources;
-import org.eclipse.rse.internal.connectorservice.dstore.IConnectorServiceMessageIds;
-import org.eclipse.rse.internal.connectorservice.dstore.RexecDstoreServer;
-import org.eclipse.rse.internal.ui.SystemPropertyResources;
-import org.eclipse.rse.services.clientserver.messages.CommonMessages;
-import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
-import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.ui.ISystemPreferencesConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.actions.DisplayHidableSystemMessageAction;
-import org.eclipse.rse.ui.actions.DisplaySystemMessageAction;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.rse.ui.subsystems.StandardConnectorService;
-import org.eclipse.swt.widgets.Display;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
-
-/**
- * System class required by the remote systems framework.
- * This represents the live connection at tool runtime.
- * <p>
- * The universal subsystems are based on datastore technology so we use that
- * to do the connection.
- */
-public class DStoreConnectorService extends StandardConnectorService implements IDataStoreProvider
-{
-	private class ConnectionStatusPair {
-		private ConnectionStatus _connectStatus;
-		private ConnectionStatus _launchStatus;
-		private Boolean _alertedNonSSL;
-		
-		public ConnectionStatusPair(ConnectionStatus connectStatus, ConnectionStatus launchStatus, Boolean alertedNonSSL){
-			_connectStatus = connectStatus;
-			_launchStatus = launchStatus;
-			_alertedNonSSL = alertedNonSSL;
-		}
-		
-		public ConnectionStatus getConnectStatus(){
-			return _connectStatus;
-		}
-		
-		public ConnectionStatus getLaunchStatus(){
-			return _launchStatus;
-		}
-		
-		public Boolean getAlertedNonSSL(){
-			return _alertedNonSSL;
-		}
-	}
-	
-	private class StartSpiritThread extends Thread
-	{
-		private DataStore _dataStore;
-		public StartSpiritThread(DataStore dataStore)
-		{
-			_dataStore = dataStore;
-		}
-
-		public void run()
-		{
-			if (_dataStore.isDoSpirit()) _dataStore.queryServerSpiritState();
-		}
-	}
-
-	private ClientConnection clientConnection = null;
-	private ConnectionStatusListener _connectionStatusListener = null;
-	private IServerLauncher starter = null;
-	private IServerLauncherProperties _remoteServerLauncherProperties = null;
-	private boolean _isConnecting = false;
-
-	// Shortcut to sysInfo to save time
-	private transient DataElement sysInfo = null;
-	private transient DataElement installInfo = null;
-	private transient DataElement clientIP = null;
-	private static String DSTORE_PACKAGE = "org.eclipse.dstore.core"; //$NON-NLS-1$
-
-	private Exception connectException;
-	private class ShowConnectMessage implements Runnable
-	{
-		private SystemMessage _msg;
-		public ShowConnectMessage(SystemMessage msg)
-		{
-			_msg = msg;
-		}
-
-		public void run()
-		{
-			SystemMessageDialog dlg = new SystemMessageDialog(SystemBasePlugin.getActiveWorkbenchShell(), _msg);
-			dlg.open();
-		}
-	}
-
-	/**
-	 * Constructor when we don't have a subsystem yet.
-	 * Call setSubSystem after.
-	 */
-	public DStoreConnectorService(String name, String description, IHost host)
-	{
-		super(name, description, host, 0);
-	}
-
-
-	public int getServerVersion()
-	{
-		return clientConnection.getServerVersion();
-	}
-
-	public int getServerMinor()
-	{
-		return clientConnection.getServerMinor();
-	}
-
-	/**
-	 * Retrieve the value of a property which is contained in the environment miners
-	 * system info child.  Currently supported properties:
-	 * <ul>
-	 * 		<li>os.name
-	 * 		<li>os.version
-	 *  	<li>user.home
-	 *  	<li>temp.dir
-	 * </ul>
-	 * @return The String value of the property or "" if the property was not found.
-	 */
-	private String getSystemInfoProperty(String propertyName)
-	{
-		// System properties require a connection
-		if (!isConnected())
-		{
-			try
-			{
-				ISubSystem ss = getPrimarySubSystem();
-				if (ss != null)
-				{
-					if (Display.getCurrent() == null) {
-						ss.connect(new NullProgressMonitor(), false);
-					} else {
-						ss.connect(false, null);
-					}
-				}
-			}
-			catch (Exception e)
-			{
-				SystemBasePlugin.logError("UniversalSystem.getSystemInfoProperty: error during connect", e); //$NON-NLS-1$
-				return ""; //$NON-NLS-1$
-			}
-		}
-
-		String propertyValue = null;
-		DataElement envMinerData = null;
-		DataStore ds = getDataStore();
-
-		// Check if we have sysInfo cached already
-		if (sysInfo == null)
-		{
-			envMinerData = ds.findMinerInformation(IUniversalDataStoreConstants.UNIVERSAL_ENVIRONMENT_MINER_ID);
-			if (envMinerData != null)
-			{
-				sysInfo = ds.find(envMinerData, DE.A_NAME, "systemInfo", 1); //$NON-NLS-1$
-			}
-		}
-
-		if (sysInfo != null)
-		{
-			DataElement propertyNode = ds.find(sysInfo, DE.A_NAME, propertyName, 1);
-			if (propertyNode != null)
-			{
-				propertyValue = propertyNode.getSource();
-			}
-			else
-				propertyValue = ""; //$NON-NLS-1$
-		}
-		else
-		{
-			// at connect time, the info node is not guaranteed to be present, so this gets logged a lot
-			// it doesn't cause any functional problems, so I'm commenting this out
-			//SystemBasePlugin.logError("UniversalSystem.getSystemInfoNode:  sysInfo node not found", null); //$NON-NLS-1$
-			//SystemBasePlugin.logError("UniversalSystem.getSystemInfoNode:  miner data = " + envMinerData, null); //$NON-NLS-1$
-			propertyValue = ""; //$NON-NLS-1$
-		}
-
-		return propertyValue;
-	}
-
-	/**
-	 * Return the version, release, modification of the remote system
-	 */
-	public String getVersionReleaseModification()
-	{
-		if (!isConnected())
-			return SystemPropertyResources.RESID_TERM_NOTAVAILABLE;
-
-		StringBuffer buffer = new StringBuffer(getSystemInfoProperty("os.name")); //$NON-NLS-1$
-		buffer.append(" "); //$NON-NLS-1$
-		buffer.append(getSystemInfoProperty("os.version")); //$NON-NLS-1$
-
-		return buffer.toString();
-	}
-
-	/**
-	 * Return the home directory of the remote system for the current user, if available.
-	 */
-	public String getHomeDirectory()
-	{
-		return getSystemInfoProperty("user.home"); //$NON-NLS-1$
-	}
-
-	public boolean runClassInstanceRemotely(IRemoteClassInstance instance)
-	{
-		DataStore dataStore = getDataStore();
-		dataStore.registerLocalClassLoader(instance.getClass().getClassLoader());
-		dataStore.runRemoteClassInstance(instance);
-		return true;
-	}
-
-	/**
-	 * Return the location where the RSE server is installed
-	 * @return the server install location
-	 */
-	public String getServerInstallPath()
-	{
-	    if (clientConnection != null)
-	    {
-	    	if (installInfo == null)
-	    	{
-	    		DataStore ds = clientConnection.getDataStore();
-	    		installInfo = ds.queryInstall();
-	    	}
-	        return installInfo.getAttribute(DE.A_SOURCE);
-	    }
-	    return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the Client IP that the RSE server is connected to.  When connected,
-	 * the client IP is obtained from the server-side.   When not-connected,
-	 * the fall back is to get the IP locally (note that the IP obtained locally
-	 * may be not be what you want when using VPN).
-	 * @return the client ip
-	 */
-	public String getClientIP()
-	{
-	    if (clientConnection != null && clientConnection.isConnected())
-	    {
-	        if (clientIP == null)
-	        {
-	        	DataStore ds = clientConnection.getDataStore();
-	        	clientIP = ds.queryClientIP();
-	        }
-	        return clientIP.getAttribute(DE.A_SOURCE);
-	    }
-
-	    // fall back to getting local machine ip address
-	    // this may be incorrect for the server in certain cases
-	    // like over VPN
-	    return RSECorePlugin.getLocalMachineIPAddress();
-	}
-
-	/**
-	 * Return the temp directory of the remote system for the current user, if available.
-	 */
-	public String getTempDirectory()
-	{
-		return getSystemInfoProperty("temp.dir"); //$NON-NLS-1$
-	}
-
-	protected int getSocketTimeOutValue()
-	{
-		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-		return store.getInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT);
-	}
-
-	/**
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#disconnect(IProgressMonitor)
-	 */
-	protected void internalDisconnect(IProgressMonitor monitor) throws Exception
-	{
-		try
-		{
-			if (clientConnection != null)
-			{
-				// Is disconnect being called because the network (connection) went down?
-				if (_connectionStatusListener != null && _connectionStatusListener.isConnectionDown())
-				{
-					notifyError();
-				}
-				else
-				{
-					// Fire comm event to signal state about to change
-					fireCommunicationsEvent(CommunicationsEvent.BEFORE_DISCONNECT);
-				}
-
-				DataStore dataStore = getDataStore();
-				if (dataStore != null && _connectionStatusListener != null)
-				{
-					dataStore.getDomainNotifier().removeDomainListener(_connectionStatusListener);
-				}
-				if (clientConnection != null)
-				{
-					clientConnection.disconnect();
-				}
-
-//				 Fire comm event to signal state changed
-				notifyDisconnection();
-
-				clientConnection = null;
-				// DKM - no need to clear uid cache
-				clearPassword(false, true); // clear in-memory password
-				//clearUserIdCache(); // Clear any cached local user IDs
-				sysInfo = null;
-				installInfo = null;
-				clientIP = null;
-
-
-			}
-		}
-		catch (Exception exc)
-		{
-			throw new java.lang.reflect.InvocationTargetException(exc);
-		}
-	}
-
-	private IRemoteServerLauncher getDStoreServerLauncher()
-	{
-		IServerLauncherProperties sl = getRemoteServerLauncherProperties();
-		//System.out.println("in UniversalSystem#getServerLauncher: sl = "+sl);
-		if (sl != null && sl instanceof IRemoteServerLauncher)
-		{
-			return (IRemoteServerLauncher)sl;
-		}
-		else
-			//return ((SubSystemConfigurationImpl)ss.getParentSubSystemConfiguration()).getDefaultIBMServerLauncher(ss);
-			return null; // should never happen!
-	}
-
-	protected void setPluginPathProperty()
-	{
-		Bundle bundle = RSEUIPlugin.getDefault().getBundle();
-		URL pluginsURL = bundle.getEntry("/"); //$NON-NLS-1$
-
-		try
-		{
-			String path = FileLocator.resolve(pluginsURL).getPath();
-			File systemsPluginDir = new File(path);
-			path = systemsPluginDir.getParentFile().getAbsolutePath();
-			String version = (String)(bundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION));
-			Version v = new Version(version);
-			String versionString = v.toString();
-			String dstorePath = getDStorePath(path, versionString);
-			System.setProperty("A_PLUGIN_PATH", dstorePath); //$NON-NLS-1$
-		}
-		catch (IOException e)
-		{
-		}
-	}
-
-	private String getDStorePath(String pluginDir, String version)
-	{
-			File dstorePath = new File(pluginDir + "/" + DSTORE_PACKAGE + "_" + version); //$NON-NLS-1$  //$NON-NLS-2$
-			if (!dstorePath.exists())
-			{
-				// might be in workspace
-				dstorePath = new File(pluginDir + "/" + DSTORE_PACKAGE); //$NON-NLS-1$
-			}
-
-		return dstorePath.getAbsolutePath();
-	}
-
-	/**
-	 * Return if you support remotely launching a server script
-	 * @deprecated Use instead {@link #isServerLaunchTypeEnabled(ISubSystem, ServerLaunchType)}
-	 *  or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}
-	 */
-	public boolean getRexecLaunchEnabled(SubSystem subsystemImpl) {
-		return isServerLaunchTypeEnabled(subsystemImpl, ServerLaunchType.REXEC_LITERAL);
-	}
-
-
-	/**
-	 * Return if you support connecting to a server already running
-	 * @deprecated Use instead {@link #isServerLaunchTypeEnabled(ISubSystem, ServerLaunchType)}
-	 *  or {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}
-	 */
-	public boolean getNoLaunchEnabled(SubSystem subsystemImpl) {
-		return isServerLaunchTypeEnabled(subsystemImpl, ServerLaunchType.RUNNING_LITERAL);
-	}
-
-	/**
-	 * Return the remote server launcher, which implements IServerLauncher.
-	 * This is called by the default implementation of connect, if
-	 * subsystem.getParentSubSystemConfiguration().supportsServerLaunchProperties returns true.
-	 */
-	public IServerLauncher getRemoteServerLauncher()
-	{
-
-		if (starter == null)
-		  starter = new RexecDstoreServer();
-		((RexecDstoreServer)starter).setClientConnection(clientConnection);
-		((RexecDstoreServer)starter).setSocketTimeoutValue(getSocketTimeOutValue());
-		return starter;
-	}
-
-	public IServerLauncherProperties getRemoteServerLauncherProperties() {
-		return _remoteServerLauncherProperties;
-	}
-
-	public void setRemoteServerLauncherProperties(IServerLauncherProperties newRemoteServerLauncher) {
-		if (_remoteServerLauncherProperties != newRemoteServerLauncher)
-		{
-			_remoteServerLauncherProperties = newRemoteServerLauncher;
-			setDirty(true);
-		}
-	}
-	
-	/**
-	 *  Connect to the server by using REXEC as a daemon to launch it.
-	 *  
-	 * @param info the signon information
-	 * @param serverLauncher the server launcher
-	 * @param monitor the progress monitor
-	 * 
-	 * @return the connection status
-	 *  
-	 * @since 3.1
-	 */
-	protected ConnectionStatus connectWithREXEC(SystemSignonInformation info, IRemoteServerLauncher serverLauncher, IProgressMonitor monitor) throws Exception {
-		if (monitor != null) {
-			String cmsg = ConnectorServiceResources.MSG_STARTING_SERVER_VIA_REXEC;
-			monitor.subTask(cmsg);
-		}
-
-		ConnectionStatus connectStatus = null;
-		boolean autoDetectSSL = true;
-		if (serverLauncher != null){
-		    autoDetectSSL = serverLauncher.getAutoDetectSSL();
-		}
-
-		// GC: - if failed to get a connection in another way, try
-		// starting the datastore server with rexec
-		IServerLauncher starter = getRemoteServerLauncher();
-		starter.setSignonInformation(info);
-		starter.setServerLauncherProperties(serverLauncher);
-		
-		// get Socket Timeout Value Preference
-		int timeout = getSocketTimeOutValue();
-		
-		if (starter instanceof RexecDstoreServer){
-			((RexecDstoreServer)starter).setSocketTimeoutValue(timeout);
-		}		
-		
-		if (autoDetectSSL) timeout = 3000;
-		else setSSLProperties(isUsingSSL());
-
-		int iServerPort = launchUsingRexec(info, serverLauncher, monitor);
-
-		if(iServerPort != 0)
-		{
-			clientConnection.setPort("" + iServerPort); //$NON-NLS-1$
-
-			if (monitor != null) {
-				String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECTING_TO_SERVER, clientConnection.getPort());
-				monitor.subTask(cmsg);
-			}
-
-			// connect to launched server
-			connectStatus = clientConnection.connect(null, timeout);
-			if (!connectStatus.isConnected() && connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT) && autoDetectSSL){
-				if (setSSLProperties(true)){
-					iServerPort = launchUsingRexec(info, serverLauncher, monitor);
-					if (iServerPort != 0)
-					{
-						clientConnection.setPort("" + iServerPort); //$NON-NLS-1$
-						connectStatus = clientConnection.connect(null, timeout);
-					}
-				}
-			}
-		}
-		else {
-			connectStatus = new ConnectionStatus(false);
-			SystemMessage msg = starter.getErrorMessage();
-			String errorMsg = null;
-			if (msg == null)
-			{
-				errorMsg = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED, getHostName());
-			}
-			else
-			{
-				errorMsg = msg.getLevelTwoText();
-			}
-			connectStatus.setMessage(errorMsg);
-		}
-		return connectStatus;
-	}
-	
-	/**
-	 * Connection to a server via the RSE daemon.
-	 * 
-	 * @param info the signon information
-	 * @param serverLauncher the server launcher
-	 * @param alertedNONSSL indication of whether an alert for NON-ssl has already been issued
-	 * @param monitor the progress monitor
-	 * 
-	 * @return a pair of connection statuses - the launch status for the daemon and the connect status for the server
-	 * @since 3.1
-	 */
-	protected ConnectionStatusPair connectWithDaemon(SystemSignonInformation info, IRemoteServerLauncher serverLauncher, Boolean alertedNONSSL, IProgressMonitor monitor) throws InterruptedException {
-		if (monitor != null) {
-			String cmsg = ConnectorServiceResources.MSG_STARTING_SERVER_VIA_DAEMON;
-			monitor.subTask(cmsg);
-		}
-
-		ConnectionStatus connectStatus = null;
-		
-		// DY:  getLocalUserId() may return null for Windows connections because
-		// we no longer prompt for userid / pwd.  But for other connections the userid
-		// should be the same as the one stored in the password info (and for Windows
-		// this will be the temp remoteuser userid.
-		//launchStatus = clientConnection.launchServer(getLocalUserId(), getPassword(getPasswordInformation()));
-
-		
-		int daemonPort = 0;
-		if (serverLauncher != null)
-			daemonPort = serverLauncher.getDaemonPort();
-
-		// 205986  FIRST TRY SSL, THEN NON-SECURE!
-		boolean usedSSL = true;
-		setSSLProperties(true);
-		
-		// get Socket Timeout Value Preference
-		int timeout = getSocketTimeOutValue();
-
-		ConnectionStatus launchStatus = launchServer(clientConnection, info, daemonPort, monitor, timeout);
-		if (!launchStatus.isConnected() && !clientConnection.isKnownStatus(launchStatus.getMessage()))
-		{
-			Throwable conE = launchStatus.getException();
-			if (conE instanceof SSLHandshakeException)
-			{
-				List certs = launchStatus.getUntrustedCertificates();
-				if (certs != null && certs.size() > 0)
-				{
-					ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-					if (provider != null){
-						if (provider.importCertificates(certs, getHostName())){
-							return connectWithDaemon(info, serverLauncher, alertedNONSSL, monitor);
-						}
-						else{
-							_isConnecting = false;
-							throw new InterruptedException();
-						}
-					}
-				}
-
-			}
-
-			if (setSSLProperties(false))
-			{
-				usedSSL = false;
-
-				boolean allowNonSSL = true;
-				// warning before launch without SSL
-				IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-				if (store.getBoolean(ISystemPreferencesConstants.ALERT_NONSSL))
-				{
-					String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_NOT_USING_SSL, getHostName());
-					SystemMessage msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_NOT_USING_SSL, IStatus.INFO, cmsg);
-
-					DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_NONSSL);
-					Display.getDefault().syncExec(msgAction);
-					if (msgAction.getReturnCode() != IDialogConstants.YES_ID){
-						allowNonSSL = false;
-					} else {
-						alertedNONSSL = new Boolean(true); // changing value to true
-					}						
-				}
-				if (allowNonSSL){
-					launchStatus = launchServer(clientConnection, info, daemonPort, monitor, timeout);
-				}
-				else {
-					_isConnecting = false;
-					clientConnection = null;
-					
-					throw new OperationCanceledException();
-				}
-			}
-		}
-
-		if (!launchStatus.isConnected()) { // launch failed
-			String launchMsg = launchStatus.getMessage();
-			// If password has expired and must be changed
-			if (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
-			{
-				SystemSignonInformation oldCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials();
-				SystemSignonInformation newCredentials = null;
-				while (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
-				{
-					String pmsg = null;
-					String pmsgDetails = null;
-					String msgId = null;
-					boolean expired = isPasswordExpired(launchMsg);
-					if (expired){
-						pmsg = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED;
-						pmsgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS;
-						msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_EXPIRED;
-					}
-					else {
-						pmsg = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID;
-						pmsgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID_DETAILS;
-						msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_INVALID;
-					}
-
-					SystemMessage message = createSystemMessage(msgId,IStatus.ERROR, pmsg, pmsgDetails);
-					try {
-						getCredentialsProvider().repairCredentials(message);
-					} catch (OperationCanceledException e) {
-						_isConnecting = false;
-						clientConnection = null;
-						throw e;
-					}
-					newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials();
-					launchStatus = changePassword(clientConnection, oldCredentials, serverLauncher, monitor, newCredentials.getPassword());
-					launchMsg = launchStatus.getMessage();
-				}
-				if (newCredentials != null){
-					info = newCredentials;
-				}
-				if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT)){
-					return connectWithDaemon(info, serverLauncher, alertedNONSSL, monitor);
-				}
-			}
-			else if (launchMsg != null && isPortOutOfRange(launchMsg))
-			{
-				_isConnecting = false;
-
-				int colonIndex = launchMsg.indexOf(':');
-				String portRange = launchMsg.substring(colonIndex + 1);
-
-				String pmsg =NLS.bind(ConnectorServiceResources.MSG_PORT_OUT_RANGE, portRange);
-				SystemMessage message = createSystemMessage(IConnectorServiceMessageIds.MSG_PORT_OUT_RANGE, IStatus.ERROR, pmsg);
-
-				// message handled here
-				ShowConnectMessage msgAction = new ShowConnectMessage(message);
-				Display.getDefault().asyncExec(msgAction);
-				return null; // null here indicates no further processing required by internalConnect
-			}
-			else
-			{
-				SystemBasePlugin.logError("Error launching server: " + launchStatus.getMessage(), null); //$NON-NLS-1$
-			}
-		}
-		else { // launch succeeded
-			if (monitor != null)
-			{
-				if (clientConnection == null){
-					SystemBasePlugin.logError("client connection is null!"); //$NON-NLS-1$
-				}
-				String pmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECTING_TO_SERVER, clientConnection.getPort());
-				monitor.subTask(pmsg);
-			}
-			// connect to launched server
-			connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout);
-			Throwable conE = connectStatus.getException();
-
-			if (!connectStatus.isConnected() &&
-					(connectStatus.getMessage().startsWith(ClientConnection.CANNOT_CONNECT) || conE instanceof SSLException)) { // failed to connect to the server that was launched 
-				if (conE instanceof SSLHandshakeException){ // cause of failure was an SSL handshake exception
-					List certs = connectStatus.getUntrustedCertificates();
-					if (certs != null && certs.size() > 0) {
-						ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-						if (provider != null){							
-							if (provider.importCertificates(certs, getHostName())) { // import the certificates and try again								
-								return connectWithDaemon(info, serverLauncher, alertedNONSSL, monitor);
-							}
-							else {
-								_isConnecting = false;
-								throw new InterruptedException();
-							}
-						}
-					}
-				}
-				
-				// relaunching the server via the daemon so that we can connect again to the launched server with toggled useSSL settings
-				launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
-				if (launchStatus.isConnected()) {
-					if (setSSLProperties(!usedSSL)){
-						connectStatus = clientConnection.connect(launchStatus.getTicket(), timeout);
-					}
-				}
-			}
-			
-			// failure to connect diagnosis - not sure why this is here since I would expect this case was already handled
-			// leaving it here just in case - will review later
-			if (!connectStatus.isConnected() && connectStatus.isSLLProblem())
-			{
-				List certs = connectStatus.getUntrustedCertificates();
-				if (certs != null && certs.size() > 0) {
-					ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-					if (provider != null) {
-						if (provider.importCertificates(certs, getHostName())){
-							return connectWithDaemon(info, serverLauncher, alertedNONSSL, monitor);
-						}
-						else {
-							_isConnecting = false;
-							throw new InterruptedException();
-						}
-					}
-				}
-			}
-		} 
-
-		return new ConnectionStatusPair(connectStatus, launchStatus, alertedNONSSL);
-	}
-	
-	/**
-	 *  Connect to a running server.
-	 *  
-	 * @param monitor the progress monitor
-	 * 
-	 * @return the connection status
-	 * @since 3.1
-	 */
-	protected ConnectionStatus connectWithRunning(IProgressMonitor monitor){
-		if (monitor != null)
-		{
-			String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECTING_TO_SERVER, clientConnection.getPort());
-			monitor.subTask(cmsg);
-		}
-		// connect directly
-		boolean useSSL = isUsingSSL();
-		setSSLProperties(useSSL);
-		
-		// get Socket Timeout Value Preference
-		int timeout = getSocketTimeOutValue();
-		return clientConnection.connect(null, timeout);
-	}
-	
-	/**
-	 * Connect via an overridden launchServer method
-	 * 
-	 * @param clientConnection the clientConnection
-	 * @param info the signon info
-	 * @param serverLauncher the server launcher
-	 * @param monitor the progress monitor
-	 * 
-	 * @return the connection status
-	 * 
-	 * @since 3.1
-	 */
-	protected ConnectionStatus connectWithOther(ClientConnection clientConnection, SystemSignonInformation info, IServerLauncherProperties serverLauncher, IProgressMonitor monitor) throws Exception {
-		ConnectionStatus connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
-		if (!connectStatus.isConnected() && !clientConnection.isKnownStatus(connectStatus.getMessage())){
-			if (connectStatus.isSLLProblem()){
-				if (setSSLProperties(true)){
-					connectStatus = launchServer(clientConnection, info, serverLauncher, monitor);
-					if (!connectStatus.isConnected() && connectStatus.isSLLProblem()){						
-						List certs = connectStatus.getUntrustedCertificates();
-						if (certs != null && certs.size() > 0){ // we have untrusted certificates - so import them
-							ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-							if (provider != null){
-								if (provider.importCertificates(certs, getHostName())){
-									return connectWithOther(clientConnection, info, serverLauncher, monitor);
-								}
-								else
-								{
-									_isConnecting = false;
-									throw new InterruptedException();
-								}
-							}
-						}
-						else { // SSL connect problem
-							return null;
-						}
-					}
-				}
-			}
-		}
-		return connectStatus;
-	}
-	/**
-	 * Initialize the DataStore connection.
-	 * 
-	 * @param launchStatus the launch status if the server was launched via the daemon.  Otherwise, null.
-	 * @param connectStatus the connect status for the server
-	 * @param alertedNONSSL a boolean indicating whether the user has been alerted to a NON-ssl connection
-	 * @param monitor the status monitor
-	 * 
-	 * @since 3.1
-	 */
-	protected void initializeConnection(ConnectionStatus launchStatus, ConnectionStatus connectStatus, Boolean alertedNONSSL, IProgressMonitor monitor) throws Exception {
-		SystemMessage msg = null;
-		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-		if (clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_SSL))
-		{
-			String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_USING_SSL, getHostName());
-			msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_USING_SSL, IStatus.INFO, cmsg);
-
-			DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_SSL);
-			Display.getDefault().syncExec(msgAction);
-			if (msgAction.getReturnCode() != IDialogConstants.YES_ID)
-			{			
-				internalDisconnect(monitor);
-				_isConnecting = false;
-				throw new InterruptedException();
-			}
-		}
-		else if (!clientConnection.getDataStore().usingSSL() && store.getBoolean(ISystemPreferencesConstants.ALERT_NONSSL))
-		{
-			if (!alertedNONSSL.booleanValue()){ // only alert if we haven't already
-				String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_NOT_USING_SSL, getHostName());
-				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_NOT_USING_SSL, IStatus.INFO, cmsg);
-				
-				DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, ISystemPreferencesConstants.ALERT_NONSSL);
-				Display.getDefault().syncExec(msgAction);
-				if (msgAction.getReturnCode() != IDialogConstants.YES_ID)
-				{
-					internalDisconnect(monitor);
-					_isConnecting = false;
-					throw new InterruptedException();
-				}
-			}
-		}
-
-		DataStore dataStore = clientConnection.getDataStore();
-
-		_connectionStatusListener = new ConnectionStatusListener(dataStore.getStatus(), this);
-		dataStore.getDomainNotifier().addDomainListener(_connectionStatusListener);
-
-		StatusMonitor statusMonitor = StatusMonitorFactory.getInstance().getStatusMonitorFor(this, dataStore);
-
-		if (launchStatus != null && launchStatus.isConnected())
-		{
-			DataElement ticket = dataStore.createTicket(launchStatus.getTicket());
-			dataStore.queryShowTicket(ticket);
-		}
-		else
-		{
-			dataStore.showTicket(null);
-		}
-
-		StartSpiritThread thread = new StartSpiritThread(dataStore);
-		thread.start();
-
-		// Fire comm event to signal state changed
-		fireCommunicationsEvent(CommunicationsEvent.AFTER_CONNECT);
-
-		// is there a warning message?
-		String message = connectStatus.getMessage();
-		if (message != null)
-		{
-			if (message.startsWith(ClientConnection.CLIENT_OLDER))
-			{
-				String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_CLIENT_OLDER_WARNING, getHostName());
-				String cmsgDetail = ConnectorServiceResources.MSG_COMM_CLIENT_OLDER_WARNING_DETAILS;
-
-				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_CLIENT_OLDER_WARNING, IStatus.WARNING, cmsg, cmsgDetail);
-
-			}
-			else if (message.startsWith(ClientConnection.SERVER_OLDER))
-			{
-				String cmsg = NLS.bind(ConnectorServiceResources.MSG_COMM_SERVER_OLDER_WARNING, getHostName());
-				String cmsgDetail = ConnectorServiceResources.MSG_COMM_SERVER_OLDER_WARNING_DETAILS;
-
-				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_SERVER_OLDER_WARNING, IStatus.WARNING, cmsg, cmsgDetail);
-			}
-
-			if (store.getBoolean(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER)){
-				DisplayHidableSystemMessageAction msgAction = new DisplayHidableSystemMessageAction(msg, store, IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER, false);
-				Display.getDefault().syncExec(msgAction);
-			}
-		}
-
-		// register the classloader for this plugin with the datastore
-		dataStore.registerLocalClassLoader(getClass().getClassLoader());
-
-		int serverVersion = getServerVersion();
-		if (serverVersion >= 8 || (serverVersion == 7 && getServerMinor() >= 1))
-		{
-			//	 register the preference for remote class caching with the datastore
-			boolean cacheRemoteClasses = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES);
-
-			// this preference is set on the server side
-			dataStore.setPreference(RemoteClassLoader.CACHING_PREFERENCE, cacheRemoteClasses ? "true" : "false", true); //$NON-NLS-1$  //$NON-NLS-2$
-
-			if (serverVersion >= 8){ // keepalive preferences
-				boolean doKeepalive = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE);
-
-				int keepaliveResponseTimeout = store.getInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT);
-				if (keepaliveResponseTimeout == 0){ // use the default
-					keepaliveResponseTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT);
-				}
-
-				int socketTimeout =  store.getInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT);
-				if (socketTimeout == 0){ // use the default
-					socketTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT);
-				}
-
-				// these preferences are only for the client
-				dataStore.setPreference(XMLparser.KEEPALIVE_ENABLED_PREFERENCE, doKeepalive ? "true" : "false", false);  //$NON-NLS-1$//$NON-NLS-2$
-				dataStore.setPreference(XMLparser.KEEPALIVE_RESPONSE_TIMEOUT_PREFERENCE, ""+ keepaliveResponseTimeout, false); //$NON-NLS-1$
-				dataStore.setPreference(XMLparser.IO_SOCKET_READ_TIMEOUT_PREFERENCE, ""+socketTimeout, false); //$NON-NLS-1$
-			}
-		}
-		else
-		{
-			dataStore.addMinersLocation("."); //$NON-NLS-1$
-			// older servers initialized in one shot
-			dataStore.getSchema();
-
-	         // Initialzie the miners
-	         if (monitor != null)
-	         {
-	        	 String imsg = ConnectorServiceResources.MSG_INITIALIZING_SERVER;
-	            monitor.subTask(imsg);
-	         }
-	         DataElement initStatus = dataStore.initMiners();
-	         statusMonitor.waitForUpdate(initStatus);
-		}
-	}
-
-	/**
-	 * Diagnostics the occurs after the failure of a connect.
-	 * 
-	 * @param launchStatus the status of the launching of the server (if a daemon was used)
-	 * @param connectStatus the status of the connecting to the server
-	 * @param serverLauncher the server launcher
-	 * @param serverLauncherType the type of server launcher
-	 * @param monitor the progress monitor
-	 * 
-	 * @since 3.1
-	 */
-	protected void handleConnectionFailure(ConnectionStatus launchStatus, ConnectionStatus connectStatus, IRemoteServerLauncher serverLauncher, ServerLaunchType serverLauncherType, IProgressMonitor monitor) throws Exception
-	{
-		SystemMessage msg = null;
-		boolean launchFailed = false;
-		if (launchStatus != null){
-			launchFailed = !launchStatus.isConnected();
-		}
-		// if daemon launch failed because of an SSL problem			
-	    if (launchFailed && launchStatus.isSLLProblem())
-	    {
-	    	if (launchStatus.isSLLProblem())
-			{
-				launchStatus.getException();
-
-				List certs = launchStatus.getUntrustedCertificates();
-				if (certs.size() > 0)
-				{
-					ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-					if (provider != null)
-					{
-						if (provider.importCertificates(certs, getHostName()))
-						{
-							_isConnecting = false;
-							internalConnect(monitor);
-							return;
-						}
-					}
-				}
-				else
-				{
-					String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECT_SSL_EXCEPTION, launchStatus.getMessage());
-					String cmsgDetails = ConnectorServiceResources.MSG_CONNECT_SSL_EXCEPTION_DETAILS;
-					msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_SSL_EXCEPTION, IStatus.ERROR, cmsg, cmsgDetails);
-				}
-			}
-	    }
-
-	    // if daemon launch failed (SSL or otherwise)
-		if (launchFailed && launchStatus != null)
-		{
-			String launchMsg = launchStatus.getMessage();
-			if (launchStatus.getException() != null && serverLauncher != null)
-			{
-				Throwable exception = launchStatus.getException();
-				String fmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECT_DAEMON_FAILED_EXCEPTION, getHostName(), ""+serverLauncher.getDaemonPort()); //$NON-NLS-1$
-
-				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_DAEMON_FAILED_EXCEPTION, IStatus.ERROR, fmsg, exception);
-			}
-			else if (launchMsg != null && launchMsg.indexOf(IDataStoreConstants.AUTHENTICATION_FAILED) != -1)
-			{
-				_isConnecting = false;
-				if (launchFailed)
-			    {
-			        clearPassword(true, true);
-			    }
-
-				// Display error message
-				String msgTxt = CommonMessages.MSG_COMM_AUTH_FAILED;
-				String msgDetails = NLS.bind(CommonMessages.MSG_COMM_AUTH_FAILED_DETAILS, getHostName());
-
-				msg = createSystemMessage(ICommonMessageIds.MSG_COMM_AUTH_FAILED, IStatus.ERROR, msgTxt, msgDetails);
-
-				DisplaySystemMessageAction msgAction = new DisplaySystemMessageAction(msg);
-				Display.getDefault().syncExec(msgAction);
-
-				// Re-prompt for password
-				connectException = null;
-				Display.getDefault().syncExec(new Runnable()
-				{
-					public void run()
-					{
-						try
-						{
-							acquireCredentials(true);
-						}
-						catch (OperationCanceledException e)
-						{
-							connectException = e;
-						}
-					}
-				});
-
-				// Check if the user cancelled the prompt
-				if (connectException instanceof OperationCanceledException)
-				{
-					throw connectException;
-				}
-
-				
-				// Try to connect again.  This is a recursive call, but will only
-				// call if the user presses OK on the password prompt dialog, otherwise
-				// it will continue and return
-				internalConnect(monitor);
-
-				// Since we got here we must be connected so skip error checking below
-				return;
-			}
-			// If password has expired and must be changed
-			else if (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
-			{
-				_isConnecting = false;
-				SystemSignonInformation oldCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials();
-				SystemSignonInformation newCredentials = null;
-				while (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
-				{
-					String msgTxt = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID;
-					String msgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_INVALID_DETAILS;
-					String msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_INVALID;
-					if (isPasswordExpired(launchMsg)){
-						msgTxt = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED;
-						msgDetails = ConnectorServiceResources.MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS;
-						msgId = IConnectorServiceMessageIds.MSG_VALIDATE_PASSWORD_EXPIRED;
-					}
-
-					SystemMessage message = createSystemMessage(msgId, IStatus.ERROR, msgTxt, msgDetails);
-
-					getCredentialsProvider().repairCredentials(message);
-					newCredentials = (SystemSignonInformation) getCredentialsProvider().getCredentials();
-					launchStatus = changePassword(clientConnection, oldCredentials, serverLauncher, monitor, newCredentials.getPassword());
-					launchMsg = launchStatus.getMessage();
-				}
-				if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT))
-				{						
-					internalConnect(monitor);
-					return;
-				}
-//				NewPasswordInfo newPasswordInfo = null;
-//				while (launchMsg != null && (isPasswordExpired(launchMsg) || isNewPasswordInvalid(launchMsg)))
-//				{
-//					newPasswordInfo = promptForNewPassword(isPasswordExpired(launchMsg) ? RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PASSWORD_EXPIRED) : RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_VALIDATE_PASSWORD_INVALID));
-//					launchStatus = changePassword(clientConnection, getPasswordInformation(), serverLauncher, monitor, newPasswordInfo.newPassword);
-//					launchMsg = launchStatus.getMessage();
-//				}
-//				if (newPasswordInfo != null)
-//				{
-//					setPassword(getPasswordInformation().getUserid(), newPasswordInfo.newPassword, newPasswordInfo.savePassword);
-//				}
-//				if (launchMsg != null && launchMsg.equals(IDataStoreConstants.ATTEMPT_RECONNECT))
-//				{
-//					internalConnect(monitor);
-//					return;
-//				}
-			}
-			else if (launchMsg != null)
-			{
-				String msgTxt = NLS.bind(ConnectorServiceResources.MSG_CONNECT_DAEMON_FAILED, getHostName(), clientConnection.getPort());
-				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_CONNECT_DAEMON_FAILED, IStatus.ERROR, msgTxt, launchMsg);
-			}
-		}
-
-		// if connection failed for known reason
-		else if (connectStatus != null && !connectStatus.isConnected())
-		{
-			if (connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_SERVER_UPDATE))
-			{
-				String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_UPDATE, getHostName());
-				String msgDetails = ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_UPDATE_DETAILS;
-
-				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_INCOMPATIBLE_UPDATE, IStatus.ERROR, msgTxt, msgDetails);
-			}
-			else if (connectStatus.getMessage().startsWith(ClientConnection.INCOMPATIBLE_PROTOCOL))
-			{
-				String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_PROTOCOL, getHostName());
-				String msgDetails = ConnectorServiceResources.MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS;
-
-				msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_INCOMPATIBLE_PROTOCOL, IStatus.ERROR, msgTxt, msgDetails);
-			}
-			else
-			{
-				Throwable exception = connectStatus.getException();
-				if (exception instanceof SSLHandshakeException)
-				{
-					List certs = connectStatus.getUntrustedCertificates();
-					if (certs != null && certs.size() > 0)
-					{
-						ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-						if (provider != null)
-						{
-							_isConnecting = false;
-							provider.importCertificates(certs, getHostName());								
-
-							
-							// Don't attempt reconnect when server was started manually.  The problem is that 
-							// in that situation, the server will have terminated on the failed connection
-							// due to the missing certs
-							if (serverLauncherType != ServerLaunchType.RUNNING_LITERAL){
-								internalConnect(monitor);
-							}
-							return;
-						}
-					}
-				}
-				else if (exception != null)
-				{
-					String msgTxt = NLS.bind(CommonMessages.MSG_CONNECT_FAILED, getHostName());
-					msg = createSystemMessage(ICommonMessageIds.MSG_CONNECT_FAILED, IStatus.ERROR, msgTxt, exception);
-				}
-				else if (connectStatus.getMessage() != null){
-					msg = createSystemMessage(ICommonMessageIds.MSG_CONNECT_FAILED, IStatus.ERROR, connectStatus.getMessage());
-				}
-			}
-		}
-
-		// if connect failed for unknown reason
-		else if (connectStatus == null)
-		{
-			SystemBasePlugin.logError("Failed to connect to remote system", null); //$NON-NLS-1$
-			String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED, getHostName());
-			String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED_DETAILS, getHostName());
-			msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_CONNECT_FAILED, IStatus.ERROR, msgTxt, msgDetails);
-		}
-
-		// if, for some reason, we don't have a message
-		if (msg == null && connectStatus != null)
-		{
-			SystemBasePlugin.logError("Failed to connect to remote system" + connectStatus.getMessage(), null); //$NON-NLS-1$
-			String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED, getHostName());
-			String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_CONNECT_FAILED_DETAILS, getHostName());
-			msg = createSystemMessage(IConnectorServiceMessageIds.MSG_COMM_CONNECT_FAILED, IStatus.ERROR, msgTxt, msgDetails);
-		}
-
-		clientConnection.disconnect();
-		clientConnection = null;
-
-		// yantzi: artemis 6.0, check for invalid login (user ID / pwd) and reprompt for signon information
-		if (msg != null &&
-				// tODO use ID or something instead of string
-				msg.getLevelOneText().startsWith(NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN, getHostName())))
-		{
-			if (launchFailed)
-		    {
-		        clearPassword(true, true);
-		    }
-
-			DisplaySystemMessageAction msgAction = new DisplaySystemMessageAction(msg);
-			Display.getDefault().syncExec(msgAction);
-
-			// Re-prompt for password
-			connectException = null;
-			Display.getDefault().syncExec(new Runnable()
-			{
-				public void run()
-				{
-					try
-					{
-						acquireCredentials(true);
-					}
-					catch (OperationCanceledException e)
-					{
-						connectException = e;
-					}
-				}
-			});
-			
-			_isConnecting = false;
-
-			// Check if the user cancelled the prompt
-			if (connectException instanceof OperationCanceledException)
-			{
-				throw connectException;
-			}
-
-			
-			// Try to connect again.  This is a recursive call, but will only
-			// call if the user presses OK on the password prompt dialog, otherwise
-			// it will continue and return
-			internalConnect(monitor);
-
-			// we are connected from recursive so continue
-			return;
-		}
-
-		_isConnecting = false;
-		throw new SystemMessageException(msg);
-
-	}
-	
-
-	
-	/**
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#connect(IProgressMonitor)
-	 */
-	protected void internalConnect(IProgressMonitor monitor) throws Exception
-	{
-	    if (isConnected() || _isConnecting) {
-	        return;
-	    }
-	    
-	    _isConnecting = true;
-	    try{
-		    Boolean alertedNONSSL = new Boolean(false);
-	
-			// set A_PLUGIN_PATH so that dstore picks up the property
-			setPluginPathProperty();
-	
-			// Fire comm event to signal state about to change
-			fireCommunicationsEvent(CommunicationsEvent.BEFORE_CONNECT);
-	
-			ConnectionStatus connectStatus = null;
-			ConnectionStatus launchStatus = null;
-	
-			clientConnection = new ClientConnection(getPrimarySubSystem().getHost().getAliasName());
-	
-			clientConnection.setHost(getHostName());
-			clientConnection.setPort(Integer.toString(getPort()));
-	
-			getPrimarySubSystem();
-			IRemoteServerLauncher serverLauncher = getDStoreServerLauncher();
-	
-			ServerLaunchType serverLauncherType = null;
-			if (serverLauncher != null){
-			    serverLauncherType = serverLauncher.getServerLaunchType();
-			}
-	
-			SystemSignonInformation info = getSignonInformation();
-			if (serverLauncherType == ServerLaunchType.REXEC_LITERAL){	// start the server via REXEC			
-				connectStatus = connectWithREXEC(info, serverLauncher, monitor);
-			}
-			else if (serverLauncherType == ServerLaunchType.DAEMON_LITERAL) { // start the server via the daemon
-			
-				ConnectionStatusPair connectStatusPair = connectWithDaemon(info, serverLauncher, alertedNONSSL, monitor);
-				connectStatus = connectStatusPair.getConnectStatus();
-				launchStatus = connectStatusPair.getLaunchStatus();
-				alertedNONSSL = connectStatusPair.getAlertedNonSSL();
-			}
-			else if (serverLauncherType == ServerLaunchType.RUNNING_LITERAL){ // connect to running server
-				connectStatus = connectWithRunning(monitor);
-			}		
-			else { // server launcher type is unknown
-				connectStatus = connectWithOther(clientConnection, info, serverLauncher, monitor);		
-			}
-	
-			if (connectStatus != null && connectStatus.isConnected()){  // connected 
-				initializeConnection(launchStatus, connectStatus, alertedNONSSL, monitor);
-			}
-			else  {	// diagnosis, reconnection and other connection failure handling
-				handleConnectionFailure(launchStatus, connectStatus, serverLauncher, serverLauncherType, monitor);
-			}
-	    }
-	    finally {
-		_isConnecting = false;
-	    }
-	}
-
-	protected boolean isPortOutOfRange(String message)
-	{
-		return message.indexOf(IDataStoreConstants.PORT_OUT_RANGE) != -1;
-	}
-
-	protected boolean isPasswordExpired(String message)
-	{
-		return message.indexOf(IDataStoreConstants.PASSWORD_EXPIRED) != -1;
-	}
-
-	protected boolean isNewPasswordInvalid(String message)
-	{
-		return message.indexOf(IDataStoreConstants.NEW_PASSWORD_INVALID) != -1;
-	}
-
-	protected void importCertsAndReconnect(ConnectionStatus connectStatus, IProgressMonitor monitor) throws Exception
-	{
-		List certs = connectStatus.getUntrustedCertificates();
-		if (certs != null && certs.size() > 0)
-		{
-			ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-			if (provider != null)
-			{
-				if (provider.importCertificates(certs, getHostName()))
-				{
-					internalConnect(monitor);
-					return;
-				}
-				else
-				{
-					throw new InterruptedException();
-				}
-			}
-		}
-	}
-
-	protected int launchUsingRexec(SystemSignonInformation info, IServerLauncherProperties serverLauncherProperties, IProgressMonitor monitor) throws Exception
-	{
-		IServerLauncher starter = getRemoteServerLauncher();
-		starter.setSignonInformation(info);
-		starter.setServerLauncherProperties(serverLauncherProperties);
-
-		String serverPort = (String)starter.launch(monitor);
-		if (monitor.isCanceled())
-		{
-			_isConnecting = false;
-			SystemMessage msg = createSystemMessage(ICommonMessageIds.MSG_OPERATION_CANCELLED, IStatus.CANCEL, CommonMessages.MSG_OPERATION_CANCELLED);
-			throw new SystemMessageException(msg);
-		}
-
-		int iServerPort = 0;
-		if (serverPort != null)
-		{
-			iServerPort = Integer.parseInt(serverPort);
-		}
-		return iServerPort;
-	}
-
-	protected boolean setSSLProperties(boolean enable)
-	{
-		ISystemKeystoreProvider provider = SystemKeystoreProviderManager.getInstance().getDefaultProvider();
-		if (provider != null)
-		{
-			String keyStore = provider.getKeyStorePath();
-			String password = provider.getKeyStorePassword();
-
-			ISSLProperties properties = new ClientSSLProperties(enable, keyStore, password);
-			clientConnection.setSSLProperties(properties);
-			return true;
-		}
-		else return false;
-	}
-
-
-
-	protected boolean promptForTrusting( X509Certificate cert)
-	{
-		return true;
-	}
-
-
-	/*
-	 * Launch a DataStore server using a daemon.   This method can be overridden if a custom implementation is required.
-	 * The default implementation uses the daemon client that is built into ClientConnection.
-	 */
-	 protected ConnectionStatus launchServer(ClientConnection clientConnection, SystemSignonInformation info, int daemonPort, IProgressMonitor monitor)
-	 {
-	     return launchServer(clientConnection, info, daemonPort, monitor, 0);
-	 }
-
-
-	/*
-	 * Launch a DataStore server using a daemon.   This method can be overridden if a custom implementation is required.
-	 * The default implementation uses the daemon client that is built into ClientConnection.
-	 */
-	 protected ConnectionStatus launchServer(ClientConnection clientConnection, SystemSignonInformation info, int daemonPort, IProgressMonitor monitor, int timeout)
-	 {
-	     return clientConnection.launchServer(info.getUserId(), info.getPassword(), daemonPort, timeout);
-	 }
-
-	 /*
-	  * Launch a DataStore server using a specified server launcher.  By default, this method does nothing since UniversalSystem does
-	  * not know how to handle this particular launch type.   This method should be overridden to provide a custom implementation
-	  * of the launch.
-	  */
-	 protected ConnectionStatus launchServer(ClientConnection clientConnection, SystemSignonInformation info, IServerLauncherProperties launcher, IProgressMonitor monitor)
-	 {
-		 return null;
-	 }
-
-	 /**
-	  * Change the password on a remote system and optionally remain connected to it. Subclasses must implement this
-	  * method if they wish to
-	  * @param clientConnection The connection on which the password must be changed
-	  * @param info The old SystemSignonInformation, including the old password.
-	  * @param serverLauncherProperties The properties of the server launcher used to connect to the server. Use this object to get the type of serverlauncher, if your implementation varies depending on the type.
-	  * @param monitor a progress monitor
-	  * @param newPassword the new password to which the old one will be changed.
-	  * @return the status of the password change and optionally the connection. If the new password is rejected by the remote
-	  * system, return new ConnectionStatus(false, IDataStoreConstants.NEW_PASSWORD_INVALID).
-	  * If the system is now connected, and the server is ready to be connected, construct a new ConnectionStatus(true) and if using the RSE daemon, set the ticket on it
-	  * to the ticket number of the server. If you wish to just have the UniversalSystem attempt a reconnect from the beginning after changing the password,
-	  * return new ConnectionStatus(true, IDataStoreConstants.ATTEMPT_RECONNECT).
-	  */
-	 protected ConnectionStatus changePassword(ClientConnection clientConnection, SystemSignonInformation info, IServerLauncherProperties serverLauncherProperties, IProgressMonitor monitor, String newPassword)
-	 {
-		 return new ConnectionStatus(false, IDataStoreConstants.AUTHENTICATION_FAILED);
-	 }
-
-	/**
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#isConnected()
-	 */
-	public boolean isConnected()
-	{
-		if (clientConnection != null)
-		{
-			return clientConnection.isConnected();
-		}
-
-		return false;
-	}
-
-	/**
-	 * Shortcut to checking if the network is down
-	 */
-	public boolean isNetworkError()
-	{
-		if (_connectionStatusListener != null)
-		{
-			return _connectionStatusListener.isConnectionDown();
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * @return The DataStore currently being used by this connection.
-	 */
-	public DataStore getDataStore()
-	{
-		if (clientConnection != null)
-		{
-			return clientConnection.getDataStore();
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	public boolean supportsRemoteServerLaunching()
-	{
-		return true;
-	}
-
-	public boolean supportsServerLaunchProperties()
-	{
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsPassword()
-	 */
-	public boolean supportsPassword() {
-		boolean result = super.supportsPassword();
-		IHost host = getHost();
-		if (host.getSystemType().isWindows()) {
-			result = false;
-		}
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#supportsUserid()
-	 */
-	public boolean supportsUserId() {
-		boolean result = super.supportsUserId();
-		if (getHost().getSystemType().isWindows()) {
-			result = false;
-		}
-		return result;
-	}
-
-
-	/**
-	 * @since org.eclipse.rse.connectorservice.dstore 3.0
-	 */
-	protected SystemMessage createSystemMessage(String msgId, int severity, String msg) {
-		return createSystemMessage(msgId, severity, msg, (String)null);
-	}
-
-	/**
-	 * @since org.eclipse.rse.connectorservice.dstore 3.0
-	 */
-	protected SystemMessage createSystemMessage(String msgId, int severity, String msg, Throwable e) {
-		return new SimpleSystemMessage(Activator.PLUGIN_ID, msgId, severity, msg, e);
-	}
-
-	/**
-	 * @since org.eclipse.rse.connectorservice.dstore 3.0
-	 */
-	protected SystemMessage createSystemMessage(String msgId, int severity, String msg, String msgDetails) {
-		return new SimpleSystemMessage(Activator.PLUGIN_ID, msgId, severity, msg, msgDetails);
-	}
-
-}
-
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java
deleted file mode 100644
index 32d5831bb..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorServiceManager.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- ********************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.connectorservice.dstore.ConnectorServiceResources;
-
-
-
-/**
- * IConnectorService manager class.
- * There should be only one of these instantiated.
- * Use {@link #getInstance()} to get that singleton.
- * <p>
- * The job of this manager is to manage and return IConnectorService objects.
- * It ensures there is only ever one per unique SystemConnection,
- *  so that both the file and command subsystems can share the same system object.
- */
-public class DStoreConnectorServiceManager extends AbstractConnectorServiceManager
-{
-	private static DStoreConnectorServiceManager inst = null;
-  
-    /**
-     * Private constructor to ensure not instantiated this way.
-     * Use {@link #getInstance()} instead.
-     */
-    private DStoreConnectorServiceManager()
-    {
-    }
-    
-    /**
-     * Return singleton instance of this class
-     */
-    public static DStoreConnectorServiceManager getInstance()
-    {
-    	if (inst == null)
-    	  inst = new DStoreConnectorServiceManager();
-    	return inst;
-    }
-    
-    /**
-     * Return true if the singleton has been created. 
-     * This saves creating it at shutdown just to test for isConnected.
-     */
-    public static boolean isInstantiated()
-    {
-    	return (inst != null);
-    }
-    
-    // -------------------------------------    
-    // ABSTRACT METHODS FROM PARENT CLASS...
-    // -------------------------------------
-    
-    /**
-     * Return the actual IConnectorService object. We return an instance of UniversalSystem.
-     */
-    public IConnectorService createConnectorService(IHost host)
-    {
-    	IConnectorService service =  new DStoreConnectorService(ConnectorServiceResources.DStore_ConnectorService_Label, ConnectorServiceResources.DStore_ConnectorService_Description, host);
-    	return service;
-    }    
-
-    /**
-     * For all subsystems in a particular SystemConnection, we need to know which
-     *  ones are to share a single IConnectorService object. To do this, we need a key which
-     *  is canonical for all subsystems in a given connection. This can be anything,
-     *  but is typically a unique interface that all subsystems supported a shared
-     *  IConnectorService object implement. 
-     * <p>
-     * Whatever is returned from here is used as the key into a hashtable to find the
-     *  singleton IConnectorService object in getSystemObject.
-     * <p>
-     * @return IUniversalSubSystem.class
-     */
-    public Class getSubSystemCommonInterface(ISubSystem subsystem)
-    {
-    	return IUniversalDStoreSubSystem.class;
-    }
-	/**
-	 * Given another subsystem, return true if that subsystem shares a single IConnectorService object
-	 * with this one. You must override this to return true if you recognize that subsystem 
-	 * as one of your own. You are guaranteed the other subsystem will be from the same 
-	 * SystemConnection as this one.
-	 * <p>
-	 * You can't assume a SystemConnection will you only have subsystems of that you created,
-	 * so you should only return true if it implements your interface or you know it is an
-	 * instance of your subsystem class.
-	 * <p>
-	 * This should simply return (otherSubSystem instanceof interface) where interface is 
-	 * the same one returned from getSubSystemCommonInterface
-	 * 
-	 * @return true if otherSubSystem instanceof IUniversalSubSystem
-	 */
-	public boolean sharesSystem(ISubSystem otherSubSystem)
-	{
-		return (otherSubSystem instanceof IUniversalDStoreSubSystem);
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java
deleted file mode 100644
index dc4ac6672..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreConstants.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- * David McKnight   (IBM)        - [216596] dstore preferences (timeout, and others)
- * David McKnight   (IBM)        - [218685] [api][breaking][dstore] Unable to connect when using SSL.
- * David McKnight  (IBM)         - [220123][dstore] Configurable timeout on irresponsiveness
- * David McKnight  (IBM)         - [221747] Default Connection Timeout is too high
- * David McKnight  (IBM)         - [228334] [dstore] Default DataStore connection timeout is too short
- * David McKnight   (IBM)        - [228334][api][breaking][dstore] Default DataStore connection timeout is too short
- *******************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore;
-/**
- * Constants used throughout the UniversalSystem plugin
- */
-public interface IUniversalDStoreConstants 
-{
-
-
-	public static final String PLUGIN_ID ="org.eclipse.rse.connectorservice.dstore"; //$NON-NLS-1$
-	
-	public static final String PREFIX = PLUGIN_ID + "."; //$NON-NLS-1$
-	
-	// prefix for context sensitive help
-	public static final String HELP_PREFIX = PREFIX; 
-	
-	// Resource Bundle ids
-	public static final String RESID_PREFIX = PREFIX + "ui.";	 //$NON-NLS-1$
-	
-	// Icons
-	public static final String ICON_DIR = "icons"; //$NON-NLS-1$
-	public static final String ICON_PATH = java.io.File.separator + ICON_DIR + java.io.File.separator;
-	public static final String ICON_SUFFIX = "Icon";	 //$NON-NLS-1$
-	public static final String ICON_EXT = ".gif";	 //$NON-NLS-1$
-
-    // -------------------------
-	// Action prefixes.
-	//  SYstemBaseAction class adds "label" to get text and "tooltip" and "description" to get hover help
-	// -------------------------
-	// action ids
-	public static final String ACTION_PREFIX = RESID_PREFIX + "action.";         //$NON-NLS-1$
-	public static final String RESID_RUN_REMOTECMD_PREFIX = ACTION_PREFIX+"RunRemoteCommand"; //$NON-NLS-1$
-
-
-    // -------------------------
-	// Preferences...
-	// -------------------------
-    public static final String RESID_PREF_PREFIX = RESID_PREFIX+"preferences.";     //$NON-NLS-1$
-    public static final String RESID_PREF_ROOT_TITLE = RESID_PREF_PREFIX+"root.title"; //$NON-NLS-1$
-    
-    // RemoteClassLoader caching preferences
-    public static final String RESID_PREF_CACHE_REMOTE_CLASSES = RESID_PREF_PREFIX + "cacheremoteclasses"; //$NON-NLS-1$
-
-    // Socket timeout preference
-    public static final String RESID_PREF_SOCKET_TIMEOUT = RESID_PREF_PREFIX + "sockettimeout"; //$NON-NLS-1$
-
-    public static final String RESID_PREF_DO_KEEPALIVE = RESID_PREF_PREFIX + "dokeepalive"; //$NON-NLS-1$
-
-    /**
-	 * @since 3.0
-	 */
-    public static final String RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT = RESID_PREF_PREFIX + "keepalivetimeout"; //$NON-NLS-1$
-
-    /**
-	 * @since 3.0
-	 */
-    public static final String RESID_PREF_SOCKET_READ_TIMEOUT = RESID_PREF_PREFIX + "socketreadtimeout"; //$NON-NLS-1$
-   
-
-
-	/**
-	 * @since 3.0
-	 */
-	public static final String ALERT_MISMATCHED_SERVER = RESID_PREFIX + "alert.mismatched.server"; //$NON-NLS-1$
-
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java
deleted file mode 100644
index 8bf2b731d..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreMessages.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore;
-
-/**
- * Message IDs
- */
-public interface IUniversalDStoreMessages 
-{
-
-
-	public static final String PLUGIN_ID ="org.eclipse.rse.connectorservice.dstore"; //$NON-NLS-1$
-	public static final String PREFIX = PLUGIN_ID+"."; //$NON-NLS-1$
-	// Resource Bundle ids
-	public static final String RESID_PREFIX = PREFIX+"ui.";	 //$NON-NLS-1$
-	// Messages prefixes
-	public static final String MSG_PREFIX = RESID_PREFIX+"msg.";	 //$NON-NLS-1$
-    public static final String MSG_TITLE = MSG_PREFIX + "Title"; //$NON-NLS-1$
-
-	// Messages    
-	public static final String MSG_CONNECTION_PREFIX = MSG_PREFIX + "Connection."; //$NON-NLS-1$
-	public static final String MSG_CONNECTION_FAILED = MSG_CONNECTION_PREFIX + "Failed"; //$NON-NLS-1$
-	public static final String MSG_CONNECTION_UNKNOWN_HOST = MSG_CONNECTION_PREFIX + "UnknownHost";	 //$NON-NLS-1$
-	public static final String MSG_CONNECTION_VERIFY = MSG_CONNECTION_PREFIX + "Verify"; //$NON-NLS-1$
-	public static final String MSG_CONNECTION_COMMPROPERTIES = MSG_CONNECTION_PREFIX + "CommProperties"; //$NON-NLS-1$
-    
-	// RSE Server Connection Messages
-	public static final String MSG_SIGNON_PREFIX = MSG_PREFIX + "Signon."; //$NON-NLS-1$
-	public static final String MSG_SIGNON_PASSWORD_ERROR = MSG_SIGNON_PREFIX + "PasswordError"; //$NON-NLS-1$
-	public static final String MSG_SIGNON_PASSWORD_INCORRECT = MSG_SIGNON_PREFIX + "PasswordIncorrect"; //$NON-NLS-1$
-	public static final String MSG_SIGNON_PASSWORD_INCORRECT_USER_DISABLED= MSG_SIGNON_PREFIX + "PasswordIncorrectUserDisabled"; //$NON-NLS-1$
-	public static final String MSG_SIGNON_PASSWORD_EXPIRED = MSG_SIGNON_PREFIX + "PasswordExpired"; //$NON-NLS-1$
-	public static final String MSG_SIGNON_USERID_INVALID = MSG_SIGNON_PREFIX + "UserIDInvalid"; //$NON-NLS-1$
-	public static final String MSG_SIGNON_USERID_DISABLED = MSG_SIGNON_PREFIX + "UserIDDisabled"; //$NON-NLS-1$
-	public static final String MSG_SIGNON_USERID_ERROR = MSG_SIGNON_PREFIX + "UserIDError"; //$NON-NLS-1$
-	
-	public static final String MSG_DATASTORE_PREFIX = MSG_PREFIX + "DataStore."; //$NON-NLS-1$
-	public static final String MSG_DATASTORE_STARTSERVER = MSG_DATASTORE_PREFIX + "StartServer"; //$NON-NLS-1$
-	public static final String MSG_DATASTORE_CONNECTSERVER = MSG_DATASTORE_PREFIX + "ConnectServer"; //$NON-NLS-1$
-	public static final String MSG_DATASTORE_INITIALIZESERVER = MSG_DATASTORE_PREFIX + "InitializeServer"; //$NON-NLS-1$
-	public static final String MSG_DATASTORE_INITIALIZECODESERVER = MSG_DATASTORE_PREFIX + "InitializeCODEServer"; //$NON-NLS-1$
-
-	public static final String MSG_CMD_PREFIX       = MSG_PREFIX + "Command."; //$NON-NLS-1$
-	public static final String MSG_CMDNAME_EMPTY    = MSG_CMD_PREFIX + "Required";     //$NON-NLS-1$
-	public static final String MSG_CMDNAME_NOTVALID = MSG_CMD_PREFIX + "NotValid";		 //$NON-NLS-1$
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreSubSystem.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreSubSystem.java
deleted file mode 100644
index f291564a1..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalDStoreSubSystem.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore;
-/**
- * Simply a tag to indicate this factory is one our universal subsystems.
- */
-public interface IUniversalDStoreSubSystem 
-{
-
-
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java
deleted file mode 100644
index 95e52a035..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore;
-/**
- * Simply a tag to indicate this factory is one our universal subsystem factories.
- */
-public interface IUniversalSubSystemConfiguration 
-{
-
-
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java
deleted file mode 100644
index bbc8a5e5f..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ConnectionStatusListener.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * David McKnight   (IBM)        - [216252] SystemMessages using RSEStatus
- * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
- * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
- *******************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore.util;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.extra.DomainEvent;
-import org.eclipse.dstore.extra.IDomainListener;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
-import org.eclipse.rse.internal.connectorservice.dstore.Activator;
-import org.eclipse.rse.services.clientserver.messages.CommonMessages;
-import org.eclipse.rse.services.clientserver.messages.ICommonMessageIds;
-import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.rse.ui.messages.SystemMessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-public class ConnectionStatusListener implements IDomainListener, IRunnableWithProgress
-{
-
-
-	protected DataElement _dataStoreStatus;
-	protected IConnectorService _connection;
-	protected boolean _connectionDown = false;
-
-	/**
-	 * @param status The status element for the DataStore handling this connection.
-	 */
-	public ConnectionStatusListener(DataElement status, IConnectorService connection)
-	{
-		_dataStoreStatus = status;
-		_connection = connection;
-	}
-
-	protected Shell internalGetShell()
-	{
-		Shell activeShell = SystemBasePlugin.getActiveWorkbenchShell();
-		if (activeShell != null)
-		{
-			return activeShell;
-		}
-		
-		IWorkbenchWindow window = null;
-		try
-		{
-			window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		}
-		catch (Exception e)
-		{
-			return null;
-		}
-		if (window == null)
-		{
-
-			IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
-			if (windows != null && windows.length > 0)
-			{
-				return windows[0].getShell();
-			}
-	
-		}
-		else
-		{
-			return window.getShell();
-		}
-
-		return null;
-	}
-
-	/**
-	 * The handleConnectionDown method is invoked if the network connection between the 
-	 * client and server goes down while connected.  Currently this method displays
-	 * an error to the user and the subsytem is disconnected.
-	 */
-	protected void handleConnectionDown()
-	{
-		Display.getDefault().asyncExec(new ConnectionDown(this));
-	}
-	
-	class ConnectionDown implements Runnable
-	{
-		private ConnectionStatusListener _listener;
-		public ConnectionDown(ConnectionStatusListener listener)
-		{
-			_listener = listener;
-		}
-		
-		public void run()
-		{
-			Shell shell = getShell();
-			_connectionDown = true;
-			
-			String fmsgStr = NLS.bind(CommonMessages.MSG_CONNECT_UNKNOWNHOST, _connection.getPrimarySubSystem().getHost().getAliasName());
-
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_CONNECT_UNKNOWNHOST, IStatus.ERROR, fmsgStr);
-			SystemMessageDialog dialog = new SystemMessageDialog(internalGetShell(), msg);
-			dialog.open();
-
-			try
-			{
-				IRunnableContext runnableContext = getRunnableContext(getShell());
-		    	runnableContext.run(false,true,_listener); // inthread, cancellable, IRunnableWithProgress
-		    	_connection.reset();
-				ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry();    	    
-	            sr.connectedStatusChange(_connection.getPrimarySubSystem(), false, true, true);
-			}
-	    	catch (InterruptedException exc) // user cancelled
-	    	{
-	    	  if (shell != null)    		
-	            showDisconnectCancelledMessage(shell, _connection.getHostName(), _connection.getPort());
-	    	}    	
-	    	catch (java.lang.reflect.InvocationTargetException invokeExc) // unexpected error
-	    	{
-	    	  Exception exc = (Exception)invokeExc.getTargetException();
-	    	  if (shell != null)    		
-	    	    showDisconnectErrorMessage(shell, _connection.getHostName(), _connection.getPort(), exc);    	    	
-	    	}
-			catch (Exception e)
-			{
-				SystemBasePlugin.logError("ConnectionStatusListener:  Error disconnecting", e); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * @see IDomainListener#listeningTo(DomainEvent)
-	 */
-	public boolean listeningTo(DomainEvent event)
-	{
-		if (_dataStoreStatus == event.getParent())
-		{
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @see IDomainListener#domainChanged(DomainEvent)
-	 */
-	public void domainChanged(DomainEvent event)
-	{
-		if (!_dataStoreStatus.getName().equals("okay")) //$NON-NLS-1$
-		{
-			handleConnectionDown();
-		}
-	}
-
-	public Shell getShell()
-	{
-		return internalGetShell();
-	}
-
-	/**
-	 * Callback method for the IConnectorService to determine if the connection is down.  This is
-	 * called by the disconnect method to determine if we can do saves or not.
-	 */
-	public boolean isConnectionDown()
-	{
-		return _connectionDown;
-	}
-
-	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException 
-	{
-		String message = null;
-		message = SubSystemConfiguration.getDisconnectingMessage(_connection.getHostName(), _connection.getPort());
-		monitor.beginTask(message, IProgressMonitor.UNKNOWN);
-		try 
-		{			
-		  _connection.disconnect(monitor);
-		}
-		catch(Exception exc)
-		{
-		  if (exc instanceof java.lang.reflect.InvocationTargetException)
-		    throw (java.lang.reflect.InvocationTargetException)exc;
-		  if (exc instanceof java.lang.InterruptedException)
-		    throw (java.lang.InterruptedException)exc;
-		  throw new java.lang.reflect.InvocationTargetException(exc);
-		}
-		finally
-		{
-			monitor.done();
-		}
-	}
-    /**
-     * Get the progress monitor dialog for this operation. We try to 
-     *  use one for all phases of a single operation, such as connecting
-     *  and resolving.
-     */
-    protected IRunnableContext getRunnableContext(Shell rshell)
-    {
-    	Shell shell = getShell();
-       	// for other cases, use statusbar
-       	IWorkbenchWindow win = SystemBasePlugin.getActiveWorkbenchWindow();
-       	if (win != null)
-       	{
-       		Shell winShell = RSEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
-       		if (winShell != null && !winShell.isDisposed() && winShell.isVisible())
-       		{
-       			SystemBasePlugin.logInfo("Using active workbench window as runnable context"); //$NON-NLS-1$
-       			shell = winShell;
-       			return win;	
-       		}	
-       		else
-       		{
-       			win = null;	
-       		}
-       	}	  
-    
-       	if (shell == null || shell.isDisposed() || !shell.isVisible()) 
-       	{
-       		SystemBasePlugin.logInfo("Using progress monitor dialog with given shell as parent"); //$NON-NLS-1$
-       		shell = rshell;	
-       	}
-       	
-     		    							
-	      	IRunnableContext dlg =  new ProgressMonitorDialog(rshell);           
-			return dlg; 
-       }
-    
-    /**
-     * Show an error message when the disconnection fails.
-     * Shows a common message by default.
-     * Overridable.
-     */
-    protected void showDisconnectErrorMessage(Shell shell, String hostName, int port, Exception exc)
-    {
-    	String dfailedMsg = NLS.bind(CommonMessages.MSG_DISCONNECT_FAILED, hostName);
-
- 			
-		try{	
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_FAILED, IStatus.ERROR, dfailedMsg, exc);
-    	
-			SystemMessageDialog msgDlg = new SystemMessageDialog(shell, msg);
-			msgDlg.setException(exc);
-			msgDlg.open();
-		}
-		catch (Exception e){			
-		}
-    }	
-    /**
-     * Show an error message when the user cancels the disconnection.
-     * Shows a common message by default.
-     * Overridable.
-     */
-    protected void showDisconnectCancelledMessage(Shell shell, String hostName, int port)
-    {
-    	String msg = NLS.bind(CommonMessages.MSG_DISCONNECT_CANCELLED, hostName);
-    	SystemMessageDialog msgDlg = new SystemMessageDialog(shell, new SimpleSystemMessage(Activator.PLUGIN_ID, ICommonMessageIds.MSG_DISCONNECT_CANCELLED, IStatus.CANCEL, msg));
-    	msgDlg.open();
-    }
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnostic.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnostic.java
deleted file mode 100644
index 8c1854bf6..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnostic.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore.util;
-
-import org.eclipse.rse.core.subsystems.IConnectorService;
-
-/**
- * An interface for ICommunicationsDiagnostic class
- */
-public interface ICommunicationsDiagnostic extends Runnable {
-	
-	
-			
-	public static final int CANCEL_WAIT_REQUESTED = 1;
-		
-	
-	/**
-	 * Setup for the diagnostic
-	 * 
-	 * @param id assign an ID for this diagnostic instance
-	 * @param quiet true if user to be prompted for a dialog
-	 * @param server the host network name
-	 * @param system the connection to be investigated
-	 * @param str1 optional string
-	 * @param str2 optional string
-	 * @param str3 optional string 
-	 */ 
-	public void setUp(String id, boolean quiet, String server, IConnectorService system, String str1, String str2, String str3);		
-			
-	/**
-	 * Log an error in the .log file
-	 * 
-	 * @param text message text to be logged
-	 */ 
-	public void logError(String text);
-	 
-	/**
-	 * Check if network is down
-	 * 
-	 * @return true or false
-	 */ 
-    public boolean isNetworkDown();
-    
-    /**
-     * Check if host server is still active
-     * 
-     * @return true or false
-     */
-    public boolean isServerActive();
-    
-    /**
-     * Dispaly a message dialog
-     * 
-     * @param id message to be displayed.
-     */
-    public void displayMessage(String id);
-    
-    /**
-     * diagnosticStatus
-     * 
-     * @return status
-     */
-    public int diagnosticStatus();
-    
-        
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnosticFactory.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnosticFactory.java
deleted file mode 100644
index 3bc4c334c..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/ICommunicationsDiagnosticFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore.util;
-
-/**
- * Factory for creating ICommunicationsDiagnostic instances.
- */
-public interface ICommunicationsDiagnosticFactory
-{
-
-	/**
-	 * Factory method for creating instances
-	 */
-	public ICommunicationsDiagnostic createInstance();
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java
deleted file mode 100644
index 5014cada0..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitor.java
+++ /dev/null
@@ -1,495 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
- * David McKnight   (IBM)        - [225902] [dstore] use C_NOTIFICATION command to wake up the server
- * David McKnight   (IBM)        - [229947] [dstore] interruption to Thread.sleep()  should not stop waitForUpdate()
- * David McKnight   (IBM)        - [231126] [dstore] status monitor needs to reset WaitThreshold on nudge
- * David McKnight   (IBM)        - [278341] [dstore] Disconnect on idle causes the client hang
- *******************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.dstore.core.model.DE;
-import org.eclipse.dstore.core.model.DataElement;
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.dstore.core.model.DataStoreSchema;
-import org.eclipse.dstore.extra.DomainEvent;
-import org.eclipse.dstore.extra.IDomainListener;
-import org.eclipse.rse.core.subsystems.CommunicationsEvent;
-import org.eclipse.rse.core.subsystems.ICommunicationsListener;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
-
-/*
- * This utility class can be used to monitor the status of one more more status DataElements.
- * Only one instanceof of this class is required per DataStore for use in monitoring statuses.
- * This is intended to be used in place of StatusChangeListeners
- * 
- *  * <p>
- * The following is one example of the use of the StatusMonitor. The code:
- * <blockquote><pre>
- *    		DataElement status = dataStore.command(dsCmd, args, deObj);
- *
- *			StatusMonitor smon = StatusMonitorFactory.getInstance().getStatusMonitorFor(getSystem(), ds);
- *			smon.waitForUpdate(status, monitor);
- * </pre></blockquote>
- */
-public class StatusMonitor implements IDomainListener, ICommunicationsListener 
-{
-
-	protected Shell _shell;
-	protected IConnectorService _system;
-
-	
-	protected boolean _networkDown = false;
-	
-	protected List _workingStatuses;
-	protected List _cancelledStatuses;
-	protected List _doneStatuses;
-	
-	protected DataStore _dataStore;
-
-	protected class FindShell implements Runnable 
-	{
-		private Shell shell;
-		
-		/**
-		 * @see Runnable#run()
-		 */
-		public void run() 
-		{
-			try {
-				Shell[] shells = Display.getCurrent().getShells();
-				for (int loop = 0; loop < shells.length && shell == null; loop++) {
-					if (shells[loop].isEnabled()) {
-						shell = shells[loop];
-					}
-				}
-			} catch (Exception e) {
-				SystemBasePlugin.logError("StatusChangeListener.FindShell exception: ", e); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * Construct a StatusChangeListener
-	 *
-	 * @param system the system associated with this monitor
-	 * @param dataStore the dataStore associated with this monitor
-	 * @param factory the diagnostic factory for this monitor
-	 */	
-	public StatusMonitor(IConnectorService system, DataStore dataStore, ICommunicationsDiagnosticFactory factory) 
-	{
-		_system = system;
-		_dataStore = dataStore;
-		reInit();
-	}
-	
-	/**
-	 * Construct a StatusChangeListener
-	 *
-	 * @param system the system associated with this monitor
-	 * @param dataStore the dataStore associated with this monitor
-	 */	
-	public StatusMonitor(IConnectorService system, DataStore dataStore) 
-	{
-	    this(system, dataStore, null);
-	}
-	
-	public void reInit()
-	{
-		_networkDown = false;
-		_system.addCommunicationsListener(this);		
-		_workingStatuses = new ArrayList();
-		_doneStatuses = new ArrayList();
-		_cancelledStatuses = new ArrayList();
-		_dataStore.getDomainNotifier().addDomainListener(this);
-	}
-	
-	public DataStore getDataStore()
-	{
-	    return _dataStore;
-	}
-	
-	public void dispose()
-	{
-	    _system.removeCommunicationsListener(this);
-	    _workingStatuses.clear();
-	    _doneStatuses.clear();
-	    _cancelledStatuses.clear();
-	    _dataStore.getDomainNotifier().removeDomainListener(this);
-	}
-	
-	/**
-	 * @see IDomainListener#listeningTo(DomainEvent)
-	 */
-	public boolean listeningTo(DomainEvent event) 
-	{
-		if (_workingStatuses.size() == 0)
-		{
-			return true;
-		}
-
-		DataElement parent = (DataElement)event.getParent();
-		if (_workingStatuses.contains(parent))
-		{
-		    return determineStatusDone(parent);
-		}
-		
-		return false;
-	}
-	
-
-
-	/**
-	 * @see IDomainListener#domainChanged(DomainEvent)
-	 */
-	public void domainChanged(DomainEvent event) 
-	{
-	    if (_workingStatuses.size() == 0)
-		{
-			return;
-		}
-
-		DataElement parent = (DataElement)event.getParent();
-		if (_workingStatuses.contains(parent))
-		{
-		    boolean isStatusDone = determineStatusDone(parent);
-		    if (isStatusDone)
-		    {
-		        setDone(parent);
-		    }
-		}
-	}
-	
-    
-    /**
-     * Determines whether the status is done.
-     * @return <code>true</code> if status done, <code>false</code> otherwise.
-     */
-    protected boolean determineStatusDone(DataElement status) 
-    {        
-        return status.getAttribute(DE.A_VALUE).equals("done") ||  status.getAttribute(DE.A_NAME).equals("done"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-	
-	/**
-	 * @see org.eclipse.rse.core.subsystems.ICommunicationsListener#isPassiveCommunicationsListener()
-	 */
-	public boolean isPassiveCommunicationsListener() 
-	{
-		return false;
-	}
-
-	/**
-	 * setDone(boolean)
-	 */
-	public synchronized void setDone(DataElement status)
-	{	
-	    _workingStatuses.remove(status);
-	    _doneStatuses.add(status);	   
-	}
-	
-	
-	public synchronized void setCancelled(DataElement status)
-	{
-	    _workingStatuses.remove(status);
-	    _cancelledStatuses.add(status);
-	}
-	
-	public synchronized void setWorking(DataElement status)
-	{
-	    _workingStatuses.add(status);
-	}
-	
-	
-	public boolean wasCancelled(DataElement status) 
-	{
-	    if (_cancelledStatuses.contains(status))
-	    {
-	        return true;
-	    }
-		return false;
-	}
-	
-
-
-	/**
-	 * @see ICommunicationsListener#communicationsStateChange(CommunicationsEvent)
-	 */
-	public void communicationsStateChange(CommunicationsEvent e) 
-	{
-		if (e.getState() == CommunicationsEvent.CONNECTION_ERROR) 
-		{
-			_networkDown = true;
-		}
-		else if (e.getState() == CommunicationsEvent.AFTER_DISCONNECT)
-		{
-			_networkDown = true;
-		}
-	}
-
-	/**
-	 * Test if the StatusChangeListener returned because the network connection to the 
-	 * remote system was broken.
-	 */
-	public boolean isNetworkDown() 
-	{
-		return _networkDown;
-	}
-	
-	 public DataElement waitForUpdate(DataElement status) throws InterruptedException
-		{	
-	        return waitForUpdate(status, null, 0);
-		}
-	
-    public DataElement waitForUpdate(DataElement status, IProgressMonitor monitor) throws InterruptedException
-	{	
-        return waitForUpdate(status, monitor, 0);
-	}
-    
-    public DataElement waitForUpdate(DataElement status, int wait) throws InterruptedException
-	{	
-        return waitForUpdate(status, null, wait);
-	} 
-    
-    public synchronized DataElement waitForUpdate(DataElement status, IProgressMonitor monitor, int wait) throws InterruptedException
-	{	
-    	if (_networkDown && status.getDataStore().isConnected())
-    	{
-    		reInit();
-    	}
-        if (determineStatusDone(status))
-        {
-            setDone(status);
-            return status;
-        }
-        
-        setWorking(status);
-     
-		Display display = Display.getCurrent();
-				
-	  // Prevent infinite looping by introducing a threshold for wait 
-	  
-      int WaitThreshold = 50;
-      if ( wait > 0 )
-        WaitThreshold = wait*10; // 1 second means 10 sleep(100ms)
-      else if ( wait == -1 ) // force a diagnostic
-	  		 WaitThreshold = -1;
-      
-      int initialWaitThreshold = WaitThreshold;
-	  int nudges = 0; // nudges used for waking up server with slow connections
-      // nudge up to 12 times before giving up
- 
-      if (display != null) 
-		{
-			// Current thread is UI thread
-			while (_workingStatuses.contains(status)) 
-			{
-			//	while (display.readAndDispatch()) {
-					//Process everything on event queue
-			//	}
-				
-				if ((monitor != null) && (monitor.isCanceled())) 
-				{
-				    setCancelled(status);
-					throw new InterruptedException();
-				}
-				
-				boolean statusDone = determineStatusDone(status);
-				
-				if (statusDone)
-				{
-					setDone(status);
-				}
-				else
-				{
-					try
-					{
-						Thread.sleep(100);
-					}
-					catch (InterruptedException e)
-					{
-						// Continue waiting in case of spurious interrupt.
-					    // We check the progress monitor to listen for Eclipse Shutdown.
-						continue;
-					}
-				    if (WaitThreshold > 0) // update timer count if
-                        // threshold not reached
-                        --WaitThreshold; // decrement the timer count
-                   
-				  if (WaitThreshold == 0)
-				    {
-                   	wakeupServer(status);
-                    
-			        // no diagnostic factory but there is a timeout
-                	if (nudges >= 12)
-                		return status;  // returning the undone status object
-                	
-                	nudges++;
-                	WaitThreshold = initialWaitThreshold;
-				    }
-                    else if (_networkDown ||  !_dataStore.isConnected())
-                    {
-                        dispose();
-    					throw new InterruptedException();
-                    }
-                }
-			}
-			
-		} 
-		else 
-		{
-			// Current thread is not UI thread
-			while (_workingStatuses.contains(status))
-			{
-				
-			    if ((monitor != null) && (monitor.isCanceled()))
-			    {
-					setCancelled(status);
-					throw new InterruptedException();
-				}
-
-				boolean statusDone = determineStatusDone(status);
-				
-				if (statusDone)
-				{
-					setDone(status);
-				}
-				else 
-				{
-					try
-					{
-						Thread.sleep(100);
-					}
-					catch (InterruptedException e)
-					{
-						// Continue waiting in case of spurious interrupt.
-					    // We check the progress monitor to listen for Eclipse Shutdown.
-						continue;
-					}
-					
-                    if (WaitThreshold > 0) // update timer count if
-                        // threshold not reached
-                        --WaitThreshold; // decrement the timer count
-
-                   if (WaitThreshold == 0)
-				    {
-                     	wakeupServer(status);
-                        
-				        // no diagnostic factory but there is a timeout
-                    	if (nudges >= 12)
-                    		return status;  // returning the undone status object
-                    	
-                    	nudges++;
-                    	WaitThreshold = initialWaitThreshold;
-				    }
-                    else if (_networkDown)
-                    {
-    					dispose();
-    					throw new InterruptedException();
-                    }
-                }
-			}		
-		}
-
-	
-		return status;
-	}
-
-	private void wakeupServer(DataElement status)
-	{
-		if (status != null)
-		{
-			// token command to wake up update handler
-			DataElement cmdDescriptor = _dataStore.findCommandDescriptor(DataStoreSchema.C_NOTIFICATION);
-			DataElement subject = status.getParent().get(0);
-			if (cmdDescriptor != null)
-			{
-				_dataStore.command(cmdDescriptor, subject);
-			}
-		}
-	}
-
-    /**
-     * Start diagnostic 
-     *
-     * @param factory is the an implementation of ICommunicationsDiagnostic
-     * @param quiet is the flag to indicate if user should be prompted
-     *         - true for no prompt
-     * @return ICommunciationsDiagnostic class instance
-     */
-    public ICommunicationsDiagnostic whatIsGoingOn(ICommunicationsDiagnosticFactory factory, boolean quiet, DataElement target) throws InterruptedException  //@01
-    {
-    	if (target == null)
-    	   return null;
-    	
-    	ICommunicationsDiagnostic d = null;
-		try {
-				 String name = target.getName();  /* Get the current element status name: started/working/done */
-				 /* Log the current status */
-				 SystemBasePlugin.logError("StatusChangeListener."+name+": " + "Communications Diagnostic started");			 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		    	 SystemBasePlugin.logError("StatusChangeListener."+name + //$NON-NLS-1$
-		    	                           ": done = " + _doneStatuses.contains(target) + //$NON-NLS-1$
-		                                   "; cancelled = " + _cancelledStatuses.contains(target)+ //$NON-NLS-1$
-		                                   "; _networkDown = " + _networkDown ); //$NON-NLS-1$
-		
-		         DataStore ds = _dataStore;
-		         /* Log the status in DataStore */
-		         SystemBasePlugin.logError("StatusChangeListener."+name+"(DataStore): " + " isConnected = " + ds.isConnected() + "; isWaiting = " + ds.isWaiting(target)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		         		
-		         /*Log all nested DataElement's in target's parent*/
-		         List deList = target.getParent().getNestedData();
-		         if ( deList != null && !deList.isEmpty() ) {
-		         	 int num = deList.size();
-		             for ( int i = 0; i < num; i++)
-		             {
-		                 DataElement child = (DataElement) deList.get(i);
-		                 if (child != null) {
-		                 	SystemBasePlugin.logError("StatusChangeListener."+name+".child"+i+"(DataElement): " + child.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		                 	DataElement descriptor = child.getDescriptor();	
-		                 	if (descriptor != null)
-		                 		SystemBasePlugin.logError("StatusChangeListener."+name+".child"+i+"(Descriptor):  " + descriptor.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		                 }
-		             }
-		         }	
-		         //Spawn off a diagnostic to check more stuff
-		         if (factory != null) {
-		            d = factory.createInstance();
-		
-		            //Initialize the diagnostic instance
-		            //Set diagnostic id(name), server name(ds.getName()), this connection(system)
-		            d.setUp(name, quiet, ds.getName(),_system, null ,null, null);
-		         	
-		            new Thread(d).start();
-		         }
-		
-		}
-		catch (Exception e)
-		{
-		         SystemBasePlugin.logError("StatusChangeListener.ICommunicationsDiagnostic exception: ", e);  	 //$NON-NLS-1$
-		}
-	
-	    return d;	// return the created diagnostic class instance	
-    }
-
-
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitorFactory.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitorFactory.java
deleted file mode 100644
index a132b6e5d..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/util/StatusMonitorFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.rse.connectorservice.dstore.util;
-
-import java.util.HashMap;
-
-import org.eclipse.dstore.core.model.DataStore;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-
-/**
- * Factory for finding and creating the StatusMonitor class for a given system
- */
-public class StatusMonitorFactory
-{
-    protected HashMap _monitorMap;
-    protected static StatusMonitorFactory _instance;
-    
-    public static StatusMonitorFactory getInstance()
-    {
-        if (_instance == null)
-        {
-            _instance = new StatusMonitorFactory();
-        }
-        return _instance;
-    }
-    
-    public StatusMonitorFactory()
-    {
-        _monitorMap= new HashMap();
-    }
-    
-    public void removeStatusMonitorFor(IConnectorService system)
-    {	
-    	StatusMonitor monitor = (StatusMonitor)_monitorMap.remove(system);
-    	if (monitor != null)
-    	{
-    		monitor.dispose();
-    	}
-    }
-    
-    public StatusMonitor getStatusMonitorFor(IConnectorService system, DataStore dataStore)
-    {
-       return getStatusMonitorFor(system, dataStore, null);
-    }
-    
-    public StatusMonitor getStatusMonitorFor(IConnectorService system, DataStore dataStore, ICommunicationsDiagnosticFactory diagnosticFactory)
-    {
-        StatusMonitor monitor = (StatusMonitor)_monitorMap.get(system);
-        if (monitor == null)
-        {
-            monitor = new StatusMonitor(system, dataStore, diagnosticFactory);
-            _monitorMap.put(system, monitor);
-        }
-        DataStore mDataStore = monitor.getDataStore();
-        if (mDataStore != dataStore)
-        {
-            removeStatusMonitorFor(system);
-            monitor = new StatusMonitor(system, dataStore, diagnosticFactory);
-            _monitorMap.put(system, monitor);
-        }
-          
-        return monitor;
-    }
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java
deleted file mode 100644
index d58954f2f..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/Activator.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
- * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
- * David McKnight   (IBM)        - [220123] [api][dstore] Configurable timeout on irresponsiveness
- * David McKnight   (IBM)        - [227406] [dstore] DStoreFileService must listen to buffer size preference changes
- * David McKnight   (IBM)        - [228334][api][breaking][dstore] Default DataStore connection timeout is too short
- * David McKnight   (IBM)        - [233160] [dstore] SSL/non-SSL alert are not appropriate
- * Martin Oberhuber (Wind River) - [245918] Allow customization of DStore Preferences
- *******************************************************************************/
-
-package org.eclipse.rse.internal.connectorservice.dstore;
-
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.rse.connectorservice.dstore.IUniversalDStoreConstants;
-import org.eclipse.rse.ui.ISystemPreferencesConstants;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class Activator extends SystemBasePlugin {
-
-	//The shared instance.
-	private static Activator plugin;
-
-	public final static String PLUGIN_ID = "org.eclipse.rse.connectorservice.dstore"; //$NON-NLS-1$
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception
-	{
-		super.start(context);
-
-		initializeDefaultPreferences();
-	}
-
-	public void initializeDefaultPreferences() {
-
-		// [245918] Since our Preferences are stored in RSEUIPlugin, we cannot
-		// use the core.runtime.preferences extension in order to do
-		// initialization in the correct order (allow overriding by
-		// plugin_customization.ini). We therefore explicitly check each
-		// Preference slot, and only set a there isn't one set already.
-		// This requires explicit access to the DefaultScope().
-		// TODO move Preferences to our own PreferenceStore to simplify this
-		IPreferenceStore store = new ScopedPreferenceStore(new DefaultScope(), RSEUIPlugin.getDefault().getBundle().getSymbolicName());
-		//IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-		//Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-
-		//In DefaultScope, isDefault() means: no value specified in defaultScope, fallback to default-default
-		//In this case (no default specified yet), we may specify our default
-		if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT))
-			store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_SOCKET_TIMEOUT);
-
-		// do keepalive
-		if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE))
-			store.setDefault(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_DO_KEEPALIVE);
-
-		// socket read timeout
-		if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT))
-			store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_SOCKET_READ_TIMEOUT);
-
-		// keepalive response timeout
-		if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT))
-			store.setDefault(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT,
-					IDStoreDefaultPreferenceConstants.DEFAULT_PREF_KEEPALIVE_RESPONSE_TIMEOUT);
-
-		// show mismatched server warning
-		if (store.isDefault(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER))
-			store.setDefault(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER, IDStoreDefaultPreferenceConstants.DEFAULT_ALERT_MISMATCHED_SERVER);
-
-		// cache remote classes
-		if (store.isDefault(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES))
-			store.setDefault(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, IDStoreDefaultPreferenceConstants.DEFAULT_PREF_CACHE_REMOTE_CLASSES);
-
-		// alert defaults
-		if (store.isDefault(ISystemPreferencesConstants.ALERT_SSL))
-			store.setDefault(ISystemPreferencesConstants.ALERT_SSL, ISystemPreferencesConstants.DEFAULT_ALERT_SSL);
-		if (store.isDefault(ISystemPreferencesConstants.ALERT_NONSSL))
-			store.setDefault(ISystemPreferencesConstants.ALERT_NONSSL, ISystemPreferencesConstants.DEFAULT_ALERT_NON_SSL);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-
-
-	protected void initializeImageRegistry()
-	{
-		// TODO Auto-generated method stub
-
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java
deleted file mode 100644
index 4823906a1..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
- * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
- *******************************************************************************/
-
-package org.eclipse.rse.internal.connectorservice.dstore;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ConnectorServiceResources extends NLS
-{
-	private static String BUNDLE_NAME = "org.eclipse.rse.internal.connectorservice.dstore.ConnectorServiceResources";//$NON-NLS-1$
-
-	public static String DStore_ConnectorService_Label;
-	public static String DStore_ConnectorService_Description;
-	
-	
-	public static String MSG_CONNECT_SSL_EXCEPTION;
-	public static String MSG_CONNECT_SSL_EXCEPTION_DETAILS;
-	public static String MSG_STARTING_SERVER_VIA_REXEC;
-	public static String MSG_STARTING_SERVER_VIA_DAEMON;
-
-	public static String MSG_CONNECTING_TO_SERVER;
-	public static String MSG_INITIALIZING_SERVER;
-	public static String MSG_PORT_OUT_RANGE;
-	
-	public static String MSG_COMM_CONNECT_FAILED;
-	public static String MSG_COMM_CONNECT_FAILED_DETAILS;
-
-	public static String MSG_VALIDATE_PASSWORD_EXPIRED;
-	public static String MSG_VALIDATE_PASSWORD_INVALID;
-	
-	public static String MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS;
-	public static String MSG_VALIDATE_PASSWORD_INVALID_DETAILS;
-	
-	public static String MSG_COMM_USING_SSL;
-	public static String MSG_COMM_NOT_USING_SSL;
-	
-	public static String MSG_COMM_SERVER_OLDER_WARNING;
-	public static String MSG_COMM_CLIENT_OLDER_WARNING;
-	public static String MSG_COMM_SERVER_OLDER_WARNING_DETAILS;
-	public static String MSG_COMM_CLIENT_OLDER_WARNING_DETAILS;
-	
-	public static String MSG_CONNECT_DAEMON_FAILED;
-	public static String MSG_CONNECT_DAEMON_FAILED_EXCEPTION;
-	
-	public static String MSG_COMM_INCOMPATIBLE_PROTOCOL;
-	public static String MSG_COMM_INCOMPATIBLE_UPDATE;
-	public static String MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS;
-	public static String MSG_COMM_INCOMPATIBLE_UPDATE_DETAILS;
-	
-	public static String MSG_COMM_INVALID_LOGIN; 
-	public static String MSG_COMM_INVALID_LOGIN_DETAILS;
-	
-	
-	public static String MSG_COMM_REXEC_NOTSTARTED;
-	public static String MSG_COMM_REXEC_NOTSTARTED_DETAILS;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, ConnectorServiceResources.class);
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties
deleted file mode 100644
index 81d9e0687..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ConnectorServiceResources.properties
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Initial Contributors:
-# The following IBM employees contributed to the Remote System Explorer
-# component that contains this file: David McKnight, Kushal Munir, 
-# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-# 
-# Contributors:
-# David McKnight   (IBM)        - [216252] [api][nls] Resource Strings specific to subsystems should be moved from rse.ui into files.ui / shells.ui / processes.ui where possible
-# David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
-# David McKnight   (IBM)        - [223204] [cleanup] fix broken nls strings in files.ui and others
-# David McKnight   (IBM)        - [287135] TVT35:TCT652: FRA - RSE - Apostrophe issue in SSL message
-###############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-DStore_ConnectorService_Label=DStore Connector Service
-DStore_ConnectorService_Description=The DStore Connector Service uses RSE's DataStore protocol to connect to the host. You must have a DataStore daemon or server running on the remote machine.
-
-MSG_COMM_CONNECT_FAILED=Connection to {0} could not be established.
-MSG_COMM_CONNECT_FAILED_DETAILS=A socket connection to {0} could not be established.  If you are connecting via the communications daemon make sure the daemon is running on the remote system.  If you are connecting directly to the communications server make sure the server is started on the remote system.  If you are connecting using REXEC, make sure that the server is installed on the remote system and that the REXEC service is running on that system.
- 
-
-MSG_CONNECT_SSL_EXCEPTION = Unable to establish a secure connection with the Remote System Explorer host server.
-MSG_CONNECT_SSL_EXCEPTION_DETAILS = Make sure both the client and server are configured to use SSL.  The SSL handshake between client and server failed with the following exception: {0}
-
-MSG_STARTING_SERVER_VIA_REXEC = Remote System Explorer host server using REXEC
-
-MSG_STARTING_SERVER_VIA_DAEMON = Starting Remote System Explorer host server using daemon
-
-MSG_CONNECTING_TO_SERVER= Connecting to Remote System Explorer host server on port {0}
-MSG_INITIALIZING_SERVER= Initializing Remote System Explorer host server
-MSG_PORT_OUT_RANGE = The specified server port is out of the allowed range: {0}
-
-MSG_VALIDATE_PASSWORD_EXPIRED=Password has expired
-MSG_VALIDATE_PASSWORD_EXPIRED_DETAILS=Your password has expired, and must be reset before continuing.
-
-MSG_VALIDATE_PASSWORD_INVALID=The new password is invalid.
-MSG_VALIDATE_PASSWORD_INVALID_DETAILS=The remote system indicated that the new password is unacceptable. Please ensure the new password follows all password rules for the remote system.
-
-MSG_COMM_USING_SSL=Communication with the remote system {0} has been secured using SSL. Continue?
-MSG_COMM_NOT_USING_SSL=Connection {0} has not been secured using SSL. Proceed anyway?
-
-MSG_COMM_SERVER_OLDER_WARNING=The host server running on remote system {0} is an older version than the RSE client.
-MSG_COMM_SERVER_OLDER_WARNING_DETAILS=It is recommended that the client and server versions match.
-MSG_COMM_CLIENT_OLDER_WARNING=The host server running on remote system {0} is a newer version than the RSE client.
-MSG_COMM_CLIENT_OLDER_WARNING_DETAILS=It is recommended that the client and server versions match.
-
-
-MSG_CONNECT_DAEMON_FAILED=Daemon failed to launch server on {0} using port {1}
-MSG_CONNECT_DAEMON_FAILED_EXCEPTION=Failed to connect to the daemon on {0} using port {1} with an unexpected exception
-
-	
-MSG_COMM_INCOMPATIBLE_PROTOCOL=Incompatible host server running on remote system {0}.
-MSG_COMM_INCOMPATIBLE_PROTOCOL_DETAILS=The host server is not a Remote System Explorer server.
-
-MSG_COMM_INCOMPATIBLE_UPDATE=Incompatible Remote System Explorer host server running on remote system {0}.
-MSG_COMM_INCOMPATIBLE_UPDATE_DETAILS=The host server needs to be updated to work with the current client.
-
-	
-MSG_COMM_INVALID_LOGIN=Invalid password or user ID for {0}.
-MSG_COMM_INVALID_LOGIN_DETAILS=Message from host: {0}
-
-MSG_COMM_REXEC_NOTSTARTED=Unable to connect to REXEC host service on port {0} of host {1}
-MSG_COMM_REXEC_NOTSTARTED_DETAILS=Message from host: {0}
-                    
-                    
-
-                    
-            
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.java
deleted file mode 100644
index f05319ec9..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [216596] dstore preferences (timeout, and others)
- * David McKnight  (IBM)         - [220123][dstore] Configurable timeout on irresponsiveness
- ********************************************************************************/
-package org.eclipse.rse.internal.connectorservice.dstore;
-
-import org.eclipse.osgi.util.NLS;
-
-public class DStoreResources extends NLS {
-
-	private static String BUNDLE_NAME = "org.eclipse.rse.internal.connectorservice.dstore.DStoreResources";  //$NON-NLS-1$
-
-	public static String RESID_PREFERENCE_CONNECTION_TIMEOUT_LABEL;
-	public static String RESID_PREFERENCE_CONNECTION_TIMEOUT_TOOLTIP;
-	
-	public static String RESID_PREFERENCE_DO_KEEPALIVE_LABEL;
-	public static String RESID_PREFERENCE_DO_KEEPALIVE_TOOLTIP;
-	
-	public static String RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_LABEL;
-	public static String RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_TOOLTIP;
-	
-	public static String RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_LABEL;
-	public static String RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_TOOLTIP;
-	
-	public static String RESID_PREFERENCE_CACHE_REMOTE_CLASSES_LABEL;
-	public static String RESID_PREFERENCE_CACHE_REMOTE_CLASSES_TOOLTIP;
-	
-	public static String RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_LABEL;
-	public static String RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_TOOLTIP;
-		
-	public static String RESID_PREFERENCE_KEEPALIVE_LABEL;
-	
-	static 
-	{
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, DStoreResources.class);
-	}
-	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.properties
deleted file mode 100644
index 05267726a..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/DStoreResources.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-################################################################################
-# Copyright (c) 2008 IBM Corporation. All rights reserved.
-# This program and the accompanying materials are made available under the terms
-# of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-# available at http://www.eclipse.org/legal/epl-v10.html
-# 
-# Initial Contributors:
-# The following IBM employees contributed to the Remote System Explorer
-# component that contains this file: David McKnight
-
-# Contributors:
-# David McKnight   (IBM)        - [216596] dstore preferences (timeout, and others)
-# David McKnight  (IBM)         - [220123][dstore] Configurable timeout on irresponsiveness
-#################################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-RESID_PREFERENCE_CONNECTION_TIMEOUT_LABEL=Connection Timeout (ms)
-RESID_PREFERENCE_CONNECTION_TIMEOUT_TOOLTIP=Time to wait for establishing a Datastore connection.
-
-RESID_PREFERENCE_DO_KEEPALIVE_LABEL=Enable Keepalive
-RESID_PREFERENCE_DO_KEEPALIVE_TOOLTIP=Keep DataStore connections alive when idle.
-
-RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_LABEL=Socket Read Timeout (ms)
-RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_TOOLTIP=Time to wait for input on a socket before initiating a keepalive request
-
-RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_LABEL=Keepalive Response Timeout (ms)
-RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_TOOLTIP=Time to wait for a response to a keepalive request
-
-RESID_PREFERENCE_CACHE_REMOTE_CLASSES_LABEL=Cache Remote Classes
-RESID_PREFERENCE_CACHE_REMOTE_CLASSES_TOOLTIP=Cache remote server classes.  This is only useful when all required classes are unavailable on the server side.
-
-RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_LABEL=Show Mismatched Server Warning
-RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_TOOLTIP=Show a warning when the DataStore server is compatible but older or newer then the current client.
- 
-RESID_PREFERENCE_KEEPALIVE_LABEL=Keepalive
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IConnectorServiceMessageIds.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IConnectorServiceMessageIds.java
deleted file mode 100644
index e167485f7..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IConnectorServiceMessageIds.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
- ********************************************************************************/
-package org.eclipse.rse.internal.connectorservice.dstore;
-
-public interface IConnectorServiceMessageIds {
-
-	public static final String MSG_CONNECT_DAEMON_FAILED = "RSEG1242"; //MSG_CONNECT_PREFIX + "Failed";			 //$NON-NLS-1$
-	public static final String MSG_CONNECT_DAEMON_FAILED_EXCEPTION = "RSEG1243"; //MSG_CONNECT_PREFIX + "Failed";	 //$NON-NLS-1$
-	public static final String MSG_CONNECT_SSL_EXCEPTION = "RSEC2307"; //MSG_CONNECT_PREFIX + "Failed";	 //$NON-NLS-1$
-		
-	public static final String MSG_STARTING_SERVER_VIA_REXEC = "RSEC2310"; //$NON-NLS-1$
-	public static final String MSG_STARTING_SERVER_VIA_DAEMON = "RSEC2311"; //$NON-NLS-1$
-	public static final String MSG_CONNECTING_TO_SERVER= "RSEC2312"; //$NON-NLS-1$
-	public static final String MSG_INITIALIZING_SERVER= "RSEC2313"; //$NON-NLS-1$
-	public static final String MSG_PORT_OUT_RANGE = "RSEC2316"; //$NON-NLS-1$
-
-	public static final String MSG_COMM_CONNECT_FAILED 		= "RSEC1001"; //$NON-NLS-1$
-
-	public static final String MSG_COMM_PWD_EXISTS			= "RSEC2101"; //$NON-NLS-1$
-	public static final String MSG_COMM_PWD_MISMATCH		= "RSEC2102"; //$NON-NLS-1$
-	public static final String MSG_COMM_PWD_BLANKFIELD		= "RSEC2103"; //$NON-NLS-1$
-
-	public static final String MSG_COMM_ENVVAR_DUPLICATE	= "RSEC2001"; //$NON-NLS-1$
-	public static final String MSG_COMM_ENVVAR_NONAME		= "RSEC2002"; //$NON-NLS-1$
-	public static final String MSG_COMM_ENVVAR_INVALIDCHAR	= "RSEC2004"; //$NON-NLS-1$
-	
-	public static final String MSG_COMM_SERVER_NOTSTARTED	= "RSEC2301"; //$NON-NLS-1$
-	public static final String MSG_COMM_INVALID_LOGIN		= "RSEC2302"; //$NON-NLS-1$
-	
-	public static final String MSG_COMM_INCOMPATIBLE_PROTOCOL = "RSEC2303"; //$NON-NLS-1$
-	public static final String MSG_COMM_INCOMPATIBLE_UPDATE   = "RSEC2304"; //$NON-NLS-1$
-
-	
-	public static final String MSG_COMM_REXEC_NOTSTARTED      = "RSEC2305"; //$NON-NLS-1$
-	
-	public static final String MSG_COMM_PORT_WARNING          = "RSEC2306"; //$NON-NLS-1$
-	
-	public static final String MSG_COMM_SERVER_OLDER_WARNING  = "RSEC2308"; //$NON-NLS-1$
-	public static final String MSG_COMM_CLIENT_OLDER_WARNING  = "RSEC2309"; //$NON-NLS-1$
-	
-	public static final String MSG_COMM_USING_SSL  = "RSEC2314"; //$NON-NLS-1$
-	public static final String MSG_COMM_NOT_USING_SSL  = "RSEC2315"; //$NON-NLS-1$
-	
-	public static final String MSG_VALIDATE_PASSWORD_EMPTY   = "RSEG1035"; //MSG_VALIDATE_PREFIX + "PasswordRequired"; //$NON-NLS-1$
-	public static final String MSG_VALIDATE_PASSWORD_EXPIRED = "RSEG1036"; //MSG_VALIDATE_PREFIX + "PasswordExpired";	 //$NON-NLS-1$
-	public static final String MSG_VALIDATE_PASSWORD_INVALID = "RSEG1297"; //$NON-NLS-1$
-
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IDStoreDefaultPreferenceConstants.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IDStoreDefaultPreferenceConstants.java
deleted file mode 100644
index 81752487d..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/IDStoreDefaultPreferenceConstants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [228334][api][breaking][dstore] Default DataStore connection timeout is too short
- * David McKnight   (IBM)        - [285083][dstore] default socket timeout preference value is too low
- ********************************************************************************/
-package org.eclipse.rse.internal.connectorservice.dstore;
-
-public interface IDStoreDefaultPreferenceConstants {
-	public static final boolean DEFAULT_PREF_CACHE_REMOTE_CLASSES = true;
-	public static final int DEFAULT_PREF_SOCKET_TIMEOUT = 10000;
-	public static final boolean DEFAULT_PREF_DO_KEEPALIVE = true;
-	public static final int DEFAULT_PREF_KEEPALIVE_RESPONSE_TIMEOUT = 60000;
-	public static final int DEFAULT_PREF_SOCKET_READ_TIMEOUT = 3600000; 
-	public static final boolean DEFAULT_ALERT_MISMATCHED_SERVER = true;
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java
deleted file mode 100644
index 97fc4df66..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/RexecDstoreServer.java
+++ /dev/null
@@ -1,1219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() 
- * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
- * David McKnight   (IBM)        - [220547] [api][breaking] SimpleSystemMessage needs to specify a message id and some messages should be shared
- * David McKnight   (IBM)        - [221095] [dstore][launcher] Specified REXEC port number is not used
- * David McKnight   (IBM)        - [228334][api][breaking][dstore] Default DataStore connection timeout is too short     
- * David McKnight   (IBM)        - [235756] [dstore] Unable to connect to host with SSL via REXEC
- *******************************************************************************/
-
-package org.eclipse.rse.internal.connectorservice.dstore;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.net.Socket;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.dstore.core.client.ClientConnection;
-import org.eclipse.dstore.core.client.ConnectionStatus;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.rse.core.model.SystemSignonInformation;
-import org.eclipse.rse.core.subsystems.IRemoteServerLauncher;
-import org.eclipse.rse.core.subsystems.IServerLauncher;
-import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
-import org.eclipse.rse.services.clientserver.messages.SimpleSystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.SystemBasePlugin;
-
-/**
- * Launch Datastore server on selected host using the rexec
- * protocol
- */
-public class RexecDstoreServer implements IServerLauncher
-{
-	private SystemMessage _errorMessage;
-	private SystemSignonInformation signonInfo;
-	//private String host = null;
-	private String cwd = null;
-	private String invocation = null;
-	//private String userID = null;
-	private int rexecPort = 512; // the port where rexecd normally listens
-	private String cmd = null;
-	//private String pwd = null;
-	private static String ASCII_TEST_STRING = "ASCII"; //$NON-NLS-1$
-	private static String PORT_LEADING_STRING = "Server Started Successfully"; //$NON-NLS-1$
-	private static final String EZYRD11E="EZYRD11E"; //$NON-NLS-1$
-	private ClientConnection clientConnection;
-	private IServerLauncherProperties propertyInfo;
-	private boolean isModeChecked = false;
-	private boolean checkPort =true;
-	private boolean logInfo = false;
-	private int _socketTimeoutValue = IDStoreDefaultPreferenceConstants.DEFAULT_PREF_SOCKET_TIMEOUT;
-
-	private static char[] ebcdictounicode =
-		{
-			0x0000,
-			0x0001,
-			0x0002,
-			0x0003,
-			0x0000,
-			0x0009,
-			0x0000,
-			0x007F,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x000B,
-			0x000C,
-			0x000D,
-			0x000E,
-			0x000F,
-			0x0010,
-			0x0011,
-			0x0012,
-			0x0013,
-			0x0000,
-			0x000A,
-			0x0008,
-			0x0000,
-			0x0018,
-			0x0019,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x001C,
-			0x0000,
-			0x0000,
-			0x000A,
-			0x0017,
-			0x001B,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0005,
-			0x0006,
-			0x0007,
-			0x0000,
-			0x0000,
-			0x0016,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0004,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0014,
-			0x0015,
-			0x0000,
-			0x001A,
-			0x0020,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x002E,
-			0x003C,
-			0x0028,
-			0x002B,
-			0x007C,
-			0x0026,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0021,
-			0x0024,
-			0x002A,
-			0x0029,
-			0x003B,
-			0x0000,
-			0x002D,
-			0x002F,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x007C,
-			0x002C,
-			0x0025,
-			0x005F,
-			0x003E,
-			0x003F,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0060,
-			0x003A,
-			0x0023,
-			0x0040,
-			0x0027,
-			0x003D,
-			0x0022,
-			0x0000,
-			0x0061,
-			0x0062,
-			0x0063,
-			0x0064,
-			0x0065,
-			0x0066,
-			0x0067,
-			0x0068,
-			0x0069,
-			0x0000,
-			0x007B,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x002B,
-			0x0000,
-			0x006A,
-			0x006B,
-			0x006C,
-			0x006D,
-			0x006E,
-			0x006F,
-			0x0070,
-			0x0071,
-			0x0072,
-			0x0000,
-			0x007D,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0073,
-			0x0074,
-			0x0075,
-			0x0076,
-			0x0077,
-			0x0078,
-			0x0079,
-			0x007A,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x005B,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x005D,
-			0x0000,
-			0x002D,
-			0x007D,
-			0x0041,
-			0x0042,
-			0x0043,
-			0x0044,
-			0x0045,
-			0x0046,
-			0x0047,
-			0x0048,
-			0x0049,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x007D,
-			0x004A,
-			0x004B,
-			0x004C,
-			0x004D,
-			0x004E,
-			0x004F,
-			0x0050,
-			0x0051,
-			0x0052,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x005C,
-			0x0000,
-			0x0053,
-			0x0054,
-			0x0055,
-			0x0056,
-			0x0057,
-			0x0058,
-			0x0059,
-			0x005A,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0030,
-			0x0031,
-			0x0032,
-			0x0033,
-			0x0034,
-			0x0035,
-			0x0036,
-			0x0037,
-			0x0038,
-			0x0039,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000,
-			0x0000 };
-			
-	/**
-	 * Constructor
-	 */
-	public RexecDstoreServer()
-	{
-		super();
-	}
-	
-	/**
-	 * Set the datastore client connection. This is reset for each connect()
-	 */
-	public void setClientConnection(ClientConnection clientConnection)
-	{
-		this.clientConnection = clientConnection;		
-	}
-
-	/**
-	 * Set the remote system signon information
-	 */
-	public void setSignonInformation(SystemSignonInformation info)
-	{
-		this.signonInfo = info;
-	}
-	
-	/**
-	 * Get the remote system signon information, as set in
-	 *  {@link #setSignonInformation(SystemSignonInformation)}
-	 */
-	public SystemSignonInformation getSignonInformation()
-	{
-		return signonInfo;
-	}
-
-	/**
-	 * Set the object which contains the user-specified properties that 
-	 *  are used by this launcher
-	 */
-	public void setServerLauncherProperties(IServerLauncherProperties propertyInfo)
-	{
-		this.propertyInfo = propertyInfo;
-				
-		// set path...
-		this.cwd = ((IRemoteServerLauncher)propertyInfo).getServerPath();
-		char separatorChar = signonInfo.getSystemType().isWindows() ? '\\' : '/';			
-		if (cwd.length() > 0 && cwd.charAt(cwd.length() - 1) != separatorChar)
-			cwd += separatorChar;
-	    // set script...
-	    this.invocation = ((IRemoteServerLauncher)propertyInfo).getServerScript();  
-	    
-	    // set port
-	    this.rexecPort = ((IRemoteServerLauncher)propertyInfo).getRexecPort();
-	    
-	}
-	
-	/**
-	 * Get the object which contians the user-specified properties that are
-	 *  used by this launcher. As set in {@link #setServerLauncherProperties(IServerLauncherProperties)}. 
-	 */
-	public IServerLauncherProperties getServerLauncherProperties()
-	{
-		return propertyInfo;
-	}
-
-	/**
-	 * Determine if the remote server needs to be launched or not.
-	 * Generally is always false.
-	 */
-	public boolean isLaunched()
-	{
-		return false;
-	}
-		
-	/**
-	 * Send a command to the host via rexec to launch the datastore server
-	 * under the specified user ID/pwd. the datastore server will emit 
-	 * messages that include the port number on which the server is listening
-	 * for client connections
-	 * 
-	 * @return port number as String
-	 */
-	/*
-	 * There used to be a problem in Communications Server for z/OS and 
-	 * the message from the REXEC daemon was in EBCDIC. see APAR PQ76782.
-	 * Since this problem was fixed in Communication Server, there is no need to convert EBCDIC to ASCII
-	 */
-	// updated method
-	public Object launch(IProgressMonitor monitor) throws Exception
-	{	
-		
-		boolean isEBCDICTest=false;
-		isModeChecked= false;
-		checkPort=true;
-		_errorMessage = null;
-		String port = new String("0"); // default no port //$NON-NLS-1$
-		//String hostResponse = "";	//buffer to hold all the messages, so that it can be printed out later 
-		String originalHostResponse=""; //$NON-NLS-1$
-		String convertedHostResponse=""; //$NON-NLS-1$
-		String debugOptions = System.getProperty("REXEC_DEBUG"); //$NON-NLS-1$
-		if (debugOptions!= null){
-			if (debugOptions.toUpperCase().indexOf("LOG") > -1) //$NON-NLS-1$
-				logInfo = true;
-			if (debugOptions.toUpperCase().indexOf("EBCDIC") > -1) //$NON-NLS-1$
-				isEBCDICTest=true;
-		}
-		boolean isEBCDIC = false;
-		try
-		{
-
-			// establish socket for rexec connection
-			Socket rexecCall = new Socket(signonInfo.getHostname(), rexecPort); // rexec listens here - 512
-
-			// set socket timeout value
-			rexecCall.setSoTimeout(_socketTimeoutValue);
-			
-			// set up data streams on rexec socket
-			DataOutputStream rxOut = new DataOutputStream(rexecCall.getOutputStream());
-			DataInputStream rxIn = new DataInputStream(rexecCall.getInputStream());
-
-			// we're not opening a socket for stderr to circumvent problems that
-			// may arise if the client is behind a firewall with respect to the
-			// host, in which case the rexec daemon may have trouble connecting 
-			// to the client error port.
-			// Not sending a port number at this point indicates to the daemon
-			// that there is no error socket to establish.
-			rxOut.writeByte(0); // send null terminator
-			rxOut.flush();
-
-			// send userid and password on rexec socket
-			rxOut.writeBytes(signonInfo.getUserId());
-			rxOut.writeByte(0); // send null terminator
-			rxOut.writeBytes(signonInfo.getPassword());
-			rxOut.writeByte(0); // send null terminator
-			rxOut.flush();
-
-			// send the command on rexec socket to start datastore daemon listening
-			// on any port
-			// TODO - assumes a particular script and location to start the server,
-			// this should be stored in some resource bundle later 
-			//cmd = new String ("echo USSTEST;cd ~/dstore;start_anyport");
-			//cmd = new String("echo " + ASCII_TEST_STRING + ";cd ~/rseserver;start_anyport");
-			cmd = new String("echo " + ASCII_TEST_STRING + ";cd " + this.cwd + ";" + this.invocation); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			//cmd = new String("echo " + ASCII_TEST_STRING + ";cd " + this.cwd + ";" + this.invocation + " " + System.getProperty("user.name"));
-			logMessage("The command is " + cmd); //$NON-NLS-1$
-			SystemBasePlugin.logInfo("RexecDstoreServer :"); //$NON-NLS-1$
-
-			rxOut.writeBytes(cmd);
-			rxOut.writeByte(0); // send null terminator
-			rxOut.flush();
-
-			int inBytes = rxIn.available(); // any data available?
-			
-			int timeout = _socketTimeoutValue;
-			
-			while (inBytes == 0 && timeout > 0)
-			{
-				if (monitor.isCanceled()) // Cancel button pressed?
-					return "0"; //$NON-NLS-1$
-				
-				// try for more input
-				Thread.sleep(100);
-				inBytes = rxIn.available();
-				timeout--;
-			}
-			
-			if (timeout == 0) {
-				String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN, signonInfo.getHostname());
-				String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN_DETAILS, ""); //$NON-NLS-1$
-				
-				SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IConnectorServiceMessageIds.MSG_COMM_INVALID_LOGIN, IStatus.ERROR, msgTxt, msgDetails);
-				_errorMessage = msg;
-				return port;
-			}
-
-			// get command output on socket, one byte at a time until
-			// got the datastore port number or EOF is reached for this input 
-			String maybePort=null;
-			while (true ){  
-				if (monitor.isCanceled())
-					return "0"; //$NON-NLS-1$
-				byte aByte = rxIn.readByte();
-				if (isEBCDICTest)
-					aByte = convertFromASCIIToEBCDIC(aByte); // for EBCDIC Test
-				if (aByte == 0) // drop the null
-					continue;
-				originalHostResponse += (char)aByte;
-				logMessage("Host response is " + originalHostResponse); //$NON-NLS-1$
-				if (!isModeChecked)
-				{
-					convertedHostResponse += convertFromEBCDICToASCII(aByte);
-					logMessage("Host response is converted to " + convertedHostResponse); //$NON-NLS-1$
-					if (originalHostResponse.indexOf(ASCII_TEST_STRING) > -1) 
-					{  // It's ASCII mode
-						isModeChecked = true;
-						logMessage("This is the ASCII mode. "); //$NON-NLS-1$
-					}
-					else if (convertedHostResponse.indexOf(ASCII_TEST_STRING) > -1)
-					{ // It's EBCDIC mode
-						logMessage("This is the EBCDIC mode. "); //$NON-NLS-1$
-						isModeChecked = true;
-						isEBCDIC = true;
-					}
-				} 
-				else 
-				{
-					if (isEBCDIC)
-					{
-						convertedHostResponse += convertFromEBCDICToASCII(aByte);
-						logMessage("Host response is converted to " + convertedHostResponse); //$NON-NLS-1$
-						if(checkPort)
-						{ // It's EBCDIC mode   
-							maybePort = extractPortNumber (convertedHostResponse);
-						}
-					} 
-					else if (checkPort)
-					{  // it's ASCII
-						maybePort = extractPortNumber (originalHostResponse);
-					}
-					if (maybePort == null)
-						continue ;
-					port = maybePort;
-					break;
-				}
-			}
-			// -----------------------------------------------------------------
-			// Close input/output streams and socket
-			// -----------------------------------------------------------------
-			rxIn.close();
-			rxOut.close();
-			rexecCall.close();
-			logMessage("Going to return port " + port); //$NON-NLS-1$
-			return port;
-		} 
-		catch (EOFException e) 
-		{
-			// do nothing 
-		} 
-		catch (Exception e)		
-		{
-			e.printStackTrace();
-		}
-		// if no port is found, create error message
-		String hostMessage = originalHostResponse;
-		if (isEBCDIC) // pick up the right messages
-			hostMessage = convertedHostResponse;
-		int index = hostMessage.indexOf(ASCII_TEST_STRING);
-		if (index > -1)  // remove the embedded ASCII_TEST_STRING
-			hostMessage = hostMessage.substring(0,index) + hostMessage.substring(index+1+ASCII_TEST_STRING.length());
-		if (hostMessage.indexOf(EZYRD11E) >0 ){
-			String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN, signonInfo.getHostname());
-			String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_INVALID_LOGIN_DETAILS, hostMessage);
-			
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IConnectorServiceMessageIds.MSG_COMM_INVALID_LOGIN, IStatus.ERROR, msgTxt, msgDetails);
-			_errorMessage = msg;
-		} else {
-			String msgTxt = NLS.bind(ConnectorServiceResources.MSG_COMM_REXEC_NOTSTARTED, ""+rexecPort, signonInfo.getHostname()); //$NON-NLS-1$
-			String msgDetails = NLS.bind(ConnectorServiceResources.MSG_COMM_REXEC_NOTSTARTED_DETAILS, hostMessage);
-			
-			SystemMessage msg = new SimpleSystemMessage(Activator.PLUGIN_ID, IConnectorServiceMessageIds.MSG_COMM_REXEC_NOTSTARTED, IStatus.ERROR, msgTxt, msgDetails);
-			_errorMessage = msg;
-			
-		}
-
-		return port;
-	} 
-	/**
-	 * @param newLine
-	 * @return
-	 */
-	/*
-	private String checkCodePage(String newLine) {
-		// check in which mode the host is sending the message back 
-		if (isModeChecked) 
-		return newLine;
-		if (newLine.indexOf(ASCII_TEST_STRING) > -1){   // It's ASCII mode
-			isASCIIMode = true;
-			isModeChecked = true;
-		} else  { 				// Check whether it's EBCDIC mode
-			String convertedNewLine = convertFromEBCDICToASCII(newLine.toCharArray());
-			if (convertedNewLine.indexOf(ASCII_TEST_STRING) > -1){   
-				isASCIIMode = false;
-				isModeChecked = true;
-			}
-		}
-		return newLine;
-	}
-	*/
-	/* wait until host responds with some data - at least should send null byte */
-/*			char cChar;
-			int inBytes = rxIn.available(); // any data available? 
-			StringBuffer buf = new StringBuffer();
-			String chunk = null;
-
-			while (inBytes == 0)
-			{
-				if (monitor.isCanceled())
-					return "0";
-					
-				// try for more input
-				Thread.sleep(100);
-
-				inBytes = rxIn.available();
-			}
-
-			// get command output on socket, one byte at a time until
-			// got the datastore port number or EOF is reached for this input 
-			byte[] bDSPort = new byte[4];
-			byte[] byteBuf = new byte[8];
-			int index;
-			if (inBytes > 0)
-			{
-				byte aByte = rxIn.readByte();
-				cChar = (char)aByte; // discard first null byte
-				
-//				port = getPortASCII(rxIn);
-				// should have at least 8 bytes plus newline from the "echo USSTEST" command. This is
-				// used to test if the data being returned is ASCII or EBCDIC
-				for (index = 0; index < ASCII_TEST_STRING.length(); index++)
-				{ // include newline too
-					aByte = rxIn.readByte();
-					cChar = (char)aByte;
-					buf.append(cChar);
-					byteBuf[index] = aByte;
-				}
-				chunk = new String(buf);
-
-				if (chunk.indexOf(ASCII_TEST_STRING) >= 0)
-				{
-					// returned data is ASCII
-					port = getPortASCII(rxIn);
-				}
-				else
-				{
-
-					chunk = convertFromEBCDICToASCII(byteBuf);
-					if (chunk.indexOf(ASCII_TEST_STRING) >= 0)
-					{
-
-						// returned data is EBCDIC
-						port = getPortEBCDIC(rxIn);
-					}
-					else
-					{
-						// rexec error!
-						// there's an error
-						while (cChar != '\n')
-						{
-							cChar = (char) rxIn.readByte();
-							buf.append(cChar);
-						}
-						SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
-						msg.makeSubstitution(signonInfo.getHostname(), buf.toString());
-						_errorMessage = msg;
-					}
-				}
-			}
-			rxIn.close();
-			rxOut.close();
-			rexecCall.close();
-
-		}
-		catch (Exception e)
-		{
-			System.out.println(e);
-			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED);
-			msg.makeSubstitution(""+rexecPort, signonInfo.getHostname(), e.getMessage());
-			_errorMessage = msg;
-		}
-
-		return port;
-	} // end of launch method
-	*/
-	/* original method
-	public Object launch(IProgressMonitor monitor) throws Exception
-	{
-		_errorMessage = null;
-		String port = new String("0"); // default no port
-		try
-		{
-
-			// establish socket for rexec connection
-			Socket rexecCall = new Socket(signonInfo.getHostname(), rexecPort); // rexec listens here - 512
-
-			// set up data streams on rexec socket
-			DataOutputStream rxOut = new DataOutputStream(rexecCall.getOutputStream());
-			DataInputStream rxIn = new DataInputStream(rexecCall.getInputStream());
-
-			// we're not opening a socket for stderr to circumvent problems that
-			// may arise if the client is behind a firewall with respect to the
-			// host, in which case the rexec daemon may have trouble connecting 
-			// to the client error port.
-			// Not sending a port number at this point indicates to the daemon
-			// that there is no error socket to establish.
-			rxOut.writeByte((int) 0); // send null terminator
-			rxOut.flush();
-
-			// send userid and password on rexec socket
-			rxOut.writeBytes(signonInfo.getUserid());
-			rxOut.writeByte((int) 0); // send null terminator
-			rxOut.writeBytes(signonInfo.getPassword());
-			rxOut.writeByte((int) 0); // send null terminator
-			rxOut.flush();
-
-			// send the command on rexec socket to start datastore daemon listening
-			// on any port
-			// TODO - assumes a particular script and location to start the server,
-			// this should be stored in some resource bundle later 
-			//cmd = new String ("echo USSTEST;cd ~/dstore;start_anyport");
-			//cmd = new String("echo " + ASCII_TEST_STRING + ";cd ~/rseserver;start_anyport");
-			cmd = new String("echo " + ASCII_TEST_STRING + ";cd " + this.cwd + ";" + this.invocation);
-
-			rxOut.writeBytes(cmd);
-			rxOut.writeByte((int) 0); // send null terminator
-			rxOut.flush();
-
-			// wait until host responds with some data - at least should send null byte 
-
-			char cChar;
-			int inBytes = rxIn.available(); // any data available? 
-			StringBuffer buf = new StringBuffer();
-			String chunk = null;
-
-			while (inBytes == 0)
-			{
-				if (monitor.isCanceled())
-					return "0";
-					
-				// try for more input
-				Thread.sleep(100);
-
-				inBytes = rxIn.available();
-			}
-
-			// get command output on socket, one byte at a time until
-			// got the datastore port number or EOF is reached for this input 
-			byte[] bDSPort = new byte[4];
-			byte[] byteBuf = new byte[8];
-			int index;
-			if (inBytes > 0)
-			{
-				byte aByte = rxIn.readByte();
-				cChar = (char)aByte; // discard first null byte
-
-				// should have at least 8 bytes plus newline from the "echo USSTEST" command. This is
-				// used to test if the data being returned is ASCII or EBCDIC
-				for (index = 0; index < ASCII_TEST_STRING.length(); index++)
-				{ // include newline too
-					aByte = rxIn.readByte();
-					cChar = (char)aByte;
-					buf.append(cChar);
-					byteBuf[index] = aByte;
-				}
-				chunk = new String(buf);
-
-				if (chunk.indexOf(ASCII_TEST_STRING) >= 0)
-				{
-					// returned data is ASCII
-					port = getPortASCII(rxIn);
-				}
-				else
-				{
-
-					chunk = convertFromEBCDICToASCII(byteBuf);
-					if (chunk.indexOf(ASCII_TEST_STRING) >= 0)
-					{
-
-						// returned data is EBCDIC
-						port = getPortEBCDIC(rxIn);
-					}
-					else
-					{
-						// rexec error!
-						// there's an error
-						while (cChar != '\n')
-						{
-							cChar = (char) rxIn.readByte();
-							buf.append(cChar);
-						}
-						SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_INVALID_LOGIN);
-						msg.makeSubstitution(signonInfo.getHostname(), buf.toString());
-						_errorMessage = msg;
-					}
-				}
-
-			}
-			rxIn.close();
-			rxOut.close();
-			rexecCall.close();
-
-		}
-		catch (Exception e)
-		{
-			System.out.println(e);
-			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_REXEC_NOTSTARTED);
-			msg.makeSubstitution(""+rexecPort, signonInfo.getHostname(), e.getMessage());
-			_errorMessage = msg;
-		}
-
-		return port;
-	} // end of launch method
-*/
-	/**
-	 * Determine if we are connected to the remote server or not.  
-	 * @return true if we are connected, false otherwise.
-	 */
-	public boolean isConnected()
-	{
-		if (clientConnection != null)
-		{
-			return clientConnection.isConnected();
-		}
-		return false;		
-	}
-	
-	/**
-	 * Connect to the remote server. 
-	 * @param connectPort the port to use for launching the server
-	 * @param monitor a monitor for showing progress
-	 * @see #getErrorMessage()
-	 * @return Anything you want.
-	 */
-	public Object connect(int connectPort, IProgressMonitor monitor) throws Exception
-	{
-		clientConnection.setPort(Integer.toString(connectPort));
-				
-		if (monitor != null)
-		{
-			String cmsg = NLS.bind(ConnectorServiceResources.MSG_CONNECTING_TO_SERVER, clientConnection.getPort());
-			monitor.subTask(cmsg);
-		}
-				
-		// connect to launched server
-		ConnectionStatus connectStatus = clientConnection.connect(null);
-		
-		return connectStatus;
-	}
-
-	/**
-	 * Disconnect from the remote server
-	 * @see #getErrorMessage()
-	 */
-	public void disconnect() throws Exception
-	{
-		if (clientConnection != null)
-		{ 
-			/* TODO!
-			// Is disconnect being called because the network (connection) went down?
-			if (_connectionStatusListener != null && _connectionStatusListener.isConnectionDown())
-			{
-				fireCommunicationsEvent(CommunicationsEvent.CONNECTION_ERROR);
-			}
-			else
-			{
-				// Fire comm event to signal state about to change
-				fireCommunicationsEvent(CommunicationsEvent.BEFORE_DISCONNECT);
-			}
-
-			DataStore dataStore = getDataStore();
-			if (dataStore != null && _connectionStatusListener != null)
-			{
-				dataStore.getDomainNotifier().removeDomainListener(_connectionStatusListener);
-			}
-
-			clientConnection.disconnect();
-			clientConnection = null;
-			getUserId(); // Clear any cached local user IDs
-			sysInfo = null;
-
-			// Fire comm event to signal state changed
-			fireCommunicationsEvent(CommunicationsEvent.AFTER_DISCONNECT);
-			*/
-			clientConnection.disconnect();
-			clientConnection = null;
-		}
-	}
-	
-	/**
-	 * Return the last error message issued
-	 */
-	public SystemMessage getErrorMessage()
-	{
-		return _errorMessage;
-	}
-	
-	// ------------------
-	// PRIVATE METHODS...
-	// ------------------
-/*
-	// sam private String convertFromEBCDICToASCII(byte[] eBytes)
-	private String convertFromEBCDICToASCII(char[] eBytes)
-	{
-	
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < eBytes.length; i++)
-		{
-			byte bByte = (byte)eBytes[i];
-			int index = bByte;
-			if (index < 0)
-			{
-				index = 256 + index;
-			}
-			char cChar = ebcdictounicode[index];
-			buf.append(cChar);
-		}
-		return buf.toString();
-	}	
-*/
-	/**
-	 * Read the data returned on the rexec port as ASCII characters and
-	 * detect the port number in the datastore server messages
-	 * @param rxIn
-	 * @return String port number
-	 */
-	/*
-	private String getPortASCII(DataInputStream rxIn)
-	{
-		String port = new String("0"); // default to no port
-		char cChar;
-		byte bByte;
-		int numPortChars = 5;
-		byte[] bDSPort = new byte[numPortChars];
-		StringBuffer buf = new StringBuffer();
-		StringBuffer diagnosticString = new StringBuffer();
-		String chunk = null;
-		boolean serverStartedMsg = false;
-		while (true)
-		{
-			try
-			{
-				cChar = (char) rxIn.readByte();
-				if (cChar == '\n')
-				{ // hit a newline
-					chunk = new String(buf);
-				
-					// DKM: need to handle mixed order cases
-
-					if (chunk.indexOf("Server Started Successfully") >= 0)
-					{
-						serverStartedMsg = true;
-						// this server output precedes the datastore server port number
-						buf.delete(0, buf.length()); // clear buffer
-
-						// might have already got port
-						// check first
-						if (port.equals("0"))
-						{
-							rxIn.read(bDSPort, 0, numPortChars); // get next 4 bytes - datastore port #
-							for (int i = 0; i < numPortChars; i++)
-							{
-								char c = (char) bDSPort[i];
-								if (Character.isDigit(c))
-									buf.append(c);
-							}
-							port = new String(buf); // got port where datastore server is listening
-
-							// check for valid port
-							try
-							{
-								int possiblePort = Integer.parseInt(port);
-								break;
-								
-							}
-							catch (Exception e)
-							{
-								// not valid												
-							}
-						}
-					
-					}
-					else
-					{
-						// might be the port
-						try
-						{
-							int possiblePort = Integer.parseInt(chunk);
-							port = chunk;
-							if (serverStartedMsg)
-								break;
-						}
-						catch (Exception e)
-						{
-						}
-					}
-
-					buf.delete(0, buf.length()); // clear buffer
-				}
-				else
-				{
-					diagnosticString.append(cChar);
-					buf.append(cChar);
-				}
-			}
-			// EOF indicates no more lines to come through on error socket
-			catch (EOFException e)
-			{
-				break;
-			}
-			catch (IOException e)
-			{
-				break;
-			}
-		} // end of while true
-
-		// if port is somethign wierd...log this
-		if (port.equals("0"))
-		{
-			// port is weird!
-
-			try
-			{
-
-				int available = rxIn.available();
-				while (available > 0)
-				{
-					rxIn.read(bDSPort, 0, numPortChars);
-					for (int i = 0; i < numPortChars; i++)
-					{
-						char c = (char) bDSPort[i];
-						diagnosticString.append(c);
-					}
-					available = rxIn.available();
-				}
-
-			}
-			catch (Exception ex)
-			{
-			}
-
-			SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_SERVER_NOTSTARTED);
-			diagnosticString.insert(0, "\n\n");
-			msg.makeSubstitution(signonInfo.getHostname(), diagnosticString.toString());
-
-			_errorMessage = msg;
-		}
-
-		return port;
-	}
-*/
-	/**
-	 * Read the data returned on the rexec port as EBCDIC characters and
-	 * convert to unicode. Detect the port number in the datastore server messages
-	 * @param rxIn
-	 * @return String port number
-	 */
-	/*
-	private String getPortEBCDIC(DataInputStream rxIn)
-	{
-		String port = new String("0"); // default to no port
-		int index;
-		char cChar;
-		byte bByte;
-		byte[] bDSPort = new byte[4];
-		StringBuffer buf = new StringBuffer();
-		String chunk = null;
-		while (true)
-		{
-			try
-			{
-				bByte = rxIn.readByte();
-				index = bByte;
-				if (index < 0)
-				{
-					index = 256 + index;
-				}
-				cChar = ebcdictounicode[index];
-				if (cChar == '\n')
-				{ // hit a newline
-					chunk = new String(buf);
-
-					if (chunk.indexOf("Server Started Successfully") >= 0)
-					{
-						// this server output precedes the datastore server port number
-						buf.delete(0, buf.length()); // clear buffer
-						rxIn.read(bDSPort, 0, 4); // get next 4 bytes - datastore port #
-						for (int i = 0; i < 4; i++)
-						{
-							index = bDSPort[i];
-							if (index < 0)
-							{
-								index = 256 + index;
-							}
-							buf.append(ebcdictounicode[index]);
-						}
-						port = new String(buf); // got port where datastore server is listening
-						break;
-					}
-					buf.delete(0, buf.length()); // clear buffer
-				}
-				else
-				{
-					buf.append(cChar);
-				}
-			}
-			// EOF indicates no more lines to come through on error socket
-			catch (EOFException e)
-			{
-				break;
-			}
-			catch (IOException e)
-			{
-				break;
-			}
-		} // end of while true
-		return port;
-	}
-	*/
-	private String extractPortNumber (String hostResponse) {
-		String port ="0"; //$NON-NLS-1$
-		logMessage("Going to find port number. "); //$NON-NLS-1$
-		int index = hostResponse.indexOf(PORT_LEADING_STRING);
-		if ( index < 0 ) 
-			return null;
-		logMessage("Found the leading string. "); //$NON-NLS-1$
-		String portString = hostResponse.substring(index + PORT_LEADING_STRING.length());
-		logMessage("Removed the leading string as " +  portString); //$NON-NLS-1$
-		if (portString != null && portString.startsWith("\n")) //$NON-NLS-1$
-			portString = portString.substring(1);
-		if (portString == null)
-			return null;
-		
-		//if (portString.length() < 4) 
-		//	return null;
-		
-		// change to support 5 digit ports
-		StringBuffer portBuffer = new StringBuffer();
-		
-		for (int i = 0; i < portString.length(); i++)
-		{
-		    char c = portString.charAt(i);
-		    if (Character.isDigit(c))
-		    {
-		        portBuffer.append(c);
-		    }		    
-		}
-		
-		if (portString.length() != portBuffer.length())
-		{
-			port = portBuffer.toString();
-			// old code - didn't support 5 digits
-			//port = portString.substring(0,4);
-			
-			logMessage("Got the port " +  port); //$NON-NLS-1$
-			try 
-			{
-				Integer.parseInt(port);
-				logMessage("Going to return port " +  port); //$NON-NLS-1$
-				return port;
-			} 
-			catch (RuntimeException e) 
-			{
-				e.printStackTrace();
-				logMessage("Got the wrong port " +  port); //$NON-NLS-1$
-				checkPort=false;
-				return null;
-			}
-		}
-		else
-		{
-		    return null;
-		}
-	}
-	private char convertFromEBCDICToASCII(byte eByte)
-	{
-			int index = eByte;
-			if (index < 0)
-			{
-				index = 256 + index;
-			}
-			return ebcdictounicode[index];
-	}
-	private byte convertFromASCIIToEBCDIC(byte eByte)
-	{
-			int index = eByte;
-			for (int i = 0; i <ebcdictounicode.length; i++) {
-				if (index == ebcdictounicode[i]){
-					if (i > 128)
-						return (byte )(i - 256);
-					return (byte)i;
-				}
-				
-			}
-			return (byte)0;
-	}
-	private void logMessage (String message) {
-		if (logInfo)
-			SystemBasePlugin.logError("RexecDstoreServer :" + message); //$NON-NLS-1$
-	}
-	
-	public void setSocketTimeoutValue(int value)
-	{
-		_socketTimeoutValue = value;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java
deleted file mode 100644
index 58f95f2a1..000000000
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/internal/connectorservice/dstore/ui/propertypages/DStorePreferencePage.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- * 
- * Contributors:
- * David McKnight   (IBM)        - [216596] dstore preferences (timeout, and others)
- * David McKnight  (IBM)         - [220123][dstore] Configurable timeout on irresponsiveness
- * David McKnight   (IBM)        - [228334][api][breaking][dstore] Default DataStore connection timeout is too short
- * David Dykstal (IBM) - [232317] add help for this preference page
- ********************************************************************************/
-package org.eclipse.rse.internal.connectorservice.dstore.ui.propertypages;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.rse.connectorservice.dstore.IUniversalDStoreConstants;
-import org.eclipse.rse.internal.connectorservice.dstore.DStoreResources;
-import org.eclipse.rse.ui.RSEUIPlugin;
-import org.eclipse.rse.ui.SystemWidgetHelpers;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-public class DStorePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener
-{
-
-	private Text _connectionTimeout;
-	private Button _doKeepaliveButton;
-	private Text _keepaliveResponseTimeout;
-	private Text _socketReadTimeout;
-	
-//	private Button _cacheRemoteClassesButton;
-	private Button _showMismatchedServerWarningButton;
-	
-	protected Control createContents(Composite gparent) {
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), RSEUIPlugin.HELPPREFIX + "DStorePreferencePage"); //$NON-NLS-1$
-
-		Composite parent = SystemWidgetHelpers.createComposite(gparent, 2);
-	
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		parent.setLayout(layout);
-		parent.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-		Composite connectComposite = SystemWidgetHelpers.createComposite(parent, 2);	
-		
-		SystemWidgetHelpers.createLabel(connectComposite, DStoreResources.RESID_PREFERENCE_CONNECTION_TIMEOUT_LABEL);
-		
-		_connectionTimeout = new Text(connectComposite, SWT.BORDER);
-		//GridData gd = new GridData(SWT.BEGINNING, SWT.CENTER, false, false);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.widthHint = 75;
-		gd.horizontalSpan =1;
-		_connectionTimeout.setLayoutData(gd);		
-		_connectionTimeout.setTextLimit(10);
-		_connectionTimeout.setToolTipText(DStoreResources.RESID_PREFERENCE_CONNECTION_TIMEOUT_TOOLTIP);
-		_connectionTimeout.addVerifyListener(new VerifyListener()
-		{
-			public void verifyText(VerifyEvent e)
-			{
-				e.doit = true;
-				for (int loop = 0; loop < e.text.length(); loop++)
-				{
-					if (!Character.isDigit(e.text.charAt(loop)))
-						e.doit = false;
-				}
-			}
-		});
-			
-		
-//		_cacheRemoteClassesButton = SystemWidgetHelpers.createCheckBox(parent, DStoreResources.RESID_PREFERENCE_CACHE_REMOTE_CLASSES_LABEL, this);
-//		_cacheRemoteClassesButton.setToolTipText(DStoreResources.RESID_PREFERENCE_CACHE_REMOTE_CLASSES_TOOLTIP);
-//		_cacheRemoteClassesButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, false));
-//		((GridData)_cacheRemoteClassesButton.getLayoutData()).horizontalSpan = 2;
-
-		_showMismatchedServerWarningButton = SystemWidgetHelpers.createCheckBox(parent, DStoreResources.RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_LABEL, this);
-		_showMismatchedServerWarningButton.setToolTipText(DStoreResources.RESID_PREFERENCE_SHOW_MISMATCHED_SERVER_TOOLTIP);
-		_showMismatchedServerWarningButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, false));
-		((GridData)_showMismatchedServerWarningButton.getLayoutData()).horizontalSpan = 2;		
-		
-		
-		// keepalive stuff
-		Group keepaliveGroup = SystemWidgetHelpers.createGroupComposite(parent, 2, DStoreResources.RESID_PREFERENCE_KEEPALIVE_LABEL);
-        layout = new GridLayout();
-        layout.numColumns = 2;
-        keepaliveGroup.setLayout(layout);
-        GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
-                | GridData.GRAB_HORIZONTAL);
-        keepaliveGroup.setLayoutData(data);
-
-		
-		
-		_doKeepaliveButton = SystemWidgetHelpers.createCheckBox(keepaliveGroup, DStoreResources.RESID_PREFERENCE_DO_KEEPALIVE_LABEL, this);
-		_doKeepaliveButton.setToolTipText(DStoreResources.RESID_PREFERENCE_DO_KEEPALIVE_TOOLTIP);
-		_doKeepaliveButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING, true, false));
-		((GridData)_doKeepaliveButton.getLayoutData()).horizontalSpan = 2;
-		
-		
-		SystemWidgetHelpers.createLabel(keepaliveGroup, DStoreResources.RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_LABEL);
-		
-		_socketReadTimeout = new Text(keepaliveGroup, SWT.BORDER);
-		gd = new GridData(SWT.BEGINNING, SWT.CENTER, false, false);
-		gd.widthHint = 75;
-		gd.horizontalSpan =1;
-		_socketReadTimeout.setLayoutData(gd);
-		_socketReadTimeout.setTextLimit(10);
-		_socketReadTimeout.setToolTipText(DStoreResources.RESID_PREFERENCE_KEEPALIVE_SOCKET_READ_TIMEOUT_TOOLTIP);
-		_socketReadTimeout.addVerifyListener(new VerifyListener()
-		{
-			public void verifyText(VerifyEvent e)
-			{
-				e.doit = true;
-				for (int loop = 0; loop < e.text.length(); loop++)
-				{
-					if (!Character.isDigit(e.text.charAt(loop)))
-						e.doit = false;
-				}
-			}
-		});
-		
-		SystemWidgetHelpers.createLabel(keepaliveGroup, DStoreResources.RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_LABEL);
-		
-		_keepaliveResponseTimeout = new Text(keepaliveGroup, SWT.BORDER);
-		gd = new GridData(SWT.BEGINNING, SWT.CENTER, false, false);
-		gd.widthHint = 75;
-		gd.horizontalSpan =1;
-		_keepaliveResponseTimeout.setLayoutData(gd);
-		_keepaliveResponseTimeout.setTextLimit(10);
-		_keepaliveResponseTimeout.setToolTipText(DStoreResources.RESID_PREFERENCE_KEEPALIVE_RESPONSE_TIMEOUT_TOOLTIP);
-		_keepaliveResponseTimeout.addVerifyListener(new VerifyListener()
-		{
-			public void verifyText(VerifyEvent e)
-			{
-				e.doit = true;
-				for (int loop = 0; loop < e.text.length(); loop++)
-				{
-					if (!Character.isDigit(e.text.charAt(loop)))
-						e.doit = false;
-				}
-			}
-		});
-		
-		
-	
-		
-		initControls();
-		return parent;
-	}
-	
-	private void initControls()
-	{
-		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-
-		
-		// timeout
-		int timeout = 0;
-		if (store.contains(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT)){
-			timeout = store.getInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT);
-		}
-		else { 
-			timeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT);
-			store.setDefault(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, timeout);
-		}
-		_connectionTimeout.setText(""+timeout); //$NON-NLS-1$
-		
-		
-		// cache remote classes
-		boolean cacheRemoteClasses = false;
-		if (store.contains(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES)) {
-			cacheRemoteClasses = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES);
-		}
-		else {
-			cacheRemoteClasses = store.getDefaultBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES);
-			store.setDefault(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, cacheRemoteClasses);
-		}
-//		_cacheRemoteClassesButton.setSelection(cacheRemoteClasses);
-		
-		
-		// do keepalive
-		boolean doKeepalive = false;
-		if (store.contains(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE)){
-			doKeepalive = store.getBoolean(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE);		
-		}
-		else {
-			doKeepalive = store.getDefaultBoolean(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE);	
-		}
-		_doKeepaliveButton.setSelection(doKeepalive);
-		
-		int socketTimeout = 0;
-		if (store.contains(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT)){
-			socketTimeout = store.getInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT);
-		}
-		else {
-			socketTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT);
-		}
-		_socketReadTimeout.setText(""+socketTimeout); //$NON-NLS-1$
-		_socketReadTimeout.setEnabled(doKeepalive);
-		
-		int keepaliveTimeout = 0;
-		if (store.contains(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT)){
-			keepaliveTimeout = store.getInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT);	
-		}
-		else {
-			keepaliveTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT);
-		}
-		_keepaliveResponseTimeout.setText(""+keepaliveTimeout); //$NON-NLS-1$
-		_keepaliveResponseTimeout.setEnabled(doKeepalive);
-		
-		// show mismatched server warning
-		boolean showMismatchedWarning = false;
-		if (store.contains(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER)){
-			showMismatchedWarning = store.getBoolean(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER);
-		}
-		else {
-			showMismatchedWarning = store.getDefaultBoolean(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER);
-		}
-		_showMismatchedServerWarningButton.setSelection(showMismatchedWarning);
-	}
-	
-	protected void performApply() {
-		super.performApply();
-		applyValues();
-	}
-	
-	protected void performDefaults() {
-		super.performDefaults();	
-		
-		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-
-		int timeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT);
-		_connectionTimeout.setText(""+timeout); //$NON-NLS-1$
-		
-		// do keepalive
-		boolean doKeepalive = store.getDefaultBoolean(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE);
-		_doKeepaliveButton.setSelection(doKeepalive);
-		
-		// socket read timeout 
-		int socketTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT);
-
-		_socketReadTimeout.setText(""+socketTimeout); //$NON-NLS-1$
-		_socketReadTimeout.setEnabled(doKeepalive);
-		
-		// keepalive response timeout
-		int keepaliveTimeout = store.getDefaultInt(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT);
-		_keepaliveResponseTimeout.setText(""+keepaliveTimeout); //$NON-NLS-1$
-		_keepaliveResponseTimeout.setEnabled(doKeepalive);
-		
-		
-		// show mismatched server warning
-		boolean showMismatchedWarning = store.getDefaultBoolean(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER);
-		_showMismatchedServerWarningButton.setSelection(showMismatchedWarning);
-		
-		// cache remote classes
-//		boolean cacheRemoteClasses = store.getDefaultBoolean(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES);
-//		_cacheRemoteClassesButton.setSelection(cacheRemoteClasses);
-		
-	}
-
-	public void init(IWorkbench workbench) {
-
-	}
-
-	public void handleEvent(Event event) {
-		if (event.widget == _doKeepaliveButton){
-			boolean isEnabled = _doKeepaliveButton.getSelection();
-			
-			_socketReadTimeout.setEnabled(isEnabled);
-			_keepaliveResponseTimeout.setEnabled(isEnabled);
-			
-		}
-	}
-
-	private void applyValues()
-	{
-		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-		
-		// timeout
-		String timeoutStr = _connectionTimeout.getText();
-		int timeout = Integer.parseInt(timeoutStr);
-		store.setValue(IUniversalDStoreConstants.RESID_PREF_SOCKET_TIMEOUT, timeout);	
-		
-		// do keepalive
-		boolean doKeepalive = _doKeepaliveButton.getSelection();
-		store.setValue(IUniversalDStoreConstants.RESID_PREF_DO_KEEPALIVE, doKeepalive);
-		
-		
-		// socket read timeout 
-		String socketTimeoutStr = _socketReadTimeout.getText();
-		int socketTimeout = Integer.parseInt(socketTimeoutStr);
-		store.setValue(IUniversalDStoreConstants.RESID_PREF_SOCKET_READ_TIMEOUT, socketTimeout);
-		
-		// keepalive response timeout
-		String keepaliveTimeoutStr = _keepaliveResponseTimeout.getText();
-		int keepaliveTimeout = Integer.parseInt(keepaliveTimeoutStr);
-		store.setValue(IUniversalDStoreConstants.RESID_PREF_KEEPALIVE_RESPONSE_TIMEOUT, keepaliveTimeout);
-		
-		
-		// cache remote classes
-//		boolean cacheRemoteClasses = _cacheRemoteClassesButton.getSelection();
-//		store.setValue(IUniversalDStoreConstants.RESID_PREF_CACHE_REMOTE_CLASSES, cacheRemoteClasses);				
-		
-		// show mismatched server warning
-		boolean showMismatchedWarning = _showMismatchedServerWarningButton.getSelection();
-		store.setValue(IUniversalDStoreConstants.ALERT_MISMATCHED_SERVER, showMismatchedWarning);
-
-	}
-	
-	public boolean performOk() {
-		applyValues();
-		return super.performOk();
-	}
-
-	
-	
-}
diff --git a/rse/plugins/org.eclipse.rse.core/.classpath b/rse/plugins/org.eclipse.rse.core/.classpath
deleted file mode 100644
index b7464f3ca..000000000
--- a/rse/plugins/org.eclipse.rse.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rse/plugins/org.eclipse.rse.core/.cvsignore b/rse/plugins/org.eclipse.rse.core/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/rse/plugins/org.eclipse.rse.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/rse/plugins/org.eclipse.rse.core/.project b/rse/plugins/org.eclipse.rse.core/.project
deleted file mode 100644
index 8fbb720bf..000000000
--- a/rse/plugins/org.eclipse.rse.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rse.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rse/plugins/org.eclipse.rse.core/.settings/.api_filters b/rse/plugins/org.eclipse.rse.core/.settings/.api_filters
deleted file mode 100644
index f7502b1ed..000000000
--- a/rse/plugins/org.eclipse.rse.core/.settings/.api_filters
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.rse.core" version="2">
-    <resource path="src/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java" type="org.eclipse.rse.core.subsystems.ISubSystemConfiguration">
-        <filter id="406052990">
-            <message_arguments>
-                <message_argument value="org.eclipse.rse.core.subsystems.ISubSystemConfiguration"/>
-                <message_argument value="getFilterPoolManagerList()"/>
-            </message_arguments>
-        </filter>
-        <filter id="406052990">
-            <message_arguments>
-                <message_argument value="org.eclipse.rse.core.subsystems.ISubSystemConfiguration"/>
-                <message_argument value="getSubSystemList()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
diff --git a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 3c6fe4c38..000000000
--- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Aug 06 17:32:46 CEST 2009
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.core.prefs b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 138063a1c..000000000
--- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Fri Mar 28 14:14:24 CET 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.ui.prefs b/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5743d38d0..000000000
--- a/rse/plugins/org.eclipse.rse.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Dec 08 11:38:30 CST 2006
-eclipse.preferences.version=1
-internal.default.compliance=user
diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 008fafde5..000000000
--- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true
-Bundle-Version: 3.1.102.qualifier
-Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.swt
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.rse.core,
- org.eclipse.rse.core.comm,
- org.eclipse.rse.core.events,
- org.eclipse.rse.core.filters,
- org.eclipse.rse.core.model,
- org.eclipse.rse.core.references,
- org.eclipse.rse.core.subsystems,
- org.eclipse.rse.internal.core;x-internal:=true,
- org.eclipse.rse.internal.core.filters;x-internal:=true,
- org.eclipse.rse.internal.core.model;x-internal:=true,
- org.eclipse.rse.internal.core.subsystems;x-internal:=true,
- org.eclipse.rse.internal.logging;x-internal:=true,
- org.eclipse.rse.internal.persistence;x-internal:=true,
- org.eclipse.rse.internal.persistence.dom;x-internal:=true,
- org.eclipse.rse.internal.references;x-internal:=true,
- org.eclipse.rse.logging,
- org.eclipse.rse.persistence,
- org.eclipse.rse.persistence.dom
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/rse/plugins/org.eclipse.rse.core/about.html b/rse/plugins/org.eclipse.rse.core/about.html
deleted file mode 100644
index d4cc693f9..000000000
--- a/rse/plugins/org.eclipse.rse.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/about.ini b/rse/plugins/org.eclipse.rse.core/about.ini
deleted file mode 100644
index fbbb9f83d..000000000
--- a/rse/plugins/org.eclipse.rse.core/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=dsdp32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/about.mappings b/rse/plugins/org.eclipse.rse.core/about.mappings
deleted file mode 100644
index bddaab431..000000000
--- a/rse/plugins/org.eclipse.rse.core/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/about.properties b/rse/plugins/org.eclipse.rse.core/about.properties
deleted file mode 100644
index e2d084bd0..000000000
--- a/rse/plugins/org.eclipse.rse.core/about.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# David Dykstal (IBM) - [232198] remove NLS MESSAGEFORMAT NONE
-###############################################################################
-
-# NLS_ENCODING=UTF-8
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=RSE Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IBM Corporation and others 2000, 2011.  All rights reserved.\n\
-Visit http://www.eclipse.org/dsdp/tm
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/build.properties b/rse/plugins/org.eclipse.rse.core/build.properties
deleted file mode 100644
index 20c40c9d6..000000000
--- a/rse/plugins/org.eclipse.rse.core/build.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-###############################################################################
-#  Copyright (c) 2001, 2009 IBM Corporation and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
-# 
-#  Contributors:
-#     IBM Corporation - initial API and implementation
-#  Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
-###############################################################################
-bin.includes = META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.properties,\
-               about.html,\
-               .,\
-               about.ini,\
-               about.mappings,\
-               dsdp32.png,\
-               icons/
-source.. = src/
-output.. = bin/
-
-javacSource=1.4
-javacTarget=1.4
-src.includes = about.html,\
-               schema/,\
-               .settings/,\
-               build.properties
diff --git a/rse/plugins/org.eclipse.rse.core/dsdp32.png b/rse/plugins/org.eclipse.rse.core/dsdp32.png
deleted file mode 100644
index 3077b1220..000000000
--- a/rse/plugins/org.eclipse.rse.core/dsdp32.png
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinux_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinux_obj.gif
deleted file mode 100644
index 7b5a98e0b..000000000
--- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinux_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinuxlive_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinuxlive_obj.gif
deleted file mode 100644
index f337d8bf6..000000000
--- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlinuxlive_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocal_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocal_obj.gif
deleted file mode 100644
index d60c188ca..000000000
--- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocal_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocallive_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocallive_obj.gif
deleted file mode 100644
index ba10dec0a..000000000
--- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemlocallive_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunix_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunix_obj.gif
deleted file mode 100644
index 18afe87ac..000000000
--- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunix_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunixlive_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunixlive_obj.gif
deleted file mode 100644
index cd8c312d4..000000000
--- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemunixlive_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwin_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwin_obj.gif
deleted file mode 100644
index 0a2efbbed..000000000
--- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwin_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwinlive_obj.gif b/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwinlive_obj.gif
deleted file mode 100644
index 6abee6378..000000000
--- a/rse/plugins/org.eclipse.rse.core/icons/full/obj16/systemwinlive_obj.gif
+++ /dev/null
diff --git a/rse/plugins/org.eclipse.rse.core/plugin.properties b/rse/plugins/org.eclipse.rse.core/plugin.properties
deleted file mode 100644
index 20dafeaed..000000000
--- a/rse/plugins/org.eclipse.rse.core/plugin.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
-# Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName = RSE Core
-providerName = Eclipse TM Project
-
-extPoint.keystoreProviders = Keystore Providers
-extPoint.persistenceProviders=RSE Persistence Providers
-extPoint.systemTypes=RSE System Types
-extPoint.systemTypeProviders=RSE System Type Providers
-extPoint.subsystemConfigurations = Remote Subsystem Configurations
-extPoint.modelInitializers = RSE Model Initializers
-
-systemType.windows.label=Windows
-systemType.unix.label=Unix
-systemType.linux.label=Linux
-systemType.local.label=Local
-
-#systemType.iseries.description = iSeries native operating system (OS/400 or i5/OS)
-#systemType.iseries.PASE.description = PASE on iSeries
-#systemType.zseries.description = zSeries native operating system (z/OS)
-systemType.windows.description = Any version of Microsoft Windows 
-systemType.unix.description = Any distribution of Unix
-#systemType.aix.description = IBM AIX operating system 
-systemType.linux.description = Any distribution of Linux
-#systemType.powerlinux.description = Linux running on PowerPC hardware
-#systemType.zlinux.description = Linux running on zSeries hardware
-systemType.local.description = Local file system on this computer
diff --git a/rse/plugins/org.eclipse.rse.core/plugin.xml b/rse/plugins/org.eclipse.rse.core/plugin.xml
deleted file mode 100644
index 14498a986..000000000
--- a/rse/plugins/org.eclipse.rse.core/plugin.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
-     Copyright (c) 2005, 2008 IBM Corporation and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
-    
-     Contributors:
-         IBM Corporation - initial API and implementation
- -->
-
-<plugin>
-<!-- ================================================================= -->
-<!-- 		Define keystoreProviders extension point                   -->
-<!-- ================================================================= -->
-   <extension-point id="keystoreProviders" name="%extPoint.keystoreProviders" schema="schema/keystoreProviders.exsd"/>
-
-<!-- ================================================================= -->
-<!-- 		Define Persistence Provider extension point -->
-<!-- ================================================================= -->
-   <extension-point id="persistenceProviders" name="%extPoint.persistenceProviders" schema="schema/persistenceProviders.exsd"/>
-   <!-- Pre-defined Persistence Providers -->
-   <extension
-       point="org.eclipse.rse.core.persistenceProviders">
-    <persistenceProvider
-          autostart="false"
-          class="org.eclipse.rse.internal.persistence.SerializingProvider"
-          id="org.eclipse.rse.persistence.SerializingProvider"
-          name="Serializing Persistence Provider"/>
-    <persistenceProvider
-          autostart="true"
-          class="org.eclipse.rse.internal.persistence.PropertyFileProvider"
-          id="org.eclipse.rse.persistence.PropertyFileProvider"
-          name="Property File Persistence Provider (workspace)">
-       <property
-             name="location"
-             value="workspace">
-       </property>
-    </persistenceProvider>
-    <persistenceProvider
-          autostart="true"
-          class="org.eclipse.rse.internal.persistence.PropertyFileProvider"
-          id="org.eclipse.rse.persistence.MetadataPropertyFileProvider"
-          name="Property File Persistence Provider (metadata)">
-       <property
-             name="location"
-             value="metadata">
-       </property>
-    </persistenceProvider>
-   </extension>
-
-<!-- ================================================================= -->
-<!-- 		Define systemTypes extension point                         -->
-<!-- ================================================================= -->
-   <extension-point id="systemTypes" name="%extPoint.systemTypes" schema="schema/systemTypes.exsd"/>
-   <extension-point id="systemTypeProviders"
-   								  name="%extPoint.systemTypeProviders"
-   								  schema="schema/systemTypeProviders.exsd"/>
-   <!-- Pre-defined system types -->
-   <extension
-         point="org.eclipse.rse.core.systemTypes">
-      <systemType
-            description="%systemType.windows.description"
-            icon="icons/full/obj16/systemwin_obj.gif"
-            iconLive="icons/full/obj16/systemwinlive_obj.gif"
-            id="org.eclipse.rse.systemtype.windows"
-            label="%systemType.windows.label"
-            name="Windows"/>
-      <systemType
-            description="%systemType.linux.description"
-            icon="icons/full/obj16/systemlinux_obj.gif"
-            iconLive="icons/full/obj16/systemlinuxlive_obj.gif"
-            id="org.eclipse.rse.systemtype.linux"
-            label="%systemType.linux.label"
-            name="Linux"/>
-      <!--
-      <systemType id="org.eclipse.rse.systemtype.linux.power"
-            name="Power Linux"
-			description="%systemType.powerlinux.description"
-			icon="icons/full/obj16/systemlinux_obj.gif"
-			iconLive="icons/full/obj16/systemlinuxlive_obj.gif"/>
-      -->      
-      <systemType
-            description="%systemType.unix.description"
-            icon="icons/full/obj16/systemunix_obj.gif"
-            iconLive="icons/full/obj16/systemunixlive_obj.gif"
-            id="org.eclipse.rse.systemtype.unix"
-            label="%systemType.unix.label"
-            name="Unix"/>
-      <systemType
-            description="%systemType.local.description"
-            icon="icons/full/obj16/systemlocal_obj.gif"
-            iconLive="icons/full/obj16/systemlocallive_obj.gif"
-            id="org.eclipse.rse.systemtype.local"
-            label="%systemType.local.label"
-            name="Local"/>
-   </extension>
-
-<!-- ================================================================================== -->
-<!-- EXTENSION POINT: org.eclipse.rse.core.subsystemConfigurations                      -->
-<!-- ================================================================================== -->
-<!-- Extension point for defining subsystem configurations. A configuration is responsible for     -->
-<!--  creating subsystem instances.                                                     -->
-<!--                                                                                    -->
-<!-- Example of extension configuration:                                                -->
-<!--   <extension                                                                       -->
-<!--      point="org.eclipse.rse.core.subsystemConfigurations">                            -->
-<!--      <configuration                                                                -->
-<!--         systemTypeIds="org.eclipse.rse.systemtype.local;org.eclipse.rse.systemtype.unix"-->
-<!--         name="Files"                                                               -->
-<!--         description="This subsystem allows you to work with files on local or remote systems."-->
-<!--         icon="icons/filesubsys.gif"                                                -->
-<!--         iconlive="icons/filesubsyslive.gif"                                        -->
-<!--         id="com.acme.etools.mypkg.myconfiguration"                                       -->
-<!--         class="com.acme.etools.mypkg.MyClass"                                      -->
-<!--         category="files"                                                           -->
-<!--         vendor="ACME"                                                              -->
-<!--      >                                                                             -->
-<!--      </configuration>                                                                    -->
-<!--   </extension>                                                                     -->
-<!-- Each extension can contain multiple configuration tags that identify a subsystem configuration -->
-<!--                                                                                    -->
-<!-- <configuration> tag attributes:                                                          -->
-<!-- ================================================================================== -->
-<!--  systemTypes => semicolon-separated list of system types or * for all              -->
-<!--  class       => class implementing org.eclipse.rse.subsystems.SubSystemConfiguration -->
-<!--  category    => optionally identifies category to allow efficient subsetting of    -->
-<!--                  connection lists. Pre-defined categories are "files", "cmds" and  -->
-<!--                  "jobs". Can also specify your own category like "database"        -->
-<!--  icon        => icon to display for subsystems of this configuration when not connected  -->
-<!--  iconlive    => icon to display for subsystems of this configuration when connected      -->
-<!--  name        => translatable display name for subsystems of this configuration     -->
-<!--  description => translatable descriptin for subsystems of this configuration       -->
-<!--  id          => unique id for this extension point. Will be used for a folder name -->
-<!--  vendor      => name of company supplying this configuration                       -->
-<!--  systemClass => OBSOLETE - Removed in OpenRSE.                                     -->
-<!--      Was only used when naming a predefined subsystem configuration                -->
-<!--      in the <samp>class</samp> attribute, when you want to subclass or replace the -->
-<!--      predefined IConnectorService object used to manage the live connection with   -->
-<!--      the remote system. Name a class that implements                               -->
-<!--        org.eclipse.rse.core.subsystems.IConnectorService or extends the appropriate     -->
-<!--      predefined class such as org.eclipse.rse.universal.UniversalSystem            -->
-<!--      for unix, windows and system types.                                           -->
-<!-- ================================================================================== -->
-<!--                                                                                    -->
-<!-- For systemTypes, if you specify * for all, you still have a chance at runtime to   -->
-<!--  not create a subsystem for a given system type. Simply return false from your     -->
-<!--  appliesToSystemType method.                                                       -->
-<!--                                                                                    -->
-<!--                                                                                    -->
-<!-- ================================================================================== -->
-
-   <extension-point id="subsystemConfigurations" name="%extPoint.subsystemConfigurations" schema="schema/subsystemConfigurations.exsd"/>
-   <extension-point id="modelInitializers" name="%extPoint.modelInitializers" schema="schema/modelInitializers.exsd"/>
-
-<!-- ================================================================= -->
-<!-- 		PreferencesInitializers                                    -->
-<!-- ================================================================= -->
-   <extension
-       point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.rse.internal.core.RSEPreferenceInitializer"/>
-	  <initializer class="org.eclipse.rse.internal.logging.LoggingPreferenceInitializer"/>
-   </extension>
-   <extension
-         point="org.eclipse.rse.core.modelInitializers">
-      <modelInitializer
-            class="org.eclipse.rse.internal.core.RSELocalConnectionInitializer"
-            type="workspace">
-      </modelInitializer>
-   </extension>
- 
-</plugin>
diff --git a/rse/plugins/org.eclipse.rse.core/schema/keystoreProviders.exsd b/rse/plugins/org.eclipse.rse.core/schema/keystoreProviders.exsd
deleted file mode 100644
index af9c3df0d..000000000
--- a/rse/plugins/org.eclipse.rse.core/schema/keystoreProviders.exsd
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.rse.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.rse.core" id="keystoreProviders" name="Keystore Providers"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to allow the delegation of client keystores to vendors where needed.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            (no description available)
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="keystoreProvider" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="keystoreProvider">
-      <annotation>
-         <documentation>
-            (no description available)
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to identify the Keystore Provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used to identify this Keystore Provider in the UI.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified name of the Java class that implements the &lt;samp&gt;org.eclipse.rse.core.comm.ISystemKeystoreProvider&lt;/samp&gt; interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.rse.core.comm.ISystemKeystoreProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of this extension point&apos;s usage:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.rse.core.keystoreProviders&quot;&gt;
-      &lt;keystoreProvider
-         id=&quot;com.xyz.universal.security.UniversalKeystoreProvider&quot;
-         name=&quot;Universal Keystore Provider&quot;
-         class=&quot;com.xyz.universal.security.UniversalKeystoreProvider&quot;&gt;
-      &lt;/keystoreProvider&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Plug-ins that want to extend this extension point must implement &lt;samp&gt;org.eclipse.rse.core.comm.ISystemKeystoreProvider&lt;/samp&gt; interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         The Remote System Explorer provides a default implementation of this extension point
-in &lt;samp&gt;org.eclipse.rse.dstore.security.UniversalKeystoreProvider&lt;/samp&gt;.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2002, 2007 IBM Corporation and others. All Rights Reserved.
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-IBM Corporation - initial API and implementation
-Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/rse/plugins/org.eclipse.rse.core/schema/modelInitializers.exsd b/rse/plugins/org.eclipse.rse.core/schema/modelInitializers.exsd
deleted file mode 100644
index 1027cb2bd..000000000
--- a/rse/plugins/org.eclipse.rse.core/schema/modelInitializers.exsd
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.rse.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.rse.core" id="modelInitializers" name="Model Initializers"/>
-      </appinfo>
-      <documentation>
-         A model initializer is used to create supplemental connections and filter pools after the RSE model has been restored from its persistent form. The base RSE uses this extension point to supply the &quot;Local&quot; connection if one has not already been created for this workspace. Other extenders of RSE may use this to augment the mode in other ways. An initializer is run at the end of the initialization job begun by RSE when it is activated.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="modelInitializer" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="modelInitializer">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A class that extends &lt;b&gt;org.eclipse.rse.core.IRSEModelInitializer&lt;/b&gt;.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.rse.core.IRSEModelInitializer"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="type">
-            <annotation>
-               <documentation>
-                  The type of initialization that is to take place. If this is a one time initialization for this workspace then use &quot;workspace&quot;. If this initialization is to occur at the beginning of each workspace session then use &quot;session&quot;. If nothing is specfied then &quot;session&quot; is assumed.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="workspace">
-                  </enumeration>
-                  <enumeration value="session">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         RSE 3.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         An example taken from the plug-in org.eclipse.rse.ui:
-&lt;pre&gt;
-&lt;extension point=&quot;org.eclipse.rse.core.modelInitializers&quot;&gt;
-   &lt;modelInitializer class=&quot;org.eclipse.rse.internal.ui.RSEUIPluginModelInitializer&quot;/&gt;
-&lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-
-
-   <annotation>
-      <appinfo>
-         <meta.section type="copyright"/>
-      </appinfo>
-      <documentation>
-         Copyright (c) 2008 IBM Corporation and others. All rights reserved.
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is
-available at http://www.eclipse.org/legal/epl-v10.html
-&lt;br/&gt;
-&lt;br/&gt;Contributors:
-&lt;br/&gt;David Dykstal (IBM) - [197167] adding notification and waiting for RSE model
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/rse/plugins/org.eclipse.rse.core/schema/persistenceProviders.exsd b/rse/plugins/org.eclipse.rse.core/schema/persistenceProviders.exsd
deleted file mode 100644
index 4337d822b..000000000
--- a/rse/plugins/org.eclipse.rse.core/schema/persistenceProviders.exsd
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.rse.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.rse.core" id="persistenceProviders" name="Persistence Providers"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to allow the delegation of profile persistence to vendors where needed.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="persistenceProvider" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="persistenceProvider">
-      <annotation>
-         <documentation>
-            The persistenceProvider element defines a class that implements the IRSEPersistenceProvider interface. It is used to persist the RSE object model to a form of external storage.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="0" maxOccurs="unbounded">
-            <element ref="property"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to identify the persistence Provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used to identify this persistence Provider in the UI.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified name of the Java class that implements the &lt;samp&gt;org.eclipse.rse.persistence.IRSEPersistenceProvider&lt;/samp&gt; interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.rse.persistence.IRSEpersistenceProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="autostart" type="boolean" use="default" value="false">
-            <annotation>
-               <documentation>
-                  The autostart attribute determines if the persistence provider will be loaded and asked to restore the profiles known to it at the time RSE starts.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="property">
-      <annotation>
-         <documentation>
-            The property element is contained within the persistenceProvider element. Use these to provide properties that can tailor the behavior of a persistence provider. Each provider must document the properties that it expects.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The name attribute provides the name for this property.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="value" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The value attribute provides the string value for this property.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of this extension point&apos;s usage:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.rse.core.persistenceProviders&quot;&gt;
-      &lt;persistenceProvider
-         id=&quot;org.eclipse.rse.persistence.DefaultRSEpersistenceProvider&quot;
-         name=&quot;Default persistence Provider&quot;
-         class=&quot;org.eclipse.rse.persistence.DefaultRSEpersistenceProvider&quot;
-         autostart=&quot;true&quot;&gt;
-      &lt;/persistenceProvider&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Plug-ins that want to extend this extension point must implement &lt;samp&gt;org.eclipse.rse.persistence.IRSEPersistenceProvider&lt;/samp&gt; interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         The Remote System Explorer in org.eclipse.rse.core provides a default implementation of this extension point.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2006, 2007 IBM Corporation. All Rights Reserved.
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-IBM Corporation - initial API and implementation
-David Dykstal (IBM) - added autostart attribute
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/rse/plugins/org.eclipse.rse.core/schema/subsystemConfigurations.exsd b/rse/plugins/org.eclipse.rse.core/schema/subsystemConfigurations.exsd
deleted file mode 100644
index 52ef36396..000000000
--- a/rse/plugins/org.eclipse.rse.core/schema/subsystemConfigurations.exsd
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.rse.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.rse.core" id="subsystemConfigurations" name="Subsystem Configurations"/>
-      </appInfo>
-      <documentation>
-         This extension point allows tool-writers to extend the capability of the Remote System Explorer, by identifying a subsystem configuration that produces a subsystem whenever a new connection is created. This subsystem appears under the connection when it is expanded in the Remote Systems view of the Remote System Explorer perspective. The subsystem configuration is called by the Remote System framework when the user creates a new connection, when the connection&apos;s system type is one of the types identified as supported by this subsystem configuration extension.
-&lt;p&gt;
-There is one subsystem object per connection, and the role of a subsystem is to allow users to work with remote resources for the remote system identified by the containing connection. Defining a subsystem configuration involves more than the single subsystem configuration class. There must also be a subsystem class defined. There may also be other classes defined, such as classes for the content area of wizards for defining filters, user actions and compile commands, if the subsystem configuration wishes to support these. See the developer documentation for the Remote System Explorer for documentation details on defining subsystems.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            (no description available)
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="configuration" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="configuration">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name" icon="icon"/>
-         </appInfo>
-         <documentation>
-            This element defines a subsystem configuration to the Remote System Explorer framework.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique ID for this subsystem configuration. This will be used by persistency 
-as a folder name for information contained by the subsystem configuration, or by any of its subsystems.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Translatable name for subsystems created by this configuration.
-These appear immediately under a connection when the connection is expanded in the Remote Systems view of the Remote System Explorer perspective.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Translatable description for subsystems created by this configuration.
-These appear in configuration and properties pages for subsystems.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="vendor" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Name of the vendor supplying this subsystem configuration.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A class that implements &lt;samp&gt;org.eclipse.rse.core.subsystems.ISubSystemConfiguration&lt;/samp&gt;.
-It is recommended to extend &lt;samp&gt;org.eclipse.rse.core.subsystems.SubSystemConfiguration&lt;/samp&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.rse.core.subsystems.SubSystemConfiguration:org.eclipse.rse.core.subsystems.ISubSystemConfiguration"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="systemTypeIds" type="string">
-            <annotation>
-               <documentation>
-                  A semicolon separated list of system type ids that subsystems from this configuration support. For example, &lt;code&gt;&quot;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.linux&quot;
-&lt;/code&gt;.
-&lt;p/&gt;
-The wildcards &apos;*&apos; and &apos;?&apos; are accepted. Therefore, if a subsystem configuration should be registered against all existing system types, this slot should be set to &lt;code&gt;&quot;*&quot;&lt;/code&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  The icon to dipslay for subsystems of this configuration, when not connected. 
-Specify the path of the .gif file, relative to your plugin directory.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="iconlive" type="string">
-            <annotation>
-               <documentation>
-                  The icon to display for subsystems of this configuration, when there is a live connection. This
-is usually derived from the normal icon, but adorned with a bright green arrow. Specify
-a path to the icon&apos;s .gif file, relative to your plugin directory.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="category" type="string">
-            <annotation>
-               <documentation>
-                  This optional attribute allows subsystem providers to classify the type of remote resources that are listed by this subsystem configuration. It is possible for
-multiple subsystem factories to support the same remote resource category. This category is used in the popupMenus and propertyPages extension points, to scope actions and property pages to only remote resources of a particular category, via their &lt;samp&gt;subsystemconfigurationCategory&lt;/samp&gt; attribute. 
-For example, if listing database resources you might specify a category of &quot;database&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="priority" type="string">
-            <annotation>
-               <documentation>
-                  This optional attribute determines the order in which subsystems appear in the New Connection wizard and RSE views. Integer values are allowed. Subsystems with lower number will appear first in the RSE tree. Subsystems that do not define the priority attribute will be appended last to the list of subsystems.
-
-Note that service subsystems that share the same service should always use the same priority, since their service implementation can change at runtime. The following priorities are used by the predefined subsystems: files=100, processes=200, shells=300.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="serviceType" type="string">
-            <annotation>
-               <documentation>
-                  This optional attribute allows providing a semicolon separated list of standard names and transports expected to be used by service discovery servers to advertise this service. 
-The name is usually the keyword used by the IANA in the port number allocation (http://www.iana.org/assignments/port-numbers) or in DNS SRV service types (RFC 2782) (http://www.dns-sd.org/ServiceTypes.html).
-
-For example, this attribute could be &lt;code&gt;serviceType=&quot;_ftp._tcp;_ftp._udp&quot;&lt;/code&gt; to advertise a subsystem that supports ftp servers using tcp and udp transport.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         Example of using this extension point:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension 
-      point=&quot;org.eclipse.rse.core.subsystemConfigurations&quot;&gt;
-      &lt;configuration
-         systemTypeIds=&quot;org.eclipse.rse.systemtype.unix;*.rse.systemtype.linux&quot; 
-         name=&quot;Databases&quot;
-         icon=&quot;icons/dbsubsys.gif&quot; 
-         iconlive=&quot;icons/dbsubsyslive.gif&quot;
-         id=&quot;com.acme.tools.mypkg.myconfiguration&quot;
-         class=&quot;com.acme.tools.db.DBSubSystemFactory&quot;
-         category=&quot;databases&quot;
-         vendor=&quot;ACME&quot;
-         serviceType=&quot;_database._tcp;_database._udp&quot;
-      &gt;
-     &lt;/configuration&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-
-&lt;p&gt;
-Defining the xml for the extension point is easy. There is a fair amount to know about
-creating the classes needed for a subsystem configuration, however. For this information, consult the Remote System Explorer developer documention, including the JavaDoc for the supplied classes and interfaces for this task.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The provider of subsystem configurations must implement the interface
-&lt;samp&gt;org.eclipse.rse.core.subsystems.ISubSystemConfiguration&lt;/samp&gt;,
-although it is not recommended to create a new class from scratch.
-Rather, it is highly recommended to use the supplied base class &lt;samp&gt;org.eclipse.rse.core.subsystems.SubSystemConfiguration&lt;/samp&gt;.
-This base class supplies much functionality, including support for
-persisting properties and metadata, and support for filters.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         All supplied subsystems are implemented by using this extension point.
-See the &lt;samp&gt;plugin.xml&lt;/samp&gt; files for plugins
-&lt;samp&gt;org.eclipse.rse.subsystems.files.dstore&lt;/samp&gt; and
-&lt;samp&gt;org.eclipse.rse.subsystems.processes.dstore&lt;/samp&gt;
-for examples.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2002, 2007 IBM Corporation and others. All Rights Reserved.
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-IBM Corporation - initial API and implementation
-Uwe Stieber (Wind River) - systemTypeIds attribute extensions
-Javier Montalvo Orus (Symbian) - [plan] Improve Discovery and Autodetect in RSE
-Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/rse/plugins/org.eclipse.rse.core/schema/systemTypeProviders.exsd b/rse/plugins/org.eclipse.rse.core/schema/systemTypeProviders.exsd
deleted file mode 100644
index 0ceefd605..000000000
--- a/rse/plugins/org.eclipse.rse.core/schema/systemTypeProviders.exsd
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.rse.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.rse.core" id="systemTypesProvider" name="RSE System Types Provider"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to allow the contribution of dynamically generated RSE system types by vendors where needed.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="systemTypeProvider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="systemTypeProvider">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to identify the system type Provider.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified name of the Java class that implements the &lt;samp&gt;org.eclipse.rse.core.IRSESystemTypeProvider&lt;/samp&gt; interface.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.rse.core.IRSESystemTypeProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         RSE 2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of this extension point&apos;s usage:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.rse.core.systemTypeProviders&quot;&gt;
-      &lt;systemTypeProvider
-         id=&quot;org.eclipse.rse.core.DefaultSystemTypeProvider&quot;
-         class=&quot;org.eclipse.rse.core.DefaultRSESystemTypeProvider&quot;&gt;
-      &lt;/systemTypeProvider&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         Plug-ins that want to extend this extension point must implement &lt;samp&gt;org.eclipse.rse.core.IRSESystemTypesProvider&lt;/samp&gt; interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2007 Wind River Systems, Inc. and others.
-All rights reserved. This program and the accompanying materials 
-are made available under the terms of the Eclipse Public License v1.0 
-which accompanies this distribution, and is available at 
-http://www.eclipse.org/legal/epl-v10.html 
-
-Contributors:
-Uwe Stieber (Wind River) - initial API and implementation.
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd b/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd
deleted file mode 100644
index 0e4eb6aa3..000000000
--- a/rse/plugins/org.eclipse.rse.core/schema/systemTypes.exsd
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.rse.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.rse.core" id="systemTypes" name="RSE System Types"/>
-      </appInfo>
-      <documentation>
-         This extension point is used in combination with the &quot;org.eclipse.rse.core.subsystemConfigurations&quot; extension point for defining new subsystems, which appear under a connection when it is expanded in the Remote Systems view. The systemTypes extension point allows subsystem providers to define a new system type that appears in the list of valid system types in the New Connection wizard, used by users when defining a new connection to a remote system. The system type is simply a string identifying the operating system type, such as Solaris, and an pair of icons used to identify connections to systems of this type. One icon is used when the connection is not connected, while the other is used when there is a live connection.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            (no description available)
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="systemType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="systemType">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name" icon="icon"/>
-         </appInfo>
-         <documentation>
-            This element defines a remote system type like &quot;Linux&quot;, against which subsystem configurations can be registered.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="0" maxOccurs="unbounded">
-            <element ref="property"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique identifier for this extension.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The display name for the system type, such as &quot;Solaris&quot;. This name is also currently used as internal identifier when referencing the system type in filters, subsystem configurations and similar, therefore it is not translatable. Future versions of RSE may change this and reference the systemType id instead of the name.
-&lt;p&gt;
-&lt;b&gt;Deprecated:&lt;/b&gt; Use system type id to specify a unique identifier and system type label to specify a translatable UI label.
-&lt;p&gt;
-RSE pre-defines a number of system types, although they may not appear unless a subsystem configuration is registered against that type. These are the supplied system types:
-&lt;ul&gt;
-&lt;li&gt;Local&lt;/li&gt;
-&lt;li&gt;Unix&lt;/li&gt;
-&lt;li&gt;Linux&lt;/li&gt;
-&lt;/ul&gt;
-&lt;/p&gt;
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A label used in the UI to identify the system type besides the system type icon.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  A short description of the system type. Shows up in preferences for system type.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  A relative path to an icon that will be used when displaying connections to systems of this type. If not specified, a default icon will be used by RSE.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="iconLive" type="string">
-            <annotation>
-               <documentation>
-                  A relative path to an icon that will be used when displaying connections to systems of this type, when there is a live connection to the remote system. This is usually a derivation of the icon attribute, adorned with a bright green arrow.
-If not specified, a default icon will be used by RSE.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="enableOffline" type="boolean">
-            <annotation>
-               <documentation>
-                  Whether this system type can be put in offline mode. This decides whether to show the Work Offline action for connections of this type. This is an optional attribute, the default value is false.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="subsystemConfigurationIds" type="string">
-            <annotation>
-               <documentation>
-                  A semicolon separated list of fully qualified subsystem configuration ids this system type wants to get registered against.
-&lt;p&gt;
-&lt;b&gt;Note:&lt;/b&gt; The list specified here does not imply that the corresponding subsystem configurations exist. The list contains only possibilites, not requirements.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="property">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="name"/>
-         </appInfo>
-         <documentation>
-            On optional property for the system type. The following property keys are already used internally, and are thus reserved:
-&lt;ul&gt;
-&lt;li&gt;&quot;icon&quot; to store the value of the icon attribute&lt;/li&gt;
-&lt;li&gt;&quot;iconLive&quot; to store the value of the iconLive attribute&lt;/li&gt;
-&lt;li&gt;&quot;enableOffline&quot; to store the value of the enableOffline attribute&lt;/li&gt;
-&lt;li&gt;&quot;isCaseSensitive&quot; for system types with a case sensitive file system&lt;/li&gt;
-&lt;li&gt;&quot;isLocal&quot; for system types that refer to the local system&lt;/li&gt;
-&lt;li&gt;&quot;isWindows&quot; for system types that refer to a Windows kind of system (case insensitive file system with drive letters)&lt;/li&gt;
-&lt;/ul&gt;
-In general, clients can use any own properties with system types, but should use reverse DNS notation to qualify their property keys (e.g. &lt;code&gt;com.acme.isFoobarSystem&lt;/code&gt;. Property keys without qualifying namespace are reserved for RSE internal use. See also class IRSESystemType, methods getProperty() and testProperty().
-
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="value" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of the extension point schema:
-&lt;p&gt;
-&lt;pre&gt;
-  &lt;extension point=&quot;org.eclipse.rse.core.systemTypes&quot;&gt;
-      &lt;systemType id=&quot;com.acme.systemtype.Solaris&quot;
-            name=&quot;Solaris&quot;
-            description=&quot;Connects to Solaris systems.&quot;
-      icon=&quot;icons/solaris.gif&quot;
-      iconLive=&quot;icons/solarisLive.gif&quot;&gt;
-   &lt;/systemType&gt;
-  &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         There is no code to implement for this extension point.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         See the plugin.xml file for plugin org.eclipse.rse.ui for examples of using this extension point.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2002, 2007 IBM Corporation and others. All Rights Reserved.
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License v1.0 which accompanies this distribution, and is 
-available at http://www.eclipse.org/legal/epl-v10.html
-
-Contributors:
-IBM Corporation - initial API and implementation
-Martin Oberhuber (Wind River) - [186523] Move subsystemConfigurations from UI to core
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/AbstractRSESystemType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/AbstractRSESystemType.java
deleted file mode 100644
index c58d41fd9..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/AbstractRSESystemType.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Uwe Stieber (Wind River) - Dynamic system type provider extension.
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
- * Martin Oberhuber (Wind River) - [186868] Fix IRSESystemType.testProperty() semantics
- * Martin Oberhuber (Wind River) - [218655][api] Provide SystemType enablement info in non-UI
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.rse.core.model.Host;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy;
-import org.osgi.framework.Bundle;
-
-/**
- * Abstract base class holding core functionality of a system type.
- *
- * Extenders must override {@link IRSESystemType#getSubsystemConfigurationIds()}
- * according to their strategy of finding subsystem configuration id's that
- * match their system type.
- *
- * Extenders may override any other method.
- */
-public abstract class AbstractRSESystemType extends PlatformObject implements IRSESystemType {
-
-	protected String id = null;
-	protected String name = null;
-	protected String label = null;
-	protected String description = null;
-	protected Bundle definingBundle = null;
-	protected Map properties;
-
-	/**
-	 * Default constructor.
-	 * Only subclasses may call this if set the id, name, label,
-	 * description and properties attributes themselves.
-	 */
-	protected AbstractRSESystemType()
-	{
-		super();
-	}
-
-	/**
-	 * Constructor for an object representing a system type.
-	 * @param id unique id of this system type. Must be system unique.
-	 * @param name a name of this system type to be used for internal checks.
-	 * @param label a user-visible label of this system type.
-	 *     May be <code>null</code> and falls back to the name in this case.
-	 * @param description a user-visible description of this system type.
-	 *     May be <code>null</code> and falls back to the label in this case.
-	 */
-	public AbstractRSESystemType(String id, String name, String label, String description, Bundle definingBundle)
-	{
-		super();
-		this.id = id;
-		this.name = name;
-		this.label = label == null ? name : label;
-		this.description = description == null ? "" : description; //$NON-NLS-1$
-		this.definingBundle = definingBundle;
-		this.properties = new HashMap();
-	}
-
-	/**
-	 * Checks whether two system types are the same.
-	 *
-	 * System types are considered the same if they have the same ID.
-	 */
-	public boolean equals(Object obj) {
-		if (obj instanceof IRSESystemType) {
-			return id.equals( ((IRSESystemType)obj).getId() );
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the hashCode for this system type.
-	 *
-	 * The hashCode is the hashCode of its ID.
-	 */
-	public int hashCode() {
-		return id.hashCode();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getId()
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getLabel()
-	 */
-	public String getLabel() {
-		// For default RSE system types, the UI label is equal to the
-		// name. Therefore, fallback to the name if the label is not
-		// explicitly set.
-		if (label == null) return getName();
-		return label;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getDescription()
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getDefiningBundle()
-	 */
-	public Bundle getDefiningBundle() {
-		return definingBundle;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getProperty(java.lang.String)
-	 */
-	public String getProperty(String key) {
-		return (String) (properties.get(key));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#getProperty(java.lang.String, boolean)
-	 */
-	public boolean testProperty(String key, boolean expectedValue) {
-		Object val = properties.get(key);
-		if (val instanceof String) {
-			return Boolean.valueOf((String)val).booleanValue() == expectedValue;
-		}
-		return false;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * @see IRSESystemType#isEnabled()
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public boolean isEnabled() {
-		if (RSEPreferencesManager.getIsSystemTypeEnabled(this)) {
-			// if enabled, check if the system type has any registered subsystems. If
-			// not, this will auto-disable the system type.
-			ISubSystemConfigurationProxy[] proxies = RSECorePlugin.getTheSystemRegistry().getSubSystemConfigurationProxies();
-			for (int i=0; i<proxies.length; i++) {
-				if (proxies[i].appliesToSystemType(this)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#isLocal()
-	 */
-	public boolean isLocal() {
-		return IRSESystemType.SYSTEMTYPE_LOCAL_ID.equals(getId())
-		   || testProperty(IRSESystemType.PROPERTY_IS_LOCAL, true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.IRSESystemType#isLocal()
-	 */
-	public boolean isWindows() {
-		return IRSESystemType.SYSTEMTYPE_WINDOWS_ID.equals(getId())
-		   || (isLocal() && System.getProperty("os.name").toLowerCase().startsWith("win")) //$NON-NLS-1$ //$NON-NLS-2$
-		   || testProperty(IRSESystemType.PROPERTY_IS_WINDOWS, true);
-	}
-
-	public IHost createNewHostInstance(ISystemProfile profile) {
-		return new Host(profile);
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return getLabel() + " (" + getId() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java
deleted file mode 100644
index ce43afc5e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreRegistry.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Uwe Stieber (Wind River) - Added system types provider extension.
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- *******************************************************************************/
-package org.eclipse.rse.core;
-
-/**
- * Interface for RSE core registry. Clients should use this interface as the
- * starting point for querying and manipulating model objects in the RSE
- * framework.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSECoreRegistry {
-
-	public static final String PI_RSE_CORE = "org.eclipse.rse.core"; //$NON-NLS-1$
-	public static final String PI_SYSTEM_TYPES = "systemTypes"; //$NON-NLS-1$
-	public static final String PI_SYSTEM_TYPES_PROVIDER = "systemTypeProviders"; //$NON-NLS-1$
-
-	/**
-	 * Returns all defined system types.
-	 *
-	 * @return an array of all defined system types.
-	 */
-	public IRSESystemType[] getSystemTypes();
-
-	/**
-	 * Returns a system type object given the name.
-	 *
-	 * @param name the name of the system type
-	 * @return the system type object with the given name, or <code>null</code> if none is found
-	 *
-	 * @deprecated Use {@link #getSystemTypeById(String)}.
-	 */
-	public IRSESystemType getSystemType(String name);
-
-	/**
-	 * Returns a system type object given by the id.
-	 *
-	 * @param systemTypeId The system type id.
-	 * @return The system type object with the given id, or <code>null</code> if none is found
-	 */
-	public IRSESystemType getSystemTypeById(String systemTypeId);
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreStatusCodes.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreStatusCodes.java
deleted file mode 100644
index e990e56ac..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSECoreStatusCodes.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*********************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Dykstal (IBM) - [225988] need API to mark persisted profiles as migrated
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- *********************************************************************************/
-
-package org.eclipse.rse.core;
-
-/**
- * Codes for use in constructing IStatus objects. These are unique across
- * org.eclipse.rse.core
- *
- * @since org.eclipse.rse.core 3.0
- * @noimplement this interface is not intended to be implemented by clients
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSECoreStatusCodes {
-
-	/*
-	 * General codes (1 to 100)
-	 */
-
-	/**
-	 * A code used for constructing IStatus objects.
-	 * Value 1. An exception occurred during the operation.
-	 */
-	public static final int EXCEPTION_OCCURRED = 1;
-
-	/**
-	 * A code used for constructing IStatus objects.
-	 * Value 2. An invalid format was encountered operation.
-	 * The object in question must be assumed to be corrupted.
-	 */
-	public static final int INVALID_FORMAT = 2;
-
-	/*
-	 * Persistence manager and provider codes (101 to 200)
-	 */
-
-	/**
-	 * A code used for constructing IStatus objects.
-	 * Value 101. A persistent form of a profile is not found.
-	 */
-	public static final int PROFILE_NOT_FOUND = 101;
-
-	/**
-	 * A code used for constructing IStatus objects.
-	 * Value 102.
-	 * The marking of profiles as migrated is not supported by this provider.
-	 */
-	public static final int MIGRATION_NOT_SUPPORTED = 102;
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInitListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInitListener.java
deleted file mode 100644
index 7c0d56a17..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInitListener.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-/**
- * An IRSEInitListener will be invoked when the initialization of RSE reaches
- * the completion of each phase.
- *
- * @since org.eclipse.rse.core 3.0
- */
-public interface IRSEInitListener {
-
-	/**
-	 * @param phase The phase of initialization that has completed.
-	 * @see RSECorePlugin#INIT_MODEL
-	 * @see RSECorePlugin#INIT_ALL
-	 */
-	public void phaseComplete(int phase);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInteractionProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInteractionProvider.java
deleted file mode 100644
index 7fc45f670..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEInteractionProvider.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [190231] initial API and implementation
- * IBM Corporation - Javadoc for runInDefaultContext() method
- * Martin Oberhuber (Wind River) - [236355] [api] Add an IRSEInteractionProvider#eventExec() method
- *******************************************************************************/
-package org.eclipse.rse.core;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-
-/**
- * Interaction Provider Interface.
- *
- * Classes implementing this interface provide a means for RSE to communicate
- * with the outside world: via progress monitors, events and messages. A UI
- * implementation of this interface would typically use UI components for user
- * interaction; although this can be changed also intermittently.
- *
- * Non-UI headless applications may log messages rather than doing interactive
- * messages, and may use different Threads for sending messages.
- *
- * <p>
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the <a href="http://www.eclipse.org/tm/">Target Management</a>
- * team.
- * </p>
- *
- * @since org.eclipse.rse.core 3.0
- */
-public interface IRSEInteractionProvider {
-
-	/**
-	 * Return a default progress monitor for the context that's currently
-	 * active.
-	 *
-	 * Usually, long-running operations should always be created from the client
-	 * with a progress monitor that they can use. Historically, however, this
-	 * has not always been done and is especially problematic in operations that
-	 * are performed as the result of Callbacks.
-	 *
-	 * For such situations, this method returns a default progress monitor in a
-	 * context that we guess. We try to use one default progress use one for all
-	 * phases of a single operation, such as connecting and resolving.
-	 *
-	 * @return a default progress monitor
-	 */
-	public IProgressMonitor getDefaultProgressMonitor();
-
-    /**
-	 * <p>
-	 * Runs the given <code>IRSERunnableWithProgress</code> in the default
-	 * context available to this interaction provider, that provides a progress
-	 * monitor. For example, if the default context is a
-	 * <code>ProgressMonitorDialog</code> then the runnable is run using the
-	 * dialog's progress monitor. This method is derived from
-	 * <code>IRunnableContext#run()</code>.
-	 * </p>
-	 * <p>
-	 * If <code>fork</code> is <code>false</code>, the current thread is
-	 * used to run the runnable. Note that if <code>fork</code> is
-	 * <code>true</code>, it is unspecified whether or not this method blocks
-	 * until the runnable has been run. Implementers should document whether the
-	 * runnable is run synchronously (blocking) or asynchronously
-	 * (non-blocking), or if no assumption can be made about the blocking
-	 * behaviour.
-	 * </p>
-	 *
-	 * @param fork <code>true</code> if the runnable should be run in a
-	 *            separate thread, and <code>false</code> to run in the same
-	 *            thread
-	 * @param cancellable <code>true</code> to enable the cancellation, and
-	 *            <code>false</code> to make the operation uncancellable
-	 * @param runnable the runnable to run
-	 *
-	 * @exception InvocationTargetException wraps any exception or error which
-	 *                occurs while running the runnable
-	 * @exception InterruptedException propagated by the context if the runnable
-	 *                acknowledges cancellation by throwing this exception. This
-	 *                should not be thrown if cancellable is <code>false</code>.
-	 */
-	public void runInDefaultContext(boolean fork, boolean cancellable, IRSERunnableWithProgress runnable) throws InvocationTargetException,
-			InterruptedException;
-
-	/**
-	 * Asynchronously run the given runnable in a separate thread.
-	 *
-	 * UI implementations should have the runnable run in the dispatch thread,
-	 * where it has access to UI components. This is used for notifications.
-	 * Non-UI applications may choose any Thread they like, provided that two
-	 * conditions are met:
-	 * <ol>
-	 * <li>All Runnables are run on the same Thread.
-	 * <li>The ordering of Runnables remains intact.
-	 * </ol>
-	 *
-	 * @param runnable the Runnable to run asynchronously
-	 */
-	public void asyncExec(Runnable runnable);
-
-	/**
-	 * Run the given runnable with "event" semantics, that is: asynchronously
-	 * run it through {@link #asyncExec(Runnable)} on the interaction provider's
-	 * designated event thread, unless the call is already coming from that very
-	 * thread.
-	 * 
-	 * In that case, the Runnable is run immediately and synchronously.
-	 *
-	 * @param runnable the Runnable to run asynchronously with "event" semantics
-	 * @see #asyncExec(Runnable)
-	 */
-	public void eventExec(Runnable runnable);
-
-	/**
-	 * Flush the Queue of Runnables enqueued with {@link #asyncExec(Runnable)}.
-	 *
-	 * This needs to be done when this interaction provider is to be replaced by
-	 * a different one, in order to ensure that the ordering of all Runnables
-	 * remains intact.
-	 */
-	public void flushRunnableQueue();
-
-	/**
-	 * Show the given message or log it.
-	 *
-	 * In an interactive environment, this pops up a dialog asking the user to
-	 * press an OK button. The method will not return before the OK button is
-	 * pressed.
-	 *
-	 * @param msg the message to show
-	 */
-	public void showMessage(SystemMessage msg);
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEModelInitializer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEModelInitializer.java
deleted file mode 100644
index f5aa961c8..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEModelInitializer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * A model initializer creates objects in an RSE profile. For example,
- * initializers can be used to create initial connections, filter pools, and
- * filters.
- * 
- * @since org.eclipse.rse.core 3.0
- */
-public interface IRSEModelInitializer {
-
-	/**
-	 * Runs the initializer. The initializer should set the monitor to done when complete.
-	 * @param monitor the monitor that measures progress of this initializer.
-	 * @return an IStatus indicating the success of the initializer. The status will
-	 * be logged if it is not an OK status.
-	 */
-	public IStatus run(IProgressMonitor monitor);
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java
deleted file mode 100644
index 4c9a52537..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEPreferenceNames.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kushal Munir (IBM) - Initial API and implementation.
- * David Dykstal (IBM) - updated with comments, removed keys that are not to be used globally
- * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-/**
- * These constants define the set of preference names that the RSE core uses.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-
-/*
- * Preference names that are API should be all capitals and have words separated
- * by an underscore (that is, "public static final" style).
- * Preferences that are not API should using "method name" style.
- */
-public interface IRSEPreferenceNames {
-
-	/**
-	 * The key for the value that specifies that queries should be "deferred",
-	 * that is, run when needed and in the background, as nodes are asked for
-	 * their children. This value is not part of the API.
-	 *
-	 * This field is not intended to be referenced by clients.
-	 */
-	public static final String USE_DEFERRED_QUERIES = "useDeferredQueries"; //$NON-NLS-1$
-
-	/**
-	 * The key for the default system type. Used when a system type is needed
-	 * but not declared when creating new connections (hosts) and for password
-	 * determination. This value is not part of the API.
-	 *
-	 * This field is not intended to be referenced by clients.
-	 */
-	public static final String SYSTEMTYPE = "systemtype"; //$NON-NLS-1$
-
-	/**
-	 * The key for an hash table, encoded as a string, that contains user ids as
-	 * values keyed by some key - usually a system type, a connection name, or a
-	 * combination of a connection name and subsystem. This value is not part of
-	 * the API.
-	 *
-	 * This field is not intended to be referenced by clients.
-	 */
-	public static final String USERIDPERKEY = "useridperkey"; //$NON-NLS-1$
-
-	/**
-	 * The key for the string containing the list of active user profiles in
-	 * alphabetical order. As profiles are activated, deactivated, or renamed
-	 * this string must be modified. This value is not part of the API.
-	 *
-	 * This field is not intended to be referenced by clients.
-	 */
-	public static final String ACTIVEUSERPROFILES = "activeuserprofiles"; //$NON-NLS-1$
-
-	/**
-	 * The key of the string containing the id of the default persistence provider.
-	 * Value is "DEFAULT_PERSISTENCE_PROVIDER".
-	 * This value is part of the API and may be used to customize products.
-	 */
-	public static final String DEFAULT_PERSISTENCE_PROVIDER = "DEFAULT_PERSISTENCE_PROVIDER"; //$NON-NLS-1$
-
-	/**
-	 * The key of the string containing the id of the boolean value to create a
-	 * local connection. Value is "CREATE_LOCAL_CONNECTION". This value is part
-	 * of the API and may be used to customize products.
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final String CREATE_LOCAL_CONNECTION = "CREATE_LOCAL_CONNECTION"; //$NON-NLS-1$
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSERunnableWithProgress.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSERunnableWithProgress.java
deleted file mode 100644
index 034561960..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSERunnableWithProgress.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * Martin Oberhuber (Wind River) - [190231] Adapted from jface.operation.IRunnableWithProgress
- *******************************************************************************/
-package org.eclipse.rse.core;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
- * The <code>IRSERunnableWithProgress</code> interface should be implemented
- * by any class whose instances are intended to be executed as a long-running
- * operation. Long-running operations are typically presented at the UI via a
- * modal dialog showing a progress indicator and a Cancel button.
- *
- * This interface is derived from
- * <code>org.eclipse.jface.operation.IRunnableWithProgress</code>, but
- * brought into no-UI space. The class must define a <code>run</code> method
- * that takes a progress monitor. The <code>run</code> method is usually not
- * invoked directly, but rather by passing the
- * <code>IRunnableWithProgress</code> to the <code>run</code> method of an
- * <code>IRunnableContext</code>, which provides the UI for the progress
- * monitor and Cancel button.
- * <p>
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the <a href="http://www.eclipse.org/tm/">Target Management</a>
- * team.
- * </p>
- *
- * @see IRSEInteractionProvider
- * @since org.eclipse.rse.core 3.0
- */
-public interface IRSERunnableWithProgress {
-    /**
-	 * Runs this operation. Progress should be reported to the given progress
-	 * monitor. This method is usually invoked by an
-	 * <code>IRunnableContext</code>'s <code>run</code> method, which
-	 * supplies the progress monitor. A request to cancel the operation should
-	 * be honored and acknowledged by throwing <code>InterruptedException</code>.
-	 *
-	 * @param monitor the progress monitor to use to display progress and
-	 *            receive requests for cancellation
-	 * @exception InvocationTargetException if the run method must propagate a
-	 *                checked exception, it should wrap it inside an
-	 *                <code>InvocationTargetException</code>; runtime
-	 *                exceptions are automatically wrapped in an
-	 *                <code>InvocationTargetException</code> by the calling
-	 *                context
-	 * @exception InterruptedException if the operation detects a request to
-	 *                cancel, using <code>IProgressMonitor.isCanceled()</code>,
-	 *                it should exit by throwing
-	 *                <code>InterruptedException</code>
-	 *
-	 * @see IRSEInteractionProvider
-	 */
-    public void run(IProgressMonitor monitor) throws InvocationTargetException,
-            InterruptedException;
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java
deleted file mode 100644
index 927b7e379..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemType.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Uwe Stieber (Wind River) - Extended system type -> subsystemConfiguration association.
- * Martin Oberhuber (Wind River) - [185098] Provide constants for all well-known system types
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
- * Martin Oberhuber (Wind River) - [218655][api] Provide SystemType enablement info in non-UI
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * Martin Oberhuber (Wind River) - [226574][api] Add ISubSystemConfiguration#supportsEncoding()
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-
-package org.eclipse.rse.core;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.internal.core.model.SystemHostPool;
-import org.osgi.framework.Bundle;
-
-/**
- * Interface for a system type. Constants are defined for various system types.
- * These constants are kept in sync with definitions in plugin.xml.
- * <p>
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients. System
- *           type implementations must subclass {@link AbstractRSESystemType}
- *           rather than implementing this interface directly.
- *           </p>
- */
-public interface IRSESystemType extends IAdaptable {
-
-	/**
-	 * Linux system type, "Linux".
-	 * @deprecated Use {@link #SYSTEMTYPE_LINUX_ID}.
-	 */
-	public static final String SYSTEMTYPE_LINUX = "Linux"; //$NON-NLS-1$
-
-	/**
-	 * Linux system type, "org.eclipse.rse.systemtype.linux".
-	 */
-	public static final String SYSTEMTYPE_LINUX_ID = "org.eclipse.rse.systemtype.linux"; //$NON-NLS-1$
-
-	/**
-	 * Power Linux type, "Power Linux".
-	 * @deprecated Use {@link #SYSTEMTYPE_POWER_LINUX_ID}.
-	 */
-	public static final String SYSTEMTYPE_POWER_LINUX = "Power Linux"; //$NON-NLS-1$
-
-	/**
-	 * Power Linux type, "org.eclipse.rse.systemtype.linux.power".
-	 */
-	public static final String SYSTEMTYPE_POWER_LINUX_ID = "org.eclipse.rse.systemtype.linux.power"; //$NON-NLS-1$
-
-	/**
-	 * Power Linux type, "zSeries Linux".
-	 * @deprecated Use {@link #SYSTEMTYPE_ZSERIES_LINUX_ID}.
-	 */
-	public static final String SYSTEMTYPE_ZSERIES_LINUX = "zSeries Linux"; //$NON-NLS-1$
-
-	/**
-	 * Power Linux type, "org.eclipse.rse.systemtype.linux.zseries".
-	 */
-	public static final String SYSTEMTYPE_ZSERIES_LINUX_ID = "org.eclipse.rse.systemtype.linux.zSeries"; //$NON-NLS-1$
-
-	/**
-	 * Unix system type, "Unix".
-	 * @deprecated Use {@link #SYSTEMTYPE_UNIX_ID}.
-	 */
-	public static final String SYSTEMTYPE_UNIX = "Unix"; //$NON-NLS-1$
-
-	/**
-	 * Unix system type, "org.eclipse.rse.systemtype.unix".
-	 */
-	public static final String SYSTEMTYPE_UNIX_ID = "org.eclipse.rse.systemtype.unix"; //$NON-NLS-1$
-
-	/**
-	 * AIX system type, "AIX".
-	 * @deprecated Use {@link #SYSTEMTYPE_AIX_ID}.
-	 */
-	public static final String SYSTEMTYPE_AIX = "AIX"; //$NON-NLS-1$
-
-	/**
-	 * AIX system type, "org.eclipse.rse.systemtype.aix".
-	 */
-	public static final String SYSTEMTYPE_AIX_ID = "org.eclipse.rse.systemtype.aix"; //$NON-NLS-1$
-
-	/**
-	 * PASE system type, "PASE".
-	 * @deprecated Use {@link #SYSTEMTYPE_PASE_ID}.
-	 */
-	public static final String SYSTEMTYPE_PASE = "PASE"; //$NON-NLS-1$
-
-	/**
-	 * PASE system type, "org.eclipse.rse.systemtype.PASE".
-	 */
-	public static final String SYSTEMTYPE_PASE_ID = "org.eclipse.rse.systemtype.iseries.PASE"; //$NON-NLS-1$
-
-	/**
-	 * iSeries system type, "iSeries".
-	 * @deprecated Use {@link #SYSTEMTYPE_ISERIES_ID}.
-	 */
-	public static final String SYSTEMTYPE_ISERIES = "iSeries"; //$NON-NLS-1$
-
-	/**
-	 * iSeries system type, "org.eclipse.rse.systemtype.iseries".
-	 */
-	public static final String SYSTEMTYPE_ISERIES_ID = "org.eclipse.rse.systemtype.iseries"; //$NON-NLS-1$
-
-	/**
-	 * Local system type, "Local".
-	 * @deprecated Use {@link #SYSTEMTYPE_LOCAL_ID}.
-	 */
-	public static final String SYSTEMTYPE_LOCAL = "Local"; //$NON-NLS-1$
-
-	/**
-	 * Local system type, "org.eclipse.rse.systemtype.local".
-	 */
-	public static final String SYSTEMTYPE_LOCAL_ID = "org.eclipse.rse.systemtype.local"; //$NON-NLS-1$
-
-	/**
-	 * z/OS system type, "z/OS".
-	 * @deprecated Use {@link #SYSTEMTYPE_ZSERIES_ID}.
-	 */
-	public static final String SYSTEMTYPE_ZSERIES = "z/OS"; //$NON-NLS-1$
-
-	/**
-	 * z/OS system type, "org.eclipse.rse.systemtype.zseries".
-	 */
-	public static final String SYSTEMTYPE_ZSERIES_ID = "org.eclipse.rse.systemtype.zseries"; //$NON-NLS-1$
-
-	/**
-	 * Windows system type, "Windows".
-	 * @deprecated Use {@link #SYSTEMTYPE_WINDOWS_ID}.
-	 */
-	public static final String SYSTEMTYPE_WINDOWS = "Windows"; //$NON-NLS-1$
-
-	/** Windows system type, "org.eclipse.rse.systemtype.windows". */
-	public static final String SYSTEMTYPE_WINDOWS_ID = "org.eclipse.rse.systemtype.windows"; //$NON-NLS-1$
-
-	/** Discovery system type, "org.eclipse.rse.systemtype.discovery". */
-	public static final String SYSTEMTYPE_DISCOVERY_ID = "org.eclipse.rse.systemtype.discovery"; //$NON-NLS-1$
-	/** FTP Only system type, "org.eclipse.rse.systemtype.ftp". */
-	public static final String SYSTEMTYPE_FTP_ONLY_ID = "org.eclipse.rse.systemtype.ftp"; //$NON-NLS-1$
-	/** SSH Only system type, "org.eclipse.rse.systemtype.ssh". */
-	public static final String SYSTEMTYPE_SSH_ONLY_ID = "org.eclipse.rse.systemtype.ssh"; //$NON-NLS-1$
-	/** Telnet Only system type, "org.eclipse.rse.systemtype.telnet". */
-	public static final String SYSTEMTYPE_TELNET_ONLY_ID = "org.eclipse.rse.systemtype.telnet"; //$NON-NLS-1$
-
-	/**
-	 * System type Property Key (value: "isLocal") indicating whether
-	 * a system type is declared in plugin.xml to refers to the local
-	 * system.
-	 * On a the local system, the following properties are expected:
-	 * <ul>
-	 *   <li>Subsystem Queries are fast and safe.</li>
-	 *   <li>Files in the file system can be converted to java.io.File.</li>
-	 * </ul>
-	 * @see #testProperty(String, boolean)
-	 */
-	public static final String PROPERTY_IS_LOCAL = "isLocal"; //$NON-NLS-1$
-
-	/**
-	 * System type Property Key (value: "isWindows") indicating whether
-	 * a system type is declared in plugin.xml to refers to a Windows
-	 * system.
-	 * <p>
-	 * This is an "aggregate" property consisting  of several smaller
-	 * properties like isCaseSensitive. In the future, we'll want more
-	 * fine granular properties to check against. On a Windows system,
-	 * the following properties are expected:
-	 * <ul>
-	 *   <li>File system is not case sensitive</li>
-	 *   <li>File system has root drives</li>
-	 *   <li>Symbolic links are not supported</li>
-	 *   <li>"cmd" is used as the default shell, meaning that %envVar% refers to environment variables</li>
-	 *   <li>Path separator is backslash (\)</li>
-	 *   <li>Line end character is CRLF</li>
-	 *   <li>Valid characters in file names and paths as known on Windows</li>
-	 * </ul>
-	 * @see #testProperty(String, boolean)
-	 */
-	public static final String PROPERTY_IS_WINDOWS = "isWindows"; //$NON-NLS-1$
-
-	/**
-	 * System type Property Key (value: "isCaseSensitive") indicating
-	 * whether a given system type is in general case sensitive.
-	 * @see #testProperty(String, boolean)
-	 */
-	public static final String PROPERTY_IS_CASE_SENSITIVE = "isCaseSensitive"; //$NON-NLS-1$
-
-	/**
-	 * System type Property Key (value: "supportsEncoding") indicating whether a
-	 * given system type supports the user specifying an encoding to use for
-	 * translating binary data to Java Unicode Strings when working on
-	 * subsystems.
-	 *
-	 * It is up to the subsystems registered against a given system type whether
-	 * they observe the system type's setting or not; the default
-	 * implementations do observe it. Given that all subsystem configurations
-	 * registered against a given system type do not support encodings, the
-	 * corresponding RSE controls for allowing the user to change encodings will
-	 * be disabled.
-	 *
-	 * Expected default value of this Property is "true" if not set.
-	 *
-	 * @see ISubSystemConfiguration#supportsEncoding(IHost)
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final String PROPERTY_SUPPORTS_ENCODING = "supportsEncoding"; //$NON-NLS-1$
-
-	/**
-	 * Returns the id of the system type.
-	 * @return the id of the system type
-	 */
-	public String getId();
-
-	/**
-	 * Returns the translatable label for use in the UI.
-	 *
-	 * @return The UI label or <code>null</code> if not set.
-	 */
-	public String getLabel();
-
-	/**
-	 * Returns the name of the system type.
-	 * @return the name of the system type
-	 *
-	 * @deprecated Use {@link #getId()} for accessing the unique id or {@link #getLabel()} for the UI label.
-	 */
-	public String getName();
-
-	/**
-	 * Returns the description of the system type.
-	 * @return the description of the system type
-	 */
-	public String getDescription();
-
-	/**
-	 * Returns the property of this system type with the given key.
-	 * <code>null</code> is returned if there is no such key/value pair.
-	 *
-	 * @param key the name of the property to return
-	 * @return the value associated with the given key or <code>null</code> if none
-	 */
-	public String getProperty(String key);
-
-	/**
-	 * Tests whether the given boolean property matches the expected value
-	 * for this system type.
-	 *
-	 * Clients can use their own properties with system types, but should
-	 * use reverse DNS notation to qualify their property keys (e.g.
-	 * <code>com.acme.isFoobarSystem</code>. Property keys without qualifying
-	 * namespace are reserved for RSE internal use.
-	 *
-	 * @param key the name of the property to return
-	 * @param expectedValue the expected boolean value of the property.
-	 * @return <code>true</code> if the Property is set on the system type and
-	 *     matches the expected value. Returns <code>false</code> if the property
-	 *     is not set or does not match.
-	 */
-	public boolean testProperty(String key, boolean expectedValue);
-
-	/**
-	 * Tests whether the system type is currently enabled.
-	 *
-	 * The enabled state is a dynamic property of a system type, compared to the
-	 * static configuration by plugin markup. Enablement is a non-UI property,
-	 * which can be set by a Product in the Preferences or modified by a user to
-	 * hide certain system types.
-	 * <p>
-	 * Implementers of custom system types (which are registered by a
-	 * SystemTypeProvider) can override this method to provide more advanced
-	 * enabled checks e.g. based on license availability.
-	 *
-	 * @return <code>true</code> if the system type is currently enabled, or
-	 *         <code>false</code> otherwise.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public boolean isEnabled();
-
-	/**
-	 * Tests whether the system type refers to the local system.
-	 * This is a shortcut for
-	 * <pre>
-	 *   getId().equals(SYSTEMTYPE_LOCAL_ID) ||
-	 *   || testProperty(PROPERTY_IS_LOCAL, true)
-	 * </pre>
-	 * See {@link #PROPERTY_IS_LOCAL} for properties expected on
-	 * a Local system.
-	 * Extenders (contributors of custom system types) may override.
-	 * @return true if the system type refers to the local system.
-	 */
-	public boolean isLocal();
-
-	/**
-	 * Tests whether the system type refers to the Windows system.
-	 * This is a shortcut for
-	 * <pre>
-	 *   getId().equals(SYSTEMTYPE_WINDOWS_ID)
-	 *   || isLocal() && System.getProperty("os.name").toLowerCase().startsWith("win")
-	 *   || testProperty(PROPERTY_IS_WINDOWS, true)
-	 * </pre>
-	 * See {@link #PROPERTY_IS_WINDOWS} for properties expected on
-	 * a Windows system. This is an "aggregate" property consisting
-	 * of several smaller properties like isCaseSensitive. In the
-	 * future, we'll want more fine granular properties to check against.
-	 * Extenders (contributors of custom system types) may override.
-	 * @return true if the system type refers to a Windows system.
-	 */
-	public boolean isWindows();
-
-	/**
-	 * Returns the bundle which is responsible for the definition of this system type.
-	 * Typically this is used as a base for searching for images and other files
-	 * that are needed in presenting the system type.
-	 *
-	 * @return the bundle which defines this system type or <code>null</code> if none
-	 */
-	public Bundle getDefiningBundle();
-
-	/**
-	 * Returns a list of fully qualified known subsystem configuration id's that
-	 * this system type wants to be registered against.
-	 * More subsystem configurations can be added through the <tt>subsystemConfigurations</tt>
-	 * extension point.
-	 * <p>
-	 * <b>Note:</b> The list returned here does not imply that the corresponding
-	 * subsystem configurations exist. The list contains only possibilites not,
-	 * requirements.
-	 *
-	 * @return The list of subsystem configuration id's. May be empty,
-	 *         but never <code>null</code>.
-	 */
-	public String[] getSubsystemConfigurationIds();
-
-	/**
-	 * Creates a new <code>IHost</code> object instance. This method is
-	 * called from {@link SystemHostPool#createHost(IRSESystemType, String, String, String, String, int)}.
-	 *
-	 * @param profile The system profile to associate with the host.
-	 * @return A new <code>IHost</code> object instance.
-	 */
-	public IHost createNewHostInstance(ISystemProfile profile);
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java
deleted file mode 100644
index e53297e29..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeConstants.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kushal Munir (IBM) - Initial API and implementation.
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-/**
- * These constants define the set of properties that the UI expects to be
- * available via <code>IRSESystemType.getProperty(String)</code>.
- *
- * @see org.eclipse.rse.core.IRSESystemType#getProperty(String)
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSESystemTypeConstants {
-
-	public static final String ICON = "icon"; //$NON-NLS-1$
-	public static final String ICON_LIVE = "iconLive"; //$NON-NLS-1$
-	public static final String ENABLE_OFFLINE = "enableOffline"; //$NON-NLS-1$
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeProvider.java
deleted file mode 100644
index 8d7d86acc..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSESystemTypeProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2007 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors:
- * Uwe Stieber (Wind River) - initial API and implementation.
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-import org.eclipse.rse.internal.core.RSECoreRegistry;
-
-/**
- * Dynamic RSE system types provider interface.
- * 
- * See also extension point <code>org.eclipse.rse.core.systemTypeProviders</code>
- *  
- * Clients may implement this interface.
- * 
- * @since RSE 2.0
- */
-public interface IRSESystemTypeProvider {
-
-	/**
-	 * Returns a list of possible RSE system types to register
-	 * at initialization of the RSE core system. The method will
-	 * be called only once for each provider from {@link RSECoreRegistry}.
-	 * The list of the returned RSE system types will be checked
-	 * for duplicates (via the system type id). Duplicates will
-	 * be dropped.
-	 * 
-	 * Returned system types should be subclasses of {@link AbstractRSESystemType}.
-	 * 
-	 * @return The list of RSE system types to register or <code>null</code>.
-	 */
-	public IRSESystemType[] getSystemTypesForRegistration();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEUserIdConstants.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEUserIdConstants.java
deleted file mode 100644
index fbbef55f9..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/IRSEUserIdConstants.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-
-package org.eclipse.rse.core;
-
-/**
- * Constants for user id management. Used when specifying the scope of a user id
- * when setting a user id.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEUserIdConstants {
-
-	/**
-	 * Value 0. Location of user id has not yet been set. Used only as a return value.
-	 */
-	public static final int USERID_LOCATION_NOTSET = 0;
-
-	/**
-	 * Value 1. Location of user id is scoped to the connector service inside the host.
-	 */
-	public static final int USERID_LOCATION_CONNECTORSERVICE = 1;
-
-	/**
-	 * Value 2. Location of user id is scoped to the host, sometimes call "connection".
-	 */
-	public static final int USERID_LOCATION_HOST = 2;
-
-	/**
-	 * Value 3. Location of user id is scoped to system type. It will be the default
-	 * for all hosts of this system type that do not have a specified user id assigned.
-	 */
-	public static final int USERID_LOCATION_DEFAULT_SYSTEMTYPE = 3;
-
-	/**
-	 * Value 4. Location of user id is scoped to workspace.
-	 */
-	public static final int USERID_LOCATION_DEFAULT_OVERALL = 4;
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/ISystemResourceListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/ISystemResourceListener.java
deleted file mode 100644
index b10bbbe42..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/ISystemResourceListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2007 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-import org.eclipse.core.resources.IResourceChangeListener;
-
-public interface ISystemResourceListener extends IResourceChangeListener
-{
-	public void ensureOnResourceEventListening();
-    public void turnOffResourceEventListening();
-    public void turnOnResourceEventListening();
-    public void addResourceChangeListener(IResourceChangeListener l);
-	public void removeResourceChangeListener(IResourceChangeListener l);
-
-    
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java
deleted file mode 100644
index bd4f11edb..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java
+++ /dev/null
@@ -1,649 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - moved from core package in the UI plugin
- *                     - updated to use new RSEPreferencesManager
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
- * Martin Oberhuber (Wind River) - [218655][api] Provide SystemType enablement info in non-UI
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David Dykstal (IBM) - [210474] Deny save password function missing
- ********************************************************************************/
-
-package org.eclipse.rse.core;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.core.model.SystemSignonInformation;
-import org.eclipse.rse.internal.core.RSECoreMessages;
-
-
-/**
- * PasswordPersistenceManager manages the saving and retrieving of user ID /
- * passwords to the Eclipse keyring for registered system types.
- * 
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients. Use
- *                the {@link #getInstance()} method to get the singleton
- *                instance.
- */
-public class PasswordPersistenceManager {
-
-	// Keys used for using the Platform authorization methods
-	// The server url is generic so we can lookup all registered user IDs / passwords
-	// to display to the user in the password information preference page
-	private static final String SERVER_URL = "file://rse"; //$NON-NLS-1$
-
-	private static final String AUTH_SCHEME = "";	// no authorization scheme specified for apis  //$NON-NLS-1$
-
-	// Add return codes
-	public static final int RC_OK = 0;
-	public static final int RC_ALREADY_EXISTS = 1;
-	/** @since org.eclipse.rse.core 3.0 */
-	public static final int RC_DENIED = 2;
-	public static final int RC_ERROR = -1;
-
-	// Default System Type, on a lookup if the specified system type and hostname is not found
-	// then the call will automatically lookup the default system type and hostname
-	public static final IRSESystemType DEFAULT_SYSTEM_TYPE = new DefaultSystemType();
-
-	// Default user name
-	public static final String DEFAULT_USER_NAME = "DEFAULT_USER"; //$NON-NLS-1$
-
-	// New URL to store password map
-	private String newURL = null;
-
-	/*
-	 * Singleton instance
-	 */
-	private static PasswordPersistenceManager _instance;
-
-	/*
-	 * Instance variables
-	 */
-	private RegisteredSystemType[] systemTypes;
-
-	/**
-	 * Default System Type
-	 */
-	private static class DefaultSystemType extends AbstractRSESystemType implements IRSESystemType
-	{
-		private static final String DEFAULT_ID = "DEFAULT"; //$NON-NLS-1$
-		private DefaultSystemType() {
-			super(DEFAULT_ID, DEFAULT_ID, RSECoreMessages.DefaultSystemType_Label, null, null);
-		}
-		public String getId() {
-			//TODO consider a space character at the beginning to ensure uniqueness
-			return DEFAULT_ID;
-		}
-		public String[] getSubsystemConfigurationIds() {
-			return null;
-		}
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-		public boolean isEnabled() {
-			return true;
-		}
-	}
-
-	/**
-	 * Inner class used for storing registered system types
-	 */
-	private class RegisteredSystemType
-	{
-		private IRSESystemType _systemType;
-		private boolean _userIDCaseSensitive;
-
-		protected RegisteredSystemType(IRSESystemType systemType, boolean caseSensitive)
-		{
-			_systemType = systemType;
-			_userIDCaseSensitive = caseSensitive;
-		}
-
-		/**
-		 * Returns the system type.
-		 * @return the system type.
-		 */
-		public IRSESystemType getSystemType() {
-			return _systemType;
-		}
-
-		/**
-		 * Returns whether the user ID is case sensitive.
-		 * @return <code>true</code> if the user ID is case sensitive, <code>false</code> otherwise.
-		 */
-		public boolean isUserIDCaseSensitive() {
-			return _userIDCaseSensitive;
-		}
-	}
-
-	/**
-	 * Singleton so private constructor
-	 */
-	private PasswordPersistenceManager(){
-		String userName = System.getProperty("user.name"); //$NON-NLS-1$
-
-		if (userName == null) {
-			userName = DEFAULT_USER_NAME;
-		}
-
-		newURL = SERVER_URL + userName;
-	}
-
-	/**
-	 * Retrieve the singleton instance of the PasswordPersistenceManger
-	 */
-	public static final synchronized PasswordPersistenceManager getInstance()
-	{
-		if (_instance == null)
-		{
-			_instance = new PasswordPersistenceManager();
-			_instance.initExtensions();
-		}
-		return _instance;
-	}
-
-	/*
-	 * initialization - register system types
-	 */
-	private void initExtensions()
-	{
-		IRSESystemType[] sysTypes = RSECorePlugin.getTheCoreRegistry().getSystemTypes();
-		systemTypes = new RegisteredSystemType[sysTypes.length];
-
-		for (int i = 0; i < sysTypes.length; i++) {
-			systemTypes[i] = new RegisteredSystemType(sysTypes[i], true);
-		}
-	}
-
-	/**
-	 * Remove the entry from the keyring that matches the systemtype, hostname and
-	 * user ID from the SystemSignonInfo parameter.
-	 */
-	public void remove(SystemSignonInformation info)
-	{
-		remove(info.getSystemType(), info.getHostname(), info.getUserId());
-	}
-
-	/**
-	 * Removes all passwords for a host name for a given system type. Use the
-	 * default system type explicitly to remove those entries.
-	 * 
-	 * @param systemType The system type of the host
-	 * @param hostName The IP address of the host in canonical format
-	 * @return the number of passwords removed from the keyring
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public int remove(IRSESystemType systemType, String hostName) {
-		Map passwords = getPasswordMap(systemType);
-		int numberRemoved = 0;
-		if (passwords != null) {
-			String hostPrefix = hostName + "//"; //$NON-NLS-1$
-			Set keys = passwords.keySet();
-			for (Iterator z = keys.iterator(); z.hasNext();) {
-				String key = (String) z.next();
-				if (key.startsWith(hostPrefix)) {
-					z.remove(); // safely removes the key and the entry from the map
-					numberRemoved++;
-				}
-			}
-			if (numberRemoved > 0) {
-				savePasswordMap(systemType.getId(), passwords);
-			}
-		}
-		return numberRemoved;
-	}
-
-	/**
-	 * Removes all entries from the keyring that match the hostname, userid, and system type.
-	 * Use the default system type explicitly to remove those entries.
-	 * @param systemType the systemType
-	 * @param hostName the connection name
-	 * @param userid the user id
-	 */
-	public void remove(IRSESystemType systemType, String hostName, String userid) {
-		String hostname = hostName;//RSEUIPlugin.getQualifiedHostName(hname);
-		// Convert userid to upper case if required
-		if (!isUserIDCaseSensitive(systemType)) {
-			userid = userid.toUpperCase();
-		}
-		Map passwords = getPasswordMap(systemType);
-		if (passwords != null) {
-			if (removePassword(passwords, hostname, userid)) {
-				savePasswordMap(systemType.getId(), passwords);
-			}
-		}
-	}
-
-	/**
-	 * Check if a password entry exists for the specified system type, hostname
-	 * and userid.
-	 */
-	public boolean passwordExists(IRSESystemType systemtype, String hostname, String userid)
-	{
-
-		return passwordExists(systemtype, hostname, userid, true);
-	}
-
-	/**
-	 * Check if a password entry exists for the specified system type, hostname
-	 * and userid.
-	 * 
-	 * @param systemtype The system type to check for.
-	 * @param hname The hostname to check for.
-	 * @param userid The user ID to check for.
-	 * @param checkDefault Whether or not to check for a default system type if the specified system type is not found.
-	 */
-	public boolean passwordExists(IRSESystemType systemtype, String hname, String userid, boolean checkDefault)
-	{
-		String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname);
-		return (find(systemtype, hostname, userid) != null);
-	}
-
-	/**
-	 * Add a password to the password database.
-	 * This will not update the entry for the default system type
-	 * @param info The signon information to store
-	 * @param overwrite Whether to overwrite any existing entry
-	 * @return
-	 * 	RC_OK if the password was successfully stored
-	 *  RC_ALREADY_EXISTS if the password already exists and overwrite was false
-	 */
-	public int add(SystemSignonInformation info, boolean overwrite) {
-		return add(info, overwrite, false);
-	}
-
-	/**
-	 * Add a password to the password database.
-	 * @param info The signon information to store
-	 * @param overwrite If true then overwrite the existing entry for this systemtype, hostname, and userid.
-	 * @param updateDefault if true then set the entry for the default systemtype, hostname, and user ID, according to the overwrite setting.
-	 * @return
-	 * RC_OK if the password was successfully stored.
-	 * RC_ALREADY_EXISTS if the password already exists and overwrite was false
-	 * RC_DENIED if passwords may not be saved for this system type and host
-	 */
-	public int add(SystemSignonInformation info, boolean overwrite, boolean updateDefault) {
-		int result = RC_OK;
-		IRSESystemType systemType = info.getSystemType();
-		String hostName = info.getHostname();
-		String userId = info.getUserId();
-		String newPassword = info.getPassword();
-		boolean deny = RSEPreferencesManager.getDenyPasswordSave(systemType, hostName);
-		if (!deny) {
-			if (!isUserIDCaseSensitive(systemType)) {
-				userId = userId.toUpperCase();
-				info.setUserId(userId);
-			}
-			if (updateDefault) {
-				if (systemType != DEFAULT_SYSTEM_TYPE) {
-					SystemSignonInformation newInfo = new SystemSignonInformation(hostName, userId, newPassword, DEFAULT_SYSTEM_TYPE);
-					result = add(newInfo, overwrite, false);
-				}
-			}
-			Map passwords = getPasswordMap(systemType);
-			if (passwords == null) {
-				passwords = new HashMap(5);
-			}
-			String oldPassword = getPassword(passwords, hostName, userId);
-			if (oldPassword != null) {
-				if (overwrite) {
-					removePassword(passwords, hostName, userId);
-				} else {
-					result = RC_ALREADY_EXISTS;
-				}
-			}
-			if (result == RC_OK) {
-				String passwordKey = getPasswordKey(hostName, userId);
-				passwords.put(passwordKey, newPassword);
-				savePasswordMap(systemType.getId(), passwords);
-			}
-		} else {
-			result = RC_DENIED;
-		}
-		return result;
-	}
-
-	/*
-	 * Retrieve the password map from the keyring for the specified system type
-	 */
-	private Map getPasswordMap(IRSESystemType systemType)
-	{
-		Map passwords = null;
-		String systemTypeId = systemType.getId();
-
-		try
-		{
-			URL serverURL = new URL(newURL);
-			passwords = Platform.getAuthorizationInfo(serverURL, systemTypeId, AUTH_SCHEME);
-
-			// if no passwords found with new URL, check old URL
-			if (passwords == null) {
-
-				URL oldServerURL1 = new URL(SERVER_URL + ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString());
-				passwords = Platform.getAuthorizationInfo(oldServerURL1, systemTypeId, AUTH_SCHEME);
-
-				// passwords found, so migrate to using new URL
-				if (passwords != null) {
-					savePasswordMap(systemTypeId, passwords);
-				}
-				// if still no passwords found, check with even older URL
-				else {
-					URL oldServerURL2 = new URL(SERVER_URL);
-					passwords = Platform.getAuthorizationInfo(oldServerURL2, systemTypeId, AUTH_SCHEME);
-
-					// passwords found, so migrate to using new URL
-					if (passwords != null) {
-						savePasswordMap(systemTypeId, passwords);
-					}
-				}
-			}
-		}
-		catch (MalformedURLException e) {
-			RSECorePlugin.getDefault().getLogger().logError("PasswordPersistenceManager.getPasswordMap", e); //$NON-NLS-1$
-		}
-
-		return passwords;
-	}
-
-	/*
-	 * Retrieve the password map from the keyring for the specified system type
-	 */
-	private void savePasswordMap(String systemTypeId, Map passwords)
-	{
-		try
-		{
-			URL serverURL = new URL(newURL);
-			Platform.flushAuthorizationInfo(serverURL, systemTypeId, AUTH_SCHEME);
-			Platform.addAuthorizationInfo(serverURL, systemTypeId, AUTH_SCHEME, passwords);
-		}
-		catch (MalformedURLException e) {
-			RSECorePlugin.getDefault().getLogger().logError("PasswordPersistenceManager.savePasswordMap", e); //$NON-NLS-1$
-		}
-		catch (CoreException e) {
-			RSECorePlugin.getDefault().getLogger().logError("PasswordPersistenceManager.savePasswordMap", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Find the password for the specified systemtype, hostname and userid.
-	 * If one is not found then the default system type is used.
-	 * The system type in the signon information returned may not be the same as the system type
-	 * specfied in the argument.
-	 */
-	public SystemSignonInformation find(IRSESystemType systemtype, String hostname, String userid)
-	{
-		return find(systemtype, hostname, userid, true);
-	}
-
-
-	private boolean removePassword(Map passwords, String hostname, String userid)
-	{
-		boolean removed = false;
-		String password = null;
-
-		String passwordKey = getPasswordKey(hostname, userid);
-		password =(String) passwords.get(passwordKey);
-		if (password != null)
-		{
-			passwords.remove(passwordKey);
-			removed = true;
-		}
-		else
-		{
-			String phostname = hostname.toUpperCase();
-
-			// DKM - fallback for different case uids, hostnames or qualified/unqualified hostnames
-			Iterator keys = passwords.keySet().iterator();
-			while (keys.hasNext() && password == null)
-			{
-				String key = (String)keys.next();
-				if (key.equalsIgnoreCase(passwordKey))
-				{
-					password = (String) passwords.get(key);
-				}
-				else
-				{
-					String khostname = getHostnameFromPasswordKey(key).toUpperCase();
-					String kuid = getUserIdFromPasswordKey(key);
-					if (kuid.equalsIgnoreCase(userid))
-					{
-						// uid matches, check if hosts are the same
-						if (khostname.startsWith(phostname) || phostname.startsWith(khostname))
-						{
-							String qkhost = RSECorePlugin.getQualifiedHostName(khostname);
-							String qphost = RSECorePlugin.getQualifiedHostName(phostname);
-							if (qkhost.equals(qphost))
-							{
-								password = (String)passwords.get(key);
-							}
-						}
-					}
-				}
-				if (password != null)
-				{
-					passwords.remove(key);
-					removed = true;
-
-				}
-			}
-		}
-		return removed;
-
-	}
-
-	private String getPassword(Map passwords, String hostname, String userid)
-	{
-		String password = null;
-
-		String passwordKey = getPasswordKey(hostname, userid);
-		password =(String) passwords.get(passwordKey);
-		if (password != null)
-			return password;
-
-		String phostname = hostname.toUpperCase();
-
-		// DKM - fallback for different case uids, hostnames or qualified/unqualified hostnames
-		Iterator keys = passwords.keySet().iterator();
-		while (keys.hasNext() && password == null)
-		{
-			String key = (String)keys.next();
-			if (key.equalsIgnoreCase(passwordKey))
-			{
-				password = (String) passwords.get(key);
-			}
-			else
-			{
-				String khostname = getHostnameFromPasswordKey(key).toUpperCase();
-				String kuid = getUserIdFromPasswordKey(key);
-				if (kuid.equalsIgnoreCase(userid))
-				{
-					// uid matches, check if hosts are the same
-					if (khostname.startsWith(phostname) || phostname.startsWith(khostname))
-					{
-						String qkhost = RSECorePlugin.getQualifiedHostName(khostname);
-						String qphost = RSECorePlugin.getQualifiedHostName(phostname);
-						if (qkhost.equals(qphost))
-						{
-							password = (String)passwords.get(key);
-						}
-					}
-				}
-			}
-		}
-
-		return password;
-
-	}
-
-	/**
-	 * Find the persisted password for the specified systemtype, hostname and userid.
-	 * 
-	 * @param systemtype The system type to check for.
-	 * @param hname The hostname to check for.
-	 * @param userid The user ID to check for.
-	 * @param checkDefault Whether or not to check for a default system type if the specified system type is not found.
-	 */
-	public SystemSignonInformation find(IRSESystemType systemtype, String hname, String userid, boolean checkDefault)
-	{
-		String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname);
-		// Convert userid to upper case if required
-		if (!isUserIDCaseSensitive(systemtype) && userid != null)
-		{
-			userid = userid.toUpperCase();
-		}
-
-		Map passwords = getPasswordMap(systemtype);
-
-		if (passwords != null)
-		{
-			String password = getPassword(passwords, hostname, userid);
-
-			if (password != null)
-			{
-				return new SystemSignonInformation(hostname, userid, password, systemtype);
-			}
-		}
-
-		// yantzi: RSE6.2 check for default system type entry with this hostname and user ID
-		if (checkDefault && !DEFAULT_SYSTEM_TYPE.equals(systemtype))
-		{
-			return find(DEFAULT_SYSTEM_TYPE, hostname, userid, false);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Helper class for building the key to lookup the password for a specific
-	 * userid and hostname in the Map
-	 */
-	private String getPasswordKey(String hname, String userid)
-	{
-		String hostname = hname;//RSEUIPlugin.getQualifiedHostName(hname);
-		StringBuffer buffer = new StringBuffer(hostname);
-		buffer.append("//"); //$NON-NLS-1$
-		buffer.append(userid);
-		return buffer.toString();
-	}
-
-	private String getHostnameFromPasswordKey(String passwordKey)
-	{
-		int sepIndex = passwordKey.indexOf("//"); //$NON-NLS-1$
-		return passwordKey.substring(0,sepIndex);
-	}
-
-	private String getUserIdFromPasswordKey(String passwordKey)
-	{
-		int sepIndex = passwordKey.indexOf("//"); //$NON-NLS-1$
-		return passwordKey.substring(sepIndex + 2, passwordKey.length());
-	}
-
-	/**
-	 * Helper method for determining if system type uses case sensitive user IDs
-	 */
-	public boolean isUserIDCaseSensitive(IRSESystemType systemType)
-	{
-		// First find the correct provider
-		for (int i = 0; i < systemTypes.length; i++)
-		{
-
-			if (systemTypes[i].getSystemType().equals(systemType))
-			{
-				return systemTypes[i].isUserIDCaseSensitive();
-			}
-		}
-
-		//Not found: Default system type is case sensitive
-		return true;
-	}
-
-	/**
-	 * Retrieve the list of registered system types
-	 */
-	public IRSESystemType[] getRegisteredSystemTypes()
-	{
-		// yantzi: artemis 6.2, added default system type to list
-		IRSESystemType[] types = new IRSESystemType[systemTypes.length + 1];
-
-		types[0] = DEFAULT_SYSTEM_TYPE;
-
-		for (int i = 0; i < systemTypes.length; i++)
-		{
-			types[i + 1] = systemTypes[i].getSystemType();
-		}
-
-		return types;
-	}
-
-	/**
-	 * Retrieve a list of the stored user IDs.
-	 * 
-	 * @return List A list of the stored user IDs as SystemSignonInformation instances
-	 * without the saved passwords.
-	 */
-	public List getSavedUserIDs()
-	{
-		List savedUserIDs = new ArrayList();
-		Map passwords;
-		String key;
-		int separator;
-
-		for (int i = 0; i < systemTypes.length; i++)
-		{
-			passwords = getPasswordMap(systemTypes[i].getSystemType());
-			if (passwords != null)
-			{
-				Iterator keys = passwords.keySet().iterator();
-				while (keys.hasNext())
-				{
-					key = (String) keys.next();
-					separator = key.indexOf("//"); //$NON-NLS-1$
-					savedUserIDs.add(new SystemSignonInformation(key.substring(0, separator),		// hostname
-							key.substring(separator + 2),		// userid
-							systemTypes[i].getSystemType())); 	// system type
-				}
-			}
-		}
-
-		// yantzi:  RSE 6.2 Get DEFAULT system types too
-		passwords = getPasswordMap(DEFAULT_SYSTEM_TYPE);
-		if (passwords != null)
-		{
-			Iterator keys = passwords.keySet().iterator();
-			while (keys.hasNext())
-			{
-				key = (String) keys.next();
-				separator = key.indexOf("//"); //$NON-NLS-1$
-				savedUserIDs.add(new SystemSignonInformation(key.substring(0, separator),		// hostname
-						key.substring(separator + 2),		// userid
-						DEFAULT_SYSTEM_TYPE)); 	// system type
-			}
-		}
-
-		return savedUserIDs;
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java
deleted file mode 100644
index 3ea90e23e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSECorePlugin.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - added utility method for finding qualifiedHostNames
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- * Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
- * Martin Oberhuber (Wind River) - [181939] Deferred class loading for keystoreProviders
- * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
- * Martin Oberhuber (Wind River) - [160293] NPE on startup when only Core feature is installed
- * Uwe Stieber (Wind River) - [192611] RSE Core plugin may fail to initialize because of cyclic code invocation
- * Martin Oberhuber (Wind River) - [165674] Sort subsystem configurations by priority then Id
- * Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
- * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * Martin Oberhuber (Wind River) - [190231] Prepare API for UI/Non-UI Splitting
- * David Dykstal (IBM) = [226958] add status values to waitForInitCompletion(phase)
- * David McKnight (IBM) - [354874] persistence manager hits a NPE during shutdown
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.rse.core.comm.SystemKeystoreProviderManager;
-import org.eclipse.rse.core.model.ISystemProfileManager;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy;
-import org.eclipse.rse.internal.core.RSECoreRegistry;
-import org.eclipse.rse.internal.core.RSEInitJob;
-import org.eclipse.rse.internal.core.model.SystemProfileManager;
-import org.eclipse.rse.internal.core.model.SystemRegistry;
-import org.eclipse.rse.internal.core.subsystems.SubSystemConfigurationProxy;
-import org.eclipse.rse.internal.core.subsystems.SubSystemConfigurationProxyComparator;
-import org.eclipse.rse.internal.persistence.RSEPersistenceManager;
-import org.eclipse.rse.logging.Logger;
-import org.eclipse.rse.logging.LoggerFactory;
-import org.eclipse.rse.persistence.IRSEPersistenceManager;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * RSECorePlugin provides the activation for the RSE core and acts as the
- * primary registry for logging, persistence, and the main RSE service
- * registries.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class RSECorePlugin extends Plugin {
-
-	/**
-	 * The plugin id for this plugin. Value "org.eclipse.rse.core".
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.rse.core"; //$NON-NLS-1$
-
-	/**
-	 * Current release as a number (multiplied by 100). E.g. 300 is for release 3.0.0
-	 */
-	public static final int CURRENT_RELEASE = 200; // updated to new release
-
-	/**
-	 * Current release as a string.
-	 */
-	public static final String CURRENT_RELEASE_NAME = "2.0.0";  //$NON-NLS-1$
-
-	/**
-	 * Initialization phase constant, value 0. Used in
-	 * {@link #isInitComplete(int)} which will return true if all phases of
-	 * initialization are complete. Clients must not assume any particular
-	 * ordering among phases based on the value.
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final int INIT_ALL = 0;
-
-	/**
-	 * Initialization phase constant, value 1. Used in
-	 * {@link #isInitComplete(int)} which will return true if the model phase of
-	 * the initialization is complete. Clients must not assume any particular
-	 * ordering among phases based on the value.
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final int INIT_MODEL = 1;
-
-	/**
-	 * Initialization phase constant, value 2. Used in
-	 * {@link #isInitComplete(int)} which will return true if the initializer
-	 * phase of the initialization is complete. Clients must not assume any
-	 * particular ordering among phases based on the value.
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final int INIT_INITIALIZER = 2;
-
-	private static RSECorePlugin plugin = null; // the singleton instance of this plugin
-	private Logger logger = null;
-	private ISystemRegistry _systemRegistry = null;
-	private IRSEPersistenceManager _persistenceManager = null;
-	private ISubSystemConfigurationProxy[] _subsystemConfigurations = null;
-	private IRSEInteractionProvider _interactionProvider = null;
-
-	/**
-	 * Returns the singleton instance of RSECorePlugin.
-	 * @return the singleton instance.
-	 */
-	public static RSECorePlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Waits until the RSE model has been fully restored from its persistent
-	 * form. Should be used before accessing pieces of the model.
-	 *
-	 * @return an IStatus indicating how the initialization ended.
-	 * @throws InterruptedException if this wait was interrupted for some
-	 *             reason.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static IStatus waitForInitCompletion() throws InterruptedException {
-		return RSEInitJob.getInstance().waitForCompletion();
-	}
-
-	/**
-	 * Waits until the RSE has completed a specific phase of its initialization.
-	 *
-	 * @param phase the phase to wait for completion.
-	 * @return an IStatus indicating how the initialization for that phase ended.
-	 * @throws InterruptedException if this wait was interrupted for some
-	 *             reason.
-	 * @throws IllegalArgumentException if the phase is undefined.
-	 * @see #INIT_ALL
-	 * @see #INIT_INITIALIZER
-	 * @see #INIT_MODEL
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static IStatus waitForInitCompletion(int phase) throws InterruptedException {
-		return RSEInitJob.getInstance().waitForCompletion(phase);
-	}
-
-	/**
-	 * Check whether the initialization of the RSE model is complete for a given
-	 * phase.
-	 *
-	 * @param phase the phase identifier.
-	 * @return <code>true</code> if the initialization for the given phase has
-	 *         completed regardless of its status of that completion.
-	 * @throws IllegalArgumentException if the phase is undefined.
-	 * @see #INIT_ALL
-	 * @see #INIT_INITIALIZER
-	 * @see #INIT_MODEL
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static boolean isInitComplete(int phase) {
-		return RSEInitJob.getInstance().isComplete(phase);
-	}
-
-	/**
-	 * Adds a new listener to the set of listeners to be notified when
-	 * initialization phases complete. If the listener is added after the phase
-	 * has completed it will not be invoked. If the listener is already in the
-	 * set it will not be added again. Listeners may be notified in any order.
-	 *
-	 * @param listener the listener to be added
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static void addInitListener(IRSEInitListener listener) {
-		RSEInitJob.getInstance().addInitListener(listener);
-	}
-
-	/**
-	 * Removes a listener to the set of listeners to be notified when phases
-	 * complete. If the listener is not in the set this does nothing.
-	 *
-	 * @param listener the listener to be removed
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static void removeInitListener(IRSEInitListener listener) {
-		RSEInitJob.getInstance().removeInitListener(listener);
-	}
-
-	/**
-	 * A static convenience method - fully equivalent to
-	 * <code>RSECorePlugin.getDefault().getRegistry()</code>.
-	 * @return the RSE Core Registry.
-	 */
-	public static IRSECoreRegistry getTheCoreRegistry() {
-		return getDefault().getCoreRegistry();
-	}
-
-	/**
-	 * A static convenience method - fully equivalent to
-	 * <code>RSECorePlugin.getDefault().getPersistenceManager()</code>.
-	 * @return the persistence manager currently in use for RSE
-	 */
-	public static IRSEPersistenceManager getThePersistenceManager() {
-		return getDefault().getPersistenceManager();
-	}
-
-	/**
-	 * Return the master profile manager singleton.
-	 *
-	 * @return the RSE Profile Manager Singleton.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static ISystemProfileManager getTheSystemProfileManager() {
-		return SystemProfileManager.getDefault();
-	}
-
-	/**
-	 * Check if the SystemRegistry has been instantiated already. Use this when
-	 * you don't want to start the system registry as a side effect of
-	 * retrieving it.
-	 *
-	 * @return <code>true</code> if the System Registry has been instantiated
-	 *         already.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static boolean isTheSystemRegistryActive()
-	{
-		if (plugin == null) {
-			return false;
-		}
-		return getDefault().isSystemRegistryActive();
-	}
-
-	/**
-	 * A static convenience method - fully equivalent to
-	 * <code>RSECorePlugin.getDefault().getSystemRegistry()</code>.
-	 * The SystemRegistry is used to gain access to the basic services
-	 * and components used in RSE.
-	 * @return the RSE System Registry.
-	 */
-	public static ISystemRegistry getTheSystemRegistry() {
-		return getDefault().getSystemRegistry();
-	}
-
-	/**
-	 * @return the IP host name of this machine
-	 */
-	public static String getLocalMachineName() {
-		String machineName = null;
-		try {
-			machineName = InetAddress.getLocalHost().getHostName();
-		} catch (UnknownHostException e) {
-			getDefault().log(e);
-		}
-		return machineName;
-	}
-
-	/**
-	 * @return the local IP address of this machine
-	 */
-	public static String getLocalMachineIPAddress() {
-		String machineAddress = null;
-		try {
-			machineAddress = InetAddress.getLocalHost().getHostAddress();
-		} catch (UnknownHostException e) {
-			getDefault().log(e);
-		}
-		return machineAddress;
-	}
-
-	/**
-	 * Returns a qualified host name given a potentially unqualified host name
-	 */
-	public static String getQualifiedHostName(String hostName) {
-		try {
-			InetAddress address = InetAddress.getByName(hostName);
-			return address.getCanonicalHostName();
-		} catch (UnknownHostException exc) {
-			return hostName;
-		}
-	}
-
-	/**
-	 * The constructor. This may be called only by plugin activation.
-	 */
-	public RSECorePlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		registerKeystoreProviders();
-		RSEInitJob job = RSEInitJob.getInstance();
-		job.schedule();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		LoggerFactory.freeLogger(this);
-		logger = null;
-		super.stop(context);
-	}
-
-	/**
-	 * @return the persistence manager used for persisting RSE profiles
-	 */
-	public IRSEPersistenceManager getPersistenceManager() {
-		if (_persistenceManager == null) {
-			synchronized(this) {
-				if (_persistenceManager==null) {
-					_persistenceManager = new RSEPersistenceManager(getSystemRegistry());
-				}
-			}
-		}
-		return _persistenceManager;
-	}
-
-	/**
-	 * Test if the SystemRegistry has been instantiated already.
-	 * Use this when you don't want to start the system registry as a
-	 * side effect of retrieving it.
-	 * @return <code>true</code> if the system registry has been instantiated already.
-	 */
-	private boolean isSystemRegistryActive()
-	{
-		return (_systemRegistry != null);
-	}
-
-	/**
-	 * Return the SystemRegistry singleton.
-	 * Clients should use static @{link getTheSystemRegistry()} instead.
-	 * @return the RSE system registry
-	 */
-	public ISystemRegistry getSystemRegistry() {
-		if (_systemRegistry == null) {
-			synchronized(this) {
-				if (_systemRegistry == null) {
-					String logfilePath = getStateLocation().toOSString();
-					SystemRegistry sr = SystemRegistry.getInstance(logfilePath);
-					ISubSystemConfigurationProxy[] proxies = getSubSystemConfigurationProxies();
-					if (proxies != null) {
-						sr.setSubSystemConfigurationProxies(proxies);
-					}
-					_systemRegistry = sr;
-				}
-			}
-		}
-		return _systemRegistry;
-	}
-
-	/**
-	 * Returns the RSE core registry. Clients should use this method to get the registry which
-	 * is the starting point for working with the RSE framework. It contains methods to access
-	 * core services and components. It is distinct from, and more basic than, an implementation
-	 * of ISystemRegistry.
-	 * <p>
-	 * This may return null if the registry has not yet been set.
-	 * @return the RSE core registry.
-	 */
-	public IRSECoreRegistry getCoreRegistry() {
-		return RSECoreRegistry.getInstance();
-	}
-
-	/**
-	 * Returns an instance of the logger being used by the core. All core services, or extensions to
-	 * core services, should use this logger to log any messages. The RSE logger provides run-time
-	 * filtering according to user preference and uses the platform's logging capabilities. RSE services
-	 * should use this logger rather than a platform logger. The logger is defined at plugin start and
-	 * should always be available.
-	 * @return the instance of System#Logger used by the core RSE
-	 */
-	public Logger getLogger() {
-		if (logger == null) logger = LoggerFactory.getLogger(this);
-		return logger;
-	}
-
-	/**
-	 * Log an unexpected exception that occurs during the functioning of this class.
-	 * @param t the exception to log
-	 */
-	private void log(Throwable t) {
-		getLogger().logError("Unexpected Exception", t); //$NON-NLS-1$
-	}
-
-	/**
-	 * Set the default interaction provider.
-	 *
-	 * When RSE is run with UI, the UI plugins need to set an UI-based
-	 * interaction provider for showing dialogs from Core operations. Non-UI
-	 * headless operations can use an Interaction Provider that just logs its
-	 * messages and works without other UI.
-	 * <p>
-	 * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
-	 * part of a work in progress. There is no guarantee that this API will work
-	 * or that it will remain the same. Please do not use this API without
-	 * consulting with the <a href="http://www.eclipse.org/tm/">Target
-	 * Management</a> team.
-	 * </p>
-	 *
-	 * @param p the interaction provider to set.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public void setDefaultInteractionProvider(IRSEInteractionProvider p) {
-		synchronized (this) {
-			_interactionProvider = p;
-		}
-	}
-
-	/**
-	 * Get the default interface for interacting with the user or other outside
-	 * world.
-	 * <p>
-	 * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
-	 * part of a work in progress. There is no guarantee that this API will work
-	 * or that it will remain the same. Please do not use this API without
-	 * consulting with the <a href="http://www.eclipse.org/tm/">Target
-	 * Management</a> team.
-	 * </p>
-	 *
-	 * @return the default interaction provider.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public IRSEInteractionProvider getDefaultInteractionProvider() {
-		synchronized (this) {
-			return _interactionProvider;
-		}
-	}
-
-	/**
-	 * Register declared keystore providers.
-	 */
-	private void registerKeystoreProviders()
-	{
-		// Get reference to the plug-in registry
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-
-		// Get configured extenders
-		IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.core", "keystoreProviders"); //$NON-NLS-1$  //$NON-NLS-2$
-
-		for (int i = 0; i < systemTypeExtensions.length; i++)
-		{
-			// get the name space of the declaring extension
-			String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier();
-			String keystoreProviderType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$
-
-			// use the name space to get the bundle
-			Bundle bundle = Platform.getBundle(nameSpace);
-			if (bundle.getState() != Bundle.UNINSTALLED)
-			{
-				SystemKeystoreProviderManager.getInstance().registerKeystoreProvider(bundle, keystoreProviderType);
-			}
-		}
-	}
-
-	/**
-	 *  Return all elements that extend the org.eclipse.rse.core.subsystemConfigurations extension point
-	 */
-	private IConfigurationElement[] getSubSystemConfigurationPlugins()
-	{
-		// Get reference to the plug-in registry
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		// Get configured extenders
-		IConfigurationElement[] subsystemConfigurationExtensions =
-			registry.getConfigurationElementsFor("org.eclipse.rse.core","subsystemConfigurations"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		return subsystemConfigurationExtensions;
-	}
-
-	/**
-	 * Return an array of SubSystemConfigurationProxy objects.
-	 * These represent all extensions to our subsystemConfigurations extension point.
-	 */
-	public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxies()
-	{
-		if (_subsystemConfigurations != null) // added by PSC
-			return _subsystemConfigurations;
-
-		IConfigurationElement[] factoryPlugins = getSubSystemConfigurationPlugins();
-		if (factoryPlugins != null)
-		{
-			List l = new ArrayList();
-			for (int idx=0; idx<factoryPlugins.length; idx++)
-			{
-				SubSystemConfigurationProxy ssf =
-					new SubSystemConfigurationProxy(factoryPlugins[idx]);
-
-				l.add(ssf);
-			}
-			ISubSystemConfigurationProxy[] newProxies = (ISubSystemConfigurationProxy[])l.toArray(new ISubSystemConfigurationProxy[l.size()]);
-			//[149280][165674]: Sort proxies by priority then ID in order to
-			//get deterministic results on all getSubSystemConfiguration*() queries
-			Arrays.sort(newProxies, new SubSystemConfigurationProxyComparator());
-			_subsystemConfigurations = newProxies;
-		}
-
-		return _subsystemConfigurations;
-	}
-
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java
deleted file mode 100644
index 29fc53582..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java
+++ /dev/null
@@ -1,541 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Dykstal (IBM) - initial API and implementation
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- * David Dykstal (IBM) - [197167] adding notification and waiting for RSE model
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David Dykstal (IBM) - [210474] Deny save password function missing
- * David Dykstal (IBM) - [233892] Deny password save is not persistent
- ********************************************************************************/
-package org.eclipse.rse.core;
-
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.Preferences;
-
-/**
- * Preferences Manager utility class.
- * 
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class RSEPreferencesManager {
-
-	/**
-	 * Used as a suffix when combined with the system type name to produce the key for the enabled value.
-	 */
-	private static final String ST_ENABLED = "systemType.enabled"; //$NON-NLS-1$
-	/**
-	 * Used as a suffix when combined with the system type name to produce the key for the default user id value.
-	 */
-	private static final String ST_DEFAULT_USERID = "systemType.defaultUserId"; //$NON-NLS-1$
-	/**
-	 * The default value for using deferred queries. Value is <code>true</code>.
-	 */
-	private static final boolean DEFAULT_USE_DEFERRED_QUERIES = true;
-	/**
-	 * The default value for the name of the team profile. Value is "Team".
-	 */
-	private static final String DEFAULT_TEAMPROFILE = "Team"; //$NON-NLS-1$
-	/**
-	 * The default value for the list of active user profiles. Value is "Team".
-	 */
-	private static final String DEFAULT_ACTIVEUSERPROFILES = "Team"; //$NON-NLS-1$
-
-	/**
-	 * @return the Hashtable where the key is a string identifying a particular object, and
-	 * the value is the user ID for that object.
-	 * @see #setUserId(String, String)
-	 */
-	private static Hashtable getUserIds() {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		Hashtable userIds = null;
-		String value = store.getString(IRSEPreferenceNames.USERIDPERKEY);
-		if (value != null) {
-			userIds = parseString(value);
-		} else {
-			userIds = new Hashtable();
-		}
-		return userIds;
-	}
-
-	/**
-	 * Store the user ids that are saved keyed by some key.
-	 * @param userIds A Hashtable of userids.
-	 * @see #setUserId(String, String)
-	 */
-	private static void setUserIds(Hashtable userIds) {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		String userIdsString = makeString(userIds);
-		store.setValue(IRSEPreferenceNames.USERIDPERKEY, userIdsString);
-		savePreferences();
-	}
-
-	/**
-	 * Retrieves a user id given a key.
-	 * @param key the key from which to get the particular user id.
-	 * @return user ID for the given key or null if the key was not found.
-	 * @see #setUserId(String, String)
-	 */
-	public static String getUserId(String key) {
-		String uid = null;
-		Hashtable userIds = getUserIds();
-		uid = (String) userIds.get(key);
-		return uid;
-	}
-
-	/**
-	 * Clears the user ID for the given key.
-	 * @param key the key for the user id.
-	 * @see #setUserId(String, String)
-	 */
-	public static void clearUserId(String key) {
-		Hashtable userIds = getUserIds();
-		if (userIds.containsKey(key)) {
-			userIds.remove(key);
-			setUserIds(userIds);
-		}
-	}
-
-	/**
-	 * Sets the user Id for this key.
-	 * The key typically designates a scope for this userid so that a hierarchy
-	 * of user ids can be maintained for inheritance.
-	 * For example, hosts have greater scope than subsystems.
-	 * A key would typically be <profile-name>.<host-name>,
-	 * or <profile-name>.<host-type>,
-	 * or <profile-name>.<host-name>.<subsystem-name>.
-	 * @param key the key used to find the userId
-	 * @param userId the userId to retrieve by this key.
-	 */
-	public static void setUserId(String key, String userId) {
-		if ((key != null) && (userId != null)) {
-			Hashtable userIds = getUserIds();
-			String storedUserId = (String) userIds.get(key);
-			if (storedUserId == null || !storedUserId.equals(userId)) { // don't bother updating if its already there
-				userIds.put(key, userId);
-				setUserIds(userIds);
-			}
-		}
-	}
-
-	/**
-	 * Gets the default user id for a given system type.
-	 * @param systemType the systemtype for which to retrieve the default user id
-	 * @return The default user id
-	 */
-	public static String getDefaultUserId(IRSESystemType systemType) {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		String key = getSystemTypePreferencesKey(systemType, RSEPreferencesManager.ST_DEFAULT_USERID);
-		if (!store.contains(key)) {
-			store.setDefault(key, System.getProperty("user.name")); //$NON-NLS-1$
-		}
-		String result = store.getString(key);
-		return result;
-	}
-
-	/**
-	 * Sets the default userId for the given system type.
-	 * @param systemType the system type for which to set the default
-	 * @param userId the default user id for this system type.
-	 * This may be null to "unset" the default.
-	 */
-	public static void setDefaultUserId(IRSESystemType systemType, String userId) {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		String key = getSystemTypePreferencesKey(systemType, RSEPreferencesManager.ST_DEFAULT_USERID);
-		store.setValue(key, userId);
-		savePreferences();
-	}
-
-	/**
-	 * Gets the system type values table for editing. This is a synthesized preference
-	 * that is handled as a single value. Rows are separated by semi-colons.
-	 * Each row is of the format <systemTypeId>=<enabled>+<defaultUserId>;
-	 * @return the table of system types formatted as a single string
-	 */
-	public static String getSystemTypeValues() {
-		IRSESystemType[] systemTypes = RSECorePlugin.getTheCoreRegistry().getSystemTypes();
-		StringBuffer buffer = new StringBuffer(100);
-		for (int i = 0; i < systemTypes.length; i++) {
-			IRSESystemType systemType = systemTypes[i];
-			buffer.append(systemType.getId());
-			buffer.append('=');
-			buffer.append(getIsSystemTypeEnabled(systemType));
-			buffer.append('+');
-			buffer.append(getDefaultUserId(systemType));
-			buffer.append(';');
-		}
-		String result = buffer.toString();
-		return result;
-	}
-
-	/**
-	 * Sets the default user id and enabled state for all system types.
-	 * @param systemTypeValues a tabled encoded as a string that contains
-	 * entries for each system type. See {@link #getSystemTypeValues()} for the
-	 * table format.
-	 */
-	public static void setSystemTypeValues(String systemTypeValues) {
-		IRSECoreRegistry registry = RSECorePlugin.getTheCoreRegistry();
-		Hashtable table = parseString(systemTypeValues);
-		Enumeration e = table.keys();
-		while (e.hasMoreElements()) {
-			String key = (String) e.nextElement();
-			String compoundValue = (String) table.get(key);
-			String[] values = compoundValue.split("\\+"); //$NON-NLS-1$
-			String isEnabled = values[0];
-			String defaultUserId = values[1];
-			IRSESystemType systemType = registry.getSystemTypeById(key);
-			setIsSystemTypeEnabled(systemType, isEnabled.equals("true")); //$NON-NLS-1$
-			setDefaultUserId(systemType, defaultUserId);
-		}
-	}
-
-	/**
-	 * Sets if a system type is enabled.
-	 * @param systemType the system type to be enabled on this machine.
-	 * @param isEnabled the enabled state
-	 */
-	public static void setIsSystemTypeEnabled(IRSESystemType systemType, boolean isEnabled) {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		String key = getSystemTypePreferencesKey(systemType, RSEPreferencesManager.ST_ENABLED);
-		if (!store.contains(key)) {
-			store.setDefault(key, true);
-		}
-		store.setValue(key, isEnabled);
-		savePreferences();
-	}
-
-	/**
-	 * Gets the enabled state for a particular system type.
-	 * @param systemType the system type
-	 * @return the enabled state of that type
-	 */
-	public static boolean getIsSystemTypeEnabled(IRSESystemType systemType) {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		String key = getSystemTypePreferencesKey(systemType, RSEPreferencesManager.ST_ENABLED);
-		if (!store.contains(key)) {
-			store.setDefault(key, true);
-		}
-		boolean result = store.getBoolean(key);
-		return result;
-	}
-
-	private static String getSystemTypePreferencesKey(IRSESystemType systemType, String preference) {
-		String key = systemType.getId() + "." + preference; //$NON-NLS-1$
-		return key;
-	}
-
-	/**
-	 * @return the names of the profiles the user has elected to make active.
-	 */
-	public static String[] getActiveProfiles() {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		String value = store.getString(IRSEPreferenceNames.ACTIVEUSERPROFILES);
-		String[] result = parseStrings(value);
-		return result;
-	}
-
-	/**
-	 * Sets the names of the profiles the user has elected to make "active".
-	 * The caller must also save the preferences when completing.
-	 * @see SystemPreferencesManager#savePreferences()
-	 * @param newProfileNames an array of profile names considered to be active.
-	 */
-	private static void setActiveProfiles(String[] newProfileNames) {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		store.setValue(IRSEPreferenceNames.ACTIVEUSERPROFILES, makeString(newProfileNames));
-		savePreferences();
-	}
-
-	/**
-	 * Add a name to the active profile list.
-	 * A name already in the list is not added again.
-	 * The list remains sorted in the natural order.
-	 * @param newName a new active profile name
-	 */
-	public static void addActiveProfile(String newName) {
-		SortedSet names = new TreeSet(Arrays.asList(getActiveProfiles()));
-		names.add(newName);
-		String[] newNames = new String[names.size()];
-		names.toArray(newNames);
-		RSEPreferencesManager.setActiveProfiles(newNames);
-		savePreferences();
-	}
-
-	/**
-	 * Delete one of the active profile names in the list of names stored in the registry.
-	 * @param oldName the name of the profile to remove from the active profiles list.
-	 */
-	public static void deleteActiveProfile(String oldName) {
-		String[] names = getActiveProfiles();
-		int matchPos = -1;
-		for (int idx = 0; (matchPos == -1) && (idx < names.length); idx++) {
-			if (names[idx].equalsIgnoreCase(oldName)) {
-				matchPos = idx;
-				names[idx] = null;
-			}
-		}
-		if (matchPos >= 0) {
-			RSEPreferencesManager.setActiveProfiles(names);
-			savePreferences();
-		}
-	}
-
-	/**
-	 * @param profileName the name of the profile to search for in the list of active profiles.
-	 * @return the zero-based position of a give profile name in the active list
-	 */
-	public static int getActiveProfilePosition(String profileName) {
-		String[] names = getActiveProfiles();
-		int matchPos = -1;
-		for (int idx = 0; (matchPos == -1) && (idx < names.length); idx++) {
-			if (names[idx].equalsIgnoreCase(profileName)) matchPos = idx;
-		}
-		return matchPos;
-	}
-
-	/**
-	 * Renames one of the active profile names in the list of names stored in the registry.
-	 * This is usually employed after renaming a profile to ensure that the active names
-	 * list stays in synch with the actual profile names. The active state of the profiles
-	 * cannot be kept in the profiles themselves since that can vary from workspace to workspace
-	 * for profiles that are shared in a team.
-	 * @param oldName the old name of the profile
-	 * @param newName the new name of the profile
-	 */
-	public static void renameActiveProfile(String oldName, String newName) {
-		// update active profile name list
-		String[] names = getActiveProfiles();
-		int matchPos = -1;
-		for (int idx = 0; (matchPos == -1) && (idx < names.length); idx++) {
-			if (names[idx].equalsIgnoreCase(oldName)) {
-				matchPos = idx;
-				names[idx] = newName;
-			}
-		}
-		if (matchPos >= 0) {
-			RSEPreferencesManager.setActiveProfiles(names);
-			savePreferences();
-		}
-	}
-
-	public static void initDefaults() {
-		String defaultProfileNames = RSEPreferencesManager.DEFAULT_ACTIVEUSERPROFILES;
-		String userProfileName = getDefaultPrivateSystemProfileName();
-		defaultProfileNames += ";" + userProfileName; //$NON-NLS-1$
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		store.setDefault(IRSEPreferenceNames.ACTIVEUSERPROFILES, defaultProfileNames);
-		store.setDefault(IRSEPreferenceNames.USE_DEFERRED_QUERIES, RSEPreferencesManager.DEFAULT_USE_DEFERRED_QUERIES);
-		savePreferences();
-	}
-
-	/**
-	 * Save the preference store.
-	 */
-	private static void savePreferences() {
-		RSECorePlugin.getDefault().savePluginPreferences();
-	}
-
-	/**
-	 * @return The name of the default private system profile. This
-	 * is typically the short name of the host machine or the name of the
-	 * user account.
-	 */
-	public static String getDefaultPrivateSystemProfileName() {
-		String name = RSECorePlugin.getLocalMachineName();
-		if (name != null) {
-			int i = name.indexOf('.');
-			if (i > 0) {
-				name = name.substring(0, i);
-			}
-		}
-		if (name == null) {
-			name = System.getProperty("user.name"); //$NON-NLS-1$
-		}
-		return name;
-	}
-
-	/**
-	 * @return the name of the default team system profile.
-	 */
-	public static String getDefaultTeamProfileName() {
-		String name = RSEPreferencesManager.DEFAULT_TEAMPROFILE;
-		return name;
-	}
-
-	/**
-	 * Convert table of key-value pairs into a single string. Each (name, value) pair is
-	 * encoded as "name=value;" thus no keys or values in the string may
-	 * contain semi-colons or equal signs.
-	 * @param table a Hashtable to convert
-	 * @return the string containing the converted table
-	 */
-	private static String makeString(Hashtable table) {
-		Enumeration keys = table.keys();
-		StringBuffer sb = new StringBuffer(20 * table.size());
-		while (keys.hasMoreElements()) {
-			String key = (String) keys.nextElement();
-			String value = (String) table.get(key);
-			if ((value != null) && (value.length() > 0)) {
-				sb.append(key);
-				sb.append('=');
-				sb.append(value);
-				sb.append(';');
-			}
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Make a single string out of an array of strings. A semicolon is used as a
-	 * delimiter between the separate values. No value in the array can contain
-	 * a semicolon.
-	 * 
-	 * @param values the array of strings to condense into a single one
-	 * @return the condensed string
-	 */
-	private static String makeString(String[] values) {
-		StringBuffer allValues = new StringBuffer(20 * values.length);
-		for (int idx = 0; idx < values.length; idx++) {
-			if (values[idx] != null) {
-				if (idx > 0) {
-					allValues = allValues.append(';');
-				}
-				allValues.append(values[idx]);
-			}
-		}
-		return allValues.toString();
-	}
-
-	/**
-	 * Parse out list of multiple values into a string array per value.
-	 * This is the inverse of the {@link #makeString(String[])} operation.
-	 * @param allvalues the string holding the condensed value
-	 * @return the reconstituted array of strings.
-	 */
-	private static String[] parseStrings(String allvalues) {
-		if (allvalues == null) return new String[0];
-		String[] tokens = allvalues.split(";"); //$NON-NLS-1$
-		return tokens;
-	}
-
-	/**
-	 * Parse out list of key-value pairs into a Hashtable. This is the inverse
-	 * of the {@link SystemPreferencesManager#makeString(Hashtable)} operation.
-	 * 
-	 * @param allValues the string containing the key-value pairs. If empty or
-	 *            null returns and empty Hashtable.
-	 * @return the reconstituted Hashtable
-	 */
-	private static Hashtable parseString(String allValues) {
-		Hashtable keyValues = new Hashtable(10);
-		if (allValues != null) {
-			StringTokenizer tokens = new StringTokenizer(allValues, "=;"); //$NON-NLS-1$
-			int count = 0;
-			String token1 = null;
-			String token2 = null;
-			while (tokens.hasMoreTokens()) {
-				count++;
-				if ((count % 2) == 0) // even number
-				{
-					token2 = tokens.nextToken();
-					keyValues.put(token1, token2);
-				} else
-					token1 = tokens.nextToken();
-			}
-		}
-		return keyValues;
-	}
-
-	/**
-	 * Get the Preference setting whether the local connection should be created
-	 * by default or not.
-	 * 
-	 * @return the boolean value indicating whether or not to create a local
-	 *         connection on a fresh workspace.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static boolean getCreateLocalConnection() {
-		Preferences prefs = RSECorePlugin.getDefault().getPluginPreferences();
-		boolean result = prefs.getBoolean(IRSEPreferenceNames.CREATE_LOCAL_CONNECTION);
-		return result;
-	}
-
-	/**
-	 * Sets the preference for a particular system type and host address that causes passwords
-	 * not to be savable. The default for this attribute is false - that is, passwords are savable for
-	 * all system types and hosts.
-	 * @param systemType The system type of this preference.
-	 * @param hostAddress The host address of this preference
-	 * @param deny true if save of passwords is to be denied. false is save is to be allowed.
-	 * If true then all passwords that have been saved for this system type and host address are removed.
-	 * All passwords saved for the default system type and host address are also removed.
-	 * @return the number of passwords removed if deny was set to true
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static int setDenyPasswordSave(IRSESystemType systemType, String hostAddress, boolean deny) {
-		int result = 0;
-		Preferences preferences = RSECorePlugin.getDefault().getPluginPreferences();
-		String preferenceName = getPasswordSavePreferenceName(systemType, hostAddress);
-		preferences.setValue(preferenceName, deny);
-		if (deny) {
-			result = PasswordPersistenceManager.getInstance().remove(systemType, hostAddress);
-			result += PasswordPersistenceManager.getInstance().remove(PasswordPersistenceManager.DEFAULT_SYSTEM_TYPE, hostAddress);
-		}
-		savePreferences();
-		return result;
-	}
-
-	/**
-	 * Retrieves the preference for a particular system type and host address that determines if passwords
-	 * can be saved. The default for this attribute is false, that is, save is not denied, 
-	 * thus passwords are savable.
-	 * @param systemType
-	 * @param hostAddress
-	 * @return true if saving of passwords is denied. false if saving is allowed.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static boolean getDenyPasswordSave(IRSESystemType systemType, String hostAddress) {
-		Preferences preferences = RSECorePlugin.getDefault().getPluginPreferences();
-		String preferenceName = getPasswordSavePreferenceName(systemType, hostAddress);
-		boolean result = preferences.getBoolean(preferenceName);
-		return result;
-	}
-
-	/**
-	 * Retrieves the "denyPasswordSave" preference name of a particular host address. 
-	 * @param systemType The system type we are concerned with
-	 * @param hostAddress The host address, typically an IP address.
-	 * @return the name associated with this preference.
-	 * This name is of the form {systemTypeId}___{hostAddress}___DENY_PASSWORD_SAVE.
-	 */
-	private static String getPasswordSavePreferenceName(IRSESystemType systemType, String hostAddress) {
-		StringBuffer b = new StringBuffer(100);
-		b.append(systemType.getId());
-		b.append("___"); //$NON-NLS-1$
-		b.append(hostAddress.toUpperCase(Locale.US)); // should use US locale for IP names and addresses
-		b.append("___DENY_PASSWORD_SAVE"); //$NON-NLS-1$
-		String preferenceName = b.toString();
-		return preferenceName;
-	}
-
-	/*
-	 * Having this method private disables instance creation.
-	 */
-	private RSEPreferencesManager() {
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java
deleted file mode 100644
index 477629376..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RemoteSystemsTempProjectNature.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * {Name} (company) - description of contribution.
- ********************************************************************************/
-
-package org.eclipse.rse.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * A nature for the temporary project where we store files.
- */
-public class RemoteSystemsTempProjectNature implements IProjectNature {
-
-
-
-	/**
-	 * @see org.eclipse.core.resources.IProjectNature#configure()
-	 */
-	public void configure() throws CoreException {
-	}
-
-	/**
-	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
-	 */
-	public void deconfigure() throws CoreException {
-	}
-
-	/**
-	 * @see org.eclipse.core.resources.IProjectNature#getProject()
-	 */
-	public IProject getProject() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.core.resources.IProjectNature#setProject(IProject)
-	 */
-	public void setProject(IProject project) {
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemRemoteObjectMatcher.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemRemoteObjectMatcher.java
deleted file mode 100644
index 3bc67dc03..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemRemoteObjectMatcher.java
+++ /dev/null
@@ -1,590 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType 
- * Martin Oberhuber (Wind River) - [168870] refactor org.eclipse.rse.core package of the UI plugin
- * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
- ********************************************************************************/
-
-package org.eclipse.rse.core;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.subsystems.ISystemRemoteObjectMatchProvider;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-
-/**
- * This class encapsulates all the criteria required to identify a match on a remote
- * system object, and the methods to determine if a given input meets that criteria.
- * <ol>
- * <li>subsystemconfigurationid. For scoping to remote objects for a given subsystem configuration
- * <li>subsystemconfigurationCategory. For scoping to remote objects for a given subsystem configuration category.
- * <li>systemTypes. For scoping to remote objects from systems of a given type, or semicolon-separated types.
- * <li>category. For scoping to remote objects of a given type category
- * <li>namefilter. For scoping to remote objects of a given name
- * <li>typefilter. For scoping to remote objects of a given type
- * <li>subtypefilter. For scoping to remote objects of a given subtype
- * <li>subsubtypefilter. For scoping to remote objects of a given sub-subtype
- * </ol>
- * <p>
- * The names given can be scalar or very simple generic (begin or end with an asterisk).
- * Occasionally, as with iSeries objects types, an asterisk is a valid part of the 
- *  name, as in *PGM. If "*PGM" is specified for the type filter, then it would match
- *  on other types too, like *SRVPGM. To solve this special case, users can specify
- *  the following to tell us that the asterisk is to be taken literally, versus as a
- *  leading or trailing wild card:
- * <pre><code>
- *  "%%ast.PGM" or "%%ast;PGM"
- * </code></pre>
- * <p>
- * The special symbol "%%ast." is resolved into an asterisk as part of the literal name.
- * @see org.eclipse.rse.core.subsystems.ISystemRemoteObjectMatchProvider
- */
-public class SystemRemoteObjectMatcher 
-{
-	public static final String STAR_SYMBOL = "%ast."; //$NON-NLS-1$
-	public static final String STAR_SYMBOL2 = "%ast;"; // really should have been this I think. //$NON-NLS-1$
-	public static final int    STAR_SYMBOL_LEN = 5;
-    private String categoryfilter, subsystemfilter,subsystemCategoryFilter, systypesfilter, namefilter,typefilter,subtypefilter,subsubtypefilter;
-    private String categoryfilterpart, subsystemfilterpart,subsystemCategoryFilterpart,namefilterpart,typefilterpart,subtypefilterpart,subsubtypefilterpart;
-    private boolean allSSFCategories = false;
-    private boolean allCategories = false;
-    private boolean allNames = false;
-    private boolean allTypes = false;    
-    private boolean allSubTypes = false;
-    private boolean allSubSubTypes = false;
-    private boolean allSubSystems = false;    
-    private boolean allSystemTypes = false;
-
-    private boolean genericSSFCategoriesStart = false;
-    private boolean genericCategoriesStart = false;
-    private boolean genericNamesStart = false;
-    private boolean genericTypesStart = false;    
-    private boolean genericSubTypesStart = false;
-    private boolean genericSubSubTypesStart = false;
-    private boolean genericSubSystemStart = false;    
-    
-    private boolean genericSSFCategoriesEnd = false;
-    private boolean genericCategoriesEnd = false;
-    private boolean genericNamesEnd = false;
-    private boolean genericTypesEnd = false;    
-    private boolean genericSubTypesEnd = false;
-    private boolean genericSubSubTypesEnd = false;
-    private boolean genericSubSystemEnd = false;
-    
-    /**
-     * Historical constructor that doesn't support "subsystemConfigurationCategory" or "systemTypes".
-     */
-    public SystemRemoteObjectMatcher(String subsystemConfigurationId, String categoryFilter,
-                                     String nameFilter, String typeFilter,
-                                     String subtypeFilter, String subsubtypeFilter)
-    {
-    	this(subsystemConfigurationId, null, categoryFilter, null, nameFilter, typeFilter, subtypeFilter, subsubtypeFilter);
-    }
-    /**
-     * Constructor that supports "subsystemConfigurationCategory" and "systemTypes".
-     */
-    public SystemRemoteObjectMatcher(String subsystemConfigurationId, String subsystemConfigurationCategoryFilter, String categoryFilter,
-                                     String systemTypes, String nameFilter, String typeFilter,
-                                     String subtypeFilter, String subsubtypeFilter)
-    {
-    	this.subsystemCategoryFilter = subsystemConfigurationCategoryFilter;
-    	this.subsystemfilter = subsystemConfigurationId;
-    	this.systypesfilter = systemTypes;
-        this.categoryfilter = categoryFilter;
-    	this.namefilter = nameFilter;
-    	this.typefilter = typeFilter;
-    	this.subtypefilter = subtypeFilter;
-    	this.subsubtypefilter = subsubtypeFilter;
-
-    	if ((systypesfilter == null) || (systypesfilter.length()==0))
-    	  systypesfilter = "*"; //$NON-NLS-1$
-    	if ((subsystemCategoryFilter == null) || (subsystemCategoryFilter.length()==0))
-    	  subsystemCategoryFilter = "*"; //$NON-NLS-1$
-    	if (categoryfilter == null)
-    	  categoryfilter = "*"; //$NON-NLS-1$
-    	if (namefilter == null)
-    	  namefilter = "*"; //$NON-NLS-1$
-    	if (typefilter == null)
-    	  typefilter = "*"; //$NON-NLS-1$
-    	if (subtypefilter == null)
-    	  subtypefilter = "*"; //$NON-NLS-1$
-    	if (subsubtypefilter == null)
-    	  subsubtypefilter = "*"; //$NON-NLS-1$
-    	if (subsystemfilter == null)
-    	  subsystemfilter = "*"; //$NON-NLS-1$
-
-    	this.allSSFCategories  = subsystemCategoryFilter.equals("*"); //$NON-NLS-1$
-    	this.allCategories  = categoryfilter.equals("*"); //$NON-NLS-1$
-    	this.allSystemTypes = systypesfilter.equals("*"); //$NON-NLS-1$
-    	this.allNames       = namefilter.equals("*"); //$NON-NLS-1$
-    	this.allTypes       = typefilter.equals("*"); //$NON-NLS-1$
-    	this.allSubTypes    = subtypefilter.equals("*"); //$NON-NLS-1$
-    	this.allSubSubTypes = subsubtypefilter.equals("*"); //$NON-NLS-1$
-    	this.allSubSystems  = subsystemfilter.equals("*"); //$NON-NLS-1$
-    	
-    	// --------------------------------------------------
-    	// determine if the name starts or ends with asterisk
-    	// --------------------------------------------------
-    	this.genericSSFCategoriesStart = !allSSFCategories  && startsWithAsterisk(subsystemCategoryFilter);    	
-    	this.genericCategoriesStart    = !allCategories     && startsWithAsterisk(categoryfilter);    	
-    	this.genericNamesStart         = !allNames          && startsWithAsterisk(namefilter);
-    	this.genericTypesStart         = !allTypes          && startsWithAsterisk(typefilter);
-    	this.genericSubTypesStart      = !allSubTypes       && startsWithAsterisk(subtypefilter);
-    	this.genericSubSubTypesStart   = !allSubSubTypes    && startsWithAsterisk(subsubtypefilter);
-    	this.genericSubSystemStart     = !allSubSystems     && startsWithAsterisk(subsystemfilter);
-
-    	this.genericSSFCategoriesEnd = !allSSFCategories  && endsWithAsterisk(subsystemCategoryFilter);    	
-    	this.genericCategoriesEnd    = !allCategories     && endsWithAsterisk(categoryfilter);
-    	this.genericNamesEnd         = !allNames          && endsWithAsterisk(namefilter);
-    	this.genericTypesEnd         = !allTypes          && endsWithAsterisk(typefilter);
-    	this.genericSubTypesEnd      = !allSubTypes       && endsWithAsterisk(subtypefilter);
-    	this.genericSubSubTypesEnd   = !allSubSubTypes    && endsWithAsterisk(subsubtypefilter);
-    	this.genericSubSystemEnd     = !allSubSystems     && endsWithAsterisk(subsystemfilter);
-
-    	if (genericSSFCategoriesStart)
-    	  subsystemCategoryFilterpart   = stripLeadingAsterisk(subsystemCategoryFilter);   // strip off asterisk
-    	if (genericCategoriesStart)
-    	  categoryfilterpart   = stripLeadingAsterisk(categoryfilter);   // strip off asterisk
-    	if (genericNamesStart)
-    	  namefilterpart       = stripLeadingAsterisk(namefilter);       // strip off asterisk
-    	if (genericTypesStart)
-    	  typefilterpart       = stripLeadingAsterisk(typefilter);       // strip off asterisk
-    	if (genericSubTypesStart)
-    	  subtypefilterpart    = stripLeadingAsterisk(subtypefilter);    // strip off asterisk
-    	if (genericSubSubTypesStart)
-    	  subsubtypefilterpart = stripLeadingAsterisk(subsubtypefilter); // strip off asterisk
-    	if (genericSubSystemStart)
-    	  subsystemfilterpart  = stripLeadingAsterisk(subsystemfilter);  // strip off asterisk
-
-    	if (genericSSFCategoriesEnd)
-    	  subsystemCategoryFilterpart   = stripTrailingAsterisk(subsystemCategoryFilter);  // strip off asterisk
-    	if (genericCategoriesEnd)
-    	  categoryfilterpart   = stripTrailingAsterisk(categoryfilter);  // strip off asterisk
-    	if (genericNamesEnd)
-    	  namefilterpart       = stripTrailingAsterisk(namefilter);      // strip off asterisk
-    	if (genericTypesEnd)
-    	  typefilterpart       = stripTrailingAsterisk(typefilter);      // strip off asterisk
-    	if (genericSubTypesEnd)
-    	  subtypefilterpart    = stripTrailingAsterisk(subtypefilter);   // strip off asterisk
-    	if (genericSubSubTypesEnd)
-    	  subsubtypefilterpart = stripTrailingAsterisk(subsubtypefilter);// strip off asterisk
-    	if (genericSubSystemEnd)
-    	  subsystemfilterpart  = stripTrailingAsterisk(subsystemfilter); // strip off asterisk
-
-    	// --------------------------------------------------
-    	// resolve '\*' escape characters
-    	// --------------------------------------------------
-        subsystemCategoryFilter   = resolveSymbols(subsystemCategoryFilter);
-        categoryfilter   = resolveSymbols(categoryfilter);
-        namefilter       = resolveSymbols(namefilter);
-        typefilter       = resolveSymbols(typefilter);
-        subtypefilter    = resolveSymbols(subtypefilter);
-        subsubtypefilter = resolveSymbols(subsubtypefilter);
-        subsystemfilter  = resolveSymbols(subsystemfilter);
-    }
-    
-    /**
-     * Helper method.
-     * Returns true if given name starts with an asterisk.
-     */
-    protected boolean startsWithAsterisk(String name)
-    {
-    	return name.startsWith("*"); //$NON-NLS-1$
-    }
-    /**
-     * Helper method.
-     * Returns true if given name ends with an asterisk.
-     */
-    protected boolean endsWithAsterisk(String name)
-    {
-    	return name.endsWith("*"); //$NON-NLS-1$
-    }
-    /**
-     * Helper method.
-     * Strips off the leading asterisk.
-     */
-    protected String stripLeadingAsterisk(String name)
-    {
-    	return resolveSymbols(name.substring(1));
-    }
-    /**
-     * Helper method.
-     * Strips off the trailing asterisk.
-     */
-    protected String stripTrailingAsterisk(String name)
-    {
-    	return resolveSymbols(name.substring(0, name.length()-1));
-    }
-    /**
-     * Occasionally, as with iSeries objects types, an asterisk is a valid part of the 
-     *  name, as in *PGM. If "*PGM" is specified for the type filter, then it would match
-     *  on other types too, like *SRVPGM. To solve this special case, users can specify
-     *  the following to tell us that the asterisk is to be taken literally, versus as a
-     *  leading or trailing wild card:<br>
-     * <pre><code>
-     *  "%%ast.PGM" or "%%ast;PGM"
-     * </code></pre>
-     * <p>
-     * The special symbol "%%ast." is resolved into an asterisk as part of the literal name.
-     */
-    protected String resolveSymbols(String name)
-    {
-    	// yantzi:5.1.2 workaround for eclipse bug 49312
-    	if (name.startsWith("%%ast.") || name.startsWith("%%ast;")) //$NON-NLS-1$  //$NON-NLS-2$
-    	{
-    		// eclipse should have stripped the leading % off but doesn't because of this bug
-    		name = name.substring(1);
-    	}
-    	
-    	int symbolLength = STAR_SYMBOL_LEN;
-    	int symbolIndex = name.indexOf(STAR_SYMBOL);
-    	if (symbolIndex == -1)
-    	   symbolIndex = name.indexOf(STAR_SYMBOL2);
-    	boolean hasSymbols = (symbolIndex != -1);
-    	boolean hadSymbols = hasSymbols;
-    	boolean debug = false;
-    	if (hasSymbols && debug)
-          System.out.println("Before: " + name); //$NON-NLS-1$
-    	while (hasSymbols)
-    	{
-    		if (symbolIndex == 0)
-    		{
-              // "&amp.abc"
-    		  if (name.length() > symbolLength)
-    		    name = "*" + name.substring(symbolLength); //$NON-NLS-1$
-              // "&amp."
-    		  else
-    		    name = "*"; //$NON-NLS-1$
-    		}
-    		else if ((symbolIndex+symbolLength) < name.length())
-    		{
-                // "abc&amp.def"
-                // "01234567890"    			
-    			String part1 = name.substring(0,symbolIndex); // up to symbol
-    			String part2 = name.substring(symbolIndex+symbolLength); // after symbol 
-    			name = part1 + "*" + part2; //$NON-NLS-1$
-    		}
-    		else
-    		{
-                // "abc&amp."
-                // "01234567"    			
-    			String part1 = name.substring(0,symbolIndex); // up to symbol
-    			name = part1 + "*"; //$NON-NLS-1$
-    		}
-    		symbolIndex = name.indexOf(STAR_SYMBOL);
-    		if (symbolIndex == -1)
-    		  symbolIndex = name.indexOf(STAR_SYMBOL2);    		
-    		hasSymbols = (symbolIndex != -1);
-    	}
-    	if (hadSymbols && debug)
-          System.out.println("After: " + name); //$NON-NLS-1$
-    	return name;
-    }
-    
-    /**
-     * Getter method.
-     * Return what was specified for the <samp>subsystemconfigurationCategory</samp> xml attribute.
-     */
-    public String getSubSystemConfigurationCategoryFilter()
-    {
-    	return subsystemCategoryFilter;
-    }        
-    /**
-     * Getter method.
-     * Return what was specified for the <samp>systemTypes</samp> xml attribute.
-     */
-    public String getSystemTypesFilter()
-    {
-    	return systypesfilter;
-    }        
-    
-    /**
-     * Getter method.
-     * Return what was specified for the <samp>typecategoryfilter</samp> xml attribute.
-     */
-    public String getCategoryFilter()
-    {
-    	return categoryfilter;
-    }        
-    /**
-     * Getter method.
-     * Return what was specified for the <samp>namefilter</samp> xml attribute.
-     */
-    public String getNameFilter()
-    {
-    	return namefilter;
-    }    
-    /**
-     * Getter method.
-     * Return what was specified for the <samp>typefilter</samp> xml attribute.
-     */
-    public String getTypeFilter()
-    {
-    	return typefilter;
-    }    
-    /**
-     * Getter method.
-     * Return what was specified for the <samp>subtypefilter</samp> xml attribute.
-     */
-    public String getSubTypeFilter()
-    {
-    	return subtypefilter;
-    }    
-    /**
-     * Getter method.
-     * Return what was specified for the <samp>subsubtypefilter</samp> xml attribute.
-     */
-    public String getSubSubTypeFilter()
-    {
-    	return subsubtypefilter;
-    }    
-    /**
-     * Getter method.
-     * Return what was specified for the <samp>subsystemconfigurationid</samp> xml attribute.
-     */
-    public String getSubSystemConfigurationId()
-    {
-    	return subsystemfilter;
-    }    
-
-    /**
-     * Given an ISystemRemoteElement, return true if that element
-     * meets this criteria.
-     */
-    public boolean appliesTo(ISystemRemoteObjectMatchProvider adapter, Object element)
-    {
-        boolean applies = true;
-        // must match on all attributes to apply
-
-        // -----------------------------------
-        // check for match on subsystem filter
-        // -----------------------------------
-        boolean subsystemMatch = true;
-        if (!allSubSystems)
-        {
-        	String subsystem = adapter.getSubSystemConfigurationId(element);
-        	if (subsystem == null)
-        	  subsystemMatch = false;
-            else if (!genericSubSystemStart && !genericSubSystemEnd)
-              subsystemMatch = subsystem.equals(subsystemfilter);
-            else if (genericSubSystemStart)
-              subsystemMatch = subsystem.endsWith(subsystemfilterpart);
-            else if (genericSubSystemEnd)
-              subsystemMatch = subsystem.startsWith(subsystemfilterpart);
-        }
-        if (!subsystemMatch)
-          return false;
-
-        // ----------------------------------------------------
-        // check for match on subsystem factory category filter
-        // ----------------------------------------------------
-        boolean ssfCategoryMatch = true;
-        if (!allSSFCategories)
-        {
-        	ISubSystem subsystem = adapter.getSubSystem(element);
-        	if (subsystem == null)
-        	  ssfCategoryMatch = true; // should be false, but this was added late and I don't to regress anyting.
-        	else
-        	{
-        		String ssfCategory = subsystem.getSubSystemConfiguration().getCategory();
-        		if (ssfCategory == null)
-        		  ssfCategory = ""; //$NON-NLS-1$        		
-        		if (!genericSSFCategoriesStart && !genericSSFCategoriesEnd)        		
-        		   ssfCategoryMatch = ssfCategory.equals(subsystemCategoryFilter);
-                else if (genericSSFCategoriesStart)
-                   ssfCategoryMatch = ssfCategory.endsWith(subsystemCategoryFilterpart);
-                else if (genericSSFCategoriesEnd)
-                   ssfCategoryMatch = ssfCategory.startsWith(subsystemCategoryFilterpart);
-        	}
-        }
-        if (!ssfCategoryMatch)
-          return false;
-
-        // ----------------------------------------------------
-        // check for match on system types filter
-        // ----------------------------------------------------
-        boolean systemTypesMatch = true;
-        if (!allSystemTypes)
-        {        	
-        	ISubSystem subsystem = adapter.getSubSystem(element);
-			String[] values = tokenize(systypesfilter);
-			if (subsystem == null)
-			{
-				if (!(element instanceof IHost)) // should never happen for remote objects!
-			      systemTypesMatch = false;	
-			    else
-			    {
-			       String connSysType = ((IHost)element).getSystemType().getName();		
-			       systemTypesMatch = false;
-			       for (int idx=0; !systemTypesMatch && (idx<values.length); idx++)			
-			       {
-			    	  if (connSysType.equals(values[idx]))
-			    	     systemTypesMatch = true;
-			       }
-			    }
-			}
-			else
-			{
-			   systemTypesMatch = false;
-			   for (int idx=0; !systemTypesMatch && (idx<values.length); idx++)			
-			   {
-			      if (subsystem.getHost().getSystemType().getName().equals(values[idx]))
-		             systemTypesMatch = true;
-			   }
-			}
-        }
-        if (!systemTypesMatch)
-          return false;
-                    
-        // ------------------------------        
-        // check for match on name filter
-        // ------------------------------
-        boolean nameMatch = true;
-        
-        // default is case insensitive
-        boolean caseSensitive = false;
-        
-        // get subsystem
-    	ISubSystem subsystem = adapter.getSubSystem(element);
-    	
-    	// find out whether system is case sensitive or not
-    	if (subsystem != null) {
-    		caseSensitive = subsystem.getSubSystemConfiguration().isCaseSensitive();
-    	}
-        
-        if (!allNames)
-        {
-        	String name = adapter.getName(element);
-        	String theNameFilter = namefilter;
-        	String theNameFilterPart = namefilterpart;
-        	
-        	if (name == null) {
-        		nameMatch = false;
-        	}
-        	
-        	else {
-        		
-        		if (!caseSensitive) {
-        			name = name.toLowerCase();
-        			theNameFilter = theNameFilter.toLowerCase();
-        			theNameFilterPart = theNameFilterPart.toLowerCase();
-        		}
-        		
-        		if (!genericNamesStart && !genericNamesEnd)
-        			nameMatch = name.equals(theNameFilter);
-        		else if (genericNamesStart)
-        			nameMatch = name.endsWith(theNameFilterPart);
-        		else if (genericNamesEnd)
-        			nameMatch = name.startsWith(theNameFilterPart);
-        	}
-        }
-        if (!nameMatch)
-          return false;
-
-        // ---------------------------------------        
-        // check for match on type category filter
-        // ---------------------------------------
-        boolean catMatch = true;
-        if (!allCategories)
-        {
-        	String cat = adapter.getRemoteTypeCategory(element);
-        	if (cat == null)
-        	  catMatch = false;
-            else if (!genericCategoriesStart && !genericCategoriesEnd)
-              catMatch = cat.equals(categoryfilter);
-            else if (genericCategoriesStart)
-              catMatch = cat.endsWith(categoryfilterpart);
-            else if (genericCategoriesEnd)
-              catMatch = cat.startsWith(categoryfilterpart);
-        }
-        if (!catMatch)
-          return false;
-
-        // ------------------------------        
-        // check for match on type filter
-        // ------------------------------
-        boolean typeMatch = true;
-        if (!allTypes)
-        {
-        	String type = adapter.getRemoteType(element);
-        	if (type == null)
-        	  typeMatch = false;
-            else if (!genericTypesStart && !genericTypesEnd)
-              typeMatch = type.equals(typefilter);
-            else if (genericTypesStart)
-              typeMatch = type.endsWith(typefilterpart);
-            else if (genericTypesEnd)
-              typeMatch = type.startsWith(typefilterpart);
-        }
-        if (!typeMatch)
-          return false;
-
-        // ---------------------------------        
-        // check for match on subtype filter
-        // ---------------------------------
-        boolean subtypeMatch = true;
-        if (!allSubTypes)
-        {
-        	String subtype = adapter.getRemoteSubType(element);
-        	if (subtype == null)
-        	  subtypeMatch = false;
-            else if (!genericSubTypesStart && !genericSubTypesEnd)
-              subtypeMatch = subtype.equals(subtypefilter);
-            else if (genericSubTypesStart)
-              subtypeMatch = subtype.endsWith(subtypefilterpart);
-            else if (genericSubTypesEnd)
-              subtypeMatch = subtype.startsWith(subtypefilterpart);
-        }
-        if (!subtypeMatch)
-          return false;
-
-        // -------------------------------------        
-        // check for match on sub-subtype filter
-        // -------------------------------------
-        boolean subsubtypeMatch = true;
-        if (!allSubSubTypes)
-        {
-        	String subsubtype = adapter.getRemoteSubSubType(element);
-        	if (subsubtype == null)
-        	  subsubtypeMatch = false;        	  
-            else if (!genericSubSubTypesStart && !genericSubSubTypesEnd)
-              subsubtypeMatch = subsubtype.equals(subsubtypefilter);
-            else if (genericSubSubTypesStart)
-              subsubtypeMatch = subsubtype.endsWith(subsubtypefilterpart);
-            else if (genericSubSubTypesEnd)
-              subsubtypeMatch = subsubtype.startsWith(subsubtypefilterpart);
-        }
-        if (!subsubtypeMatch)
-          return false;
-
-        return applies;
-    }
-
-	/**
-	 * Break given comma-delimited string into tokens
-	 */
-	private String[] tokenize(String input)
-	{
-          	StringTokenizer tokens = new StringTokenizer(input,";"); //$NON-NLS-1$
-            Vector v = new Vector();
-            while (tokens.hasMoreTokens())
-              v.addElement(tokens.nextToken());
-            String[] stringArray = new String[v.size()];
-            for (int idx=0; idx<v.size(); idx++)
-               stringArray[idx] = (String)v.elementAt(idx);
-            return stringArray;
-	}    
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceHelpers.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceHelpers.java
deleted file mode 100644
index 016658d3e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceHelpers.java
+++ /dev/null
@@ -1,777 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- *******************************************************************************/
-
-package org.eclipse.rse.core;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * A class with helper methods for working with the underlying Eclipse resources
- * needed for filters, filter pools and filter pool managers.
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class SystemResourceHelpers implements FileFilter
-{
-	
-	private static SystemResourceHelpers defaultInstance = null;
-	
-    //private SystemLogFile logFile = null;
-	
-	// variables to affect the list method for subsetting folder contents
-	private boolean filesOnly = false;
-	private boolean foldersOnly = false;
-	private String namePrefix = null;
-	private String nameSuffix = null;
-    
-       
-    /**
-     * Constructor
-     */
-    public SystemResourceHelpers()
-    {
-    }
-    
-    /**
-     * Return common instance if unique instance not required.
-     */
-    public static SystemResourceHelpers getResourceHelpers()
-    {
-    	if (defaultInstance == null)
-    	  defaultInstance = new SystemResourceHelpers();
-    	return defaultInstance;
-    }
-    
-    // ---------------------------
-    // GENERIC RESOURCE METHODS...
-    // ---------------------------
-
-    /**
-     * Method to delete a folder or file and absorb the exception
-     */
-    public void deleteResource(IResource fileOrFolder)
-    {
-    	try {
-    	  if (fileOrFolder instanceof IFile)
-    	    deleteFile((IFile)fileOrFolder);
-    	  else
-    	    deleteFolder((IFolder)fileOrFolder);
-    	} catch (Exception exc)
-    	{
-    	   logException("Exception deleting resource " + fileOrFolder.getName(), exc); //$NON-NLS-1$
-    	}
-    }
-    /**
-     * Method to rename a folder or file and absorb the exception
-     */    
-    public void renameResource(IResource fileOrFolder, String newName)
-    {
-    	//System.out.println("inside renameResource for "+fileOrFolder.getFullPath() + ". newName = " + newName);
-    	if (fileOrFolder.getName().equals(newName))
-    	{
-    		//System.out.println("same name! ");
-    		Exception exc = new Exception("Rename to same name: " + newName); //$NON-NLS-1$
-    		exc.fillInStackTrace();
-    		exc.printStackTrace();
-    		return;
-    	}
-    	try {
-    	  if (fileOrFolder instanceof IFile)
-    	    renameFile((IFile)fileOrFolder, newName);
-    	  else
-    	    renameFolder((IFolder)fileOrFolder, newName);
-    	} catch (Exception exc) 
-    	{
-    	   logException("Exception rename resource " + fileOrFolder.getName() + " to " + newName, exc); //$NON-NLS-1$ //$NON-NLS-2$
-    	}
-    }    
-    
-    /**
-     * Refresh a resource from disk. Turns off resource event listening to avoid recursion.
-     * Does a DEPTH_INFINITE refresh.
-     */
-    public void refreshResource(IResource fileOrFolder)
-    {
-        SystemResourceManager.turnOffResourceEventListening();
-        try 
-        {
-			if (!fileOrFolder.getWorkspace().isTreeLocked())
-	    	   fileOrFolder.refreshLocal(IResource.DEPTH_INFINITE, null);
-        } catch (Exception exc) {}
-        SystemResourceManager.turnOnResourceEventListening();
-    }
-    /**
-     * Refresh a resource from disk. Turns off resource event listening to avoid recursion.
-     * Does a DEPTH_ZERO refresh, so children are not refreshed. Should be more efficient than
-     * deep refresh.
-     */
-    public void refreshResourceShallow(IResource fileOrFolder)
-    {
-        SystemResourceManager.turnOffResourceEventListening();
-        try 
-        {
-			if (!fileOrFolder.getWorkspace().isTreeLocked())
-	    	   fileOrFolder.refreshLocal(IResource.DEPTH_ZERO, null);
-        } catch (Exception exc) {}
-        SystemResourceManager.turnOnResourceEventListening();
-    }
-
-    /**
-     * Test if a resource is in use, prior to attempting to rename or delete it.
-     * @return true if it is in use or read only, false if it is not.
-     */
-    public static boolean testIfResourceInUse(IResource resource)
-    {
-    	boolean inUse = resource.getResourceAttributes().isReadOnly() || !resource.isAccessible();
-    	if (!inUse) // keep testing..
-    	{
-    	    IPath localOSLocation = resource.getLocation();
-    	    if (localOSLocation != null)
-    	    {
-    	        File osFile = new File(localOSLocation.toOSString());
-    	        inUse = !osFile.canWrite();
-    	        if (!inUse && (resource instanceof IFile))
-    	        {
-    	        	try {
-    	        	  //System.out.println("testing " + osFile.getAbsolutePath());
-                      FileWriter outFileStream = new FileWriter(osFile.getAbsolutePath(),true);
-                      outFileStream.close();
-    	        	} 
-    	        	catch (IOException exc)
-    	        	{
-    	        		inUse = true;
-    	        		//System.out.println("...file is locked!");
-    	        	}
-    	        }
-    	    }   	     
-    	}
-    	//System.out.println("Testing in-use of resource " + resource.getName() + ": " + inUse);
-    	return inUse;
-    }
-    
-    // --------------------------
-    // FOLDER SPECIFIC METHODS...
-    // --------------------------
-    
-    /**
-     * Create a folder, if it does not already exist.
-     */
-    public IFolder getOrCreateFolder(IContainer parentFolder, String folderName)
-    {
-    	/*
-    	if (folderName.equals("Private"))
-    	{
-    		String msg = "Someone asked to create Private folder!";
-    		Exception e = new Exception(msg);
-    		e.fillInStackTrace();
-    		RSEUIPlugin.logError(msg, e);
-    	}
-    	*/
-		IFolder folder = getFolder(parentFolder, folderName);
-		if (!exists(folder))
-			createFolder(folder);    	
-    	return folder;
-    }
-    /**
-     * Create a folder, if it does not already exist.
-     */
-    public boolean ensureFolderExists(IFolder folder)
-    {
-    	boolean ok = true;
-		if (!exists(folder))
-		{
-		  ok = createFolder(folder);    	
-		}
-    	return ok;
-    }
-    
-    /**
-     * Get a folder whose parent is either a project or a folder
-     */
-    public IFolder getFolder(IContainer parent, String folderName)
-    {
-        SystemResourceManager.turnOffResourceEventListening();
-    	IFolder folder = null;
-    	if (parent instanceof IProject)
-        {
-    	  folder = ((IProject)parent).getFolder(folderName);    	
-        }
-    	else
-    	  folder = ((IFolder)parent).getFolder(folderName);
-        SystemResourceManager.turnOnResourceEventListening();
-    	return folder;
-    }    
-    /**
-     * Re-get a folder which has been renamed.
-     */
-    public IFolder getRenamedFolder(IFolder oldFolder, String newFolderName)
-    {
-        SystemResourceManager.turnOffResourceEventListening();
-    	IFolder folder = null;
-    	IContainer parent = oldFolder.getParent();
-    	if (parent instanceof IProject)
-    	  folder = ((IProject)parent).getFolder(newFolderName);    	
-    	else
-    	  folder = ((IFolder)parent).getFolder(newFolderName);
-        SystemResourceManager.turnOnResourceEventListening();
-    	return folder;
-    }    
-
-
-    /**
-     * Create new folder
-     */
-    public boolean createFolder(IFolder folder)
-    {
-    	boolean ok = true;    	
-	    try 
-	    {    	
-           SystemResourceManager.turnOffResourceEventListening();
-    	   folder.create(true,true,null);
-           SystemResourceManager.turnOnResourceEventListening();
-    	   /*
-    	   if (folder.getName().equals("Private"))
-    	   {		  
-    		 String msg = "Someone asked to create Private folder!";
-    		 Exception e = new Exception(msg);
-    		 e.fillInStackTrace();
-    		 RSEUIPlugin.logError(msg, e);
-    	   }
-           */
-	    } catch (CoreException e)
-	    {
-           SystemResourceManager.turnOnResourceEventListening();
-	       IStatus status = e.getStatus();
-	       if (status!=null)
-	       {
-	         int code = status.getCode();
-	         if (code != IResourceStatus.RESOURCE_EXISTS)
-	         {
-	           logException("error creating folder "+folder.getName(),e);	    	 //$NON-NLS-1$
-	           ok = false;	
-	         }
-	       }
-	    }
-    	return ok;
-    }
-    
-    /**
-     * Delete a folder
-     */    
-    public boolean deleteFolder(IFolder folder)
-                    throws Exception
-    {
-        // to ensure success, we force a refresh local action...
-        refreshResource(folder);
-        boolean existsInFileSystem = exists(folder);
-    	if (!existsInFileSystem)
-    	  return true;
-    	boolean existsInWorkSpace = folder.exists();
-    	if (existsInFileSystem && !existsInWorkSpace)
-    	{
-          logMessage("...deleteFolder error: folder "+folder.getLocation().toOSString()+" exists in file system but not in workspace! Cannot delete it."); //$NON-NLS-1$ //$NON-NLS-2$
-          existsInWorkSpace = folder.exists(); // for debugging. set breakpoint here
-    	}
-    	boolean ok = true;    	
-    	//String name = folder.getName();
-        SystemResourceManager.turnOffResourceEventListening();
-    	folder.delete(true,false,null); // force-yes, keep-history-no, no progress monitor
-        SystemResourceManager.turnOnResourceEventListening();
-    	return ok;    	
-    }
-    /**
-     * Rename a folder
-     */    
-    public boolean renameFolder(IFolder folder, String newName)
-                    throws Exception
-    {
-    	//System.out.println("inside renameFolder for "+folder.getFullPath() + ". exists? = " + folder.exists());
-    	if (!exists(folder))
-    	  return true;
-    	boolean ok = true;    	
-		IPath newPath = folder.getFullPath().removeLastSegments(1).append(newName);    	
-		//System.out.println("new path = " + newPath.toOSString());
-		try {
-           SystemResourceManager.turnOffResourceEventListening();
-           if (!newPath.toFile().exists())
-        	   folder.move(newPath, true, false, null);		
-           SystemResourceManager.turnOnResourceEventListening();
-		  //System.out.println("...path after move = " + folder.getFullPath().toOSString());  	      
-		} catch (Exception exc)
-		{
-           SystemResourceManager.turnOnResourceEventListening();
-			//exc.printStackTrace();
-			throw exc;
-		}
-    	return ok;    	
-    }    
-    /**
-     * Move a folder
-     */    
-    public boolean moveFolder(IFolder newParent, IFolder folder)
-                    throws Exception
-    {
-    	boolean ok = true;    	
-    	if (!exists(folder))
-    	  return true;    	
-        SystemResourceManager.turnOffResourceEventListening();
-    	folder.move(newParent.getFullPath().append(folder.getName()),true,false,null);
-        SystemResourceManager.turnOnResourceEventListening();
-    	return ok;    	
-    }
-
-    /**
-     * Return the path of the given folder
-     */
-    public String getFolderPath(IFolder folder)
-    {
-    	return folder.getLocation().toOSString();
-    }
-
-    /**
-     * Return a list of child folders in the given container
-     * @param projectOrFolder The parent container to search.
-     * @return an array of IFolder objects
-     */
-    public IFolder[] listFolders(IContainer projectOrFolder)
-    {
-    	if (!projectOrFolder.exists())
-    	  return (new IFolder[0]);
-
-        SystemResourceManager.turnOffResourceEventListening();           
-           
-    	Vector folders = new Vector();
-    	try
-    	{
-            IResource[] members = projectOrFolder.members();
-            if (members != null)
-              for (int idx=0; idx<members.length; idx++)
-                 if (members[idx].getType() == IResource.FOLDER)		
-                   folders.addElement(members[idx]);
-    	} catch (Exception exc)
-    	{
-    		logException("Error retrieving folder list",exc); //$NON-NLS-1$
-    	}
-
-        SystemResourceManager.turnOnResourceEventListening();           
-           
-    	return convertToFolderArray(folders);
-    }
-
-    /**
-     * Return a list of child folders in the given container,
-     *  which contain a file of the given name.
-     * @param projectOrFolder The parent container to search.
-     * @param fileName The name of the file which must exist 
-     *         in the folder in order to be included in the returned list
-     * @return an array of IFolder objects
-     */
-    public IFolder[] listFolders(IContainer projectOrFolder, String fileName)
-    {
-    	if (!exists(projectOrFolder))
-    	  return (new IFolder[0]);
-
-        SystemResourceManager.turnOffResourceEventListening();           
-           
-    	Vector folders = new Vector();
-        // to ensure we get everything, we force a refresh local action...
-        try {
-        	refreshResource(projectOrFolder);
-        } catch (Exception exc) {}
-    	try
-    	{
-    		// ok, now we can query the children...
-            IResource[] members = projectOrFolder.members();
-            if (members != null)
-            {
-              for (int idx=0; idx<members.length; idx++)
-              {
-                 if (members[idx].getType() == IResource.FOLDER)		
-                 {
-                   if (exists(getFile((IFolder)members[idx], fileName)))
-                     folders.addElement(members[idx]);
-                 }
-              }
-            }
-    	} catch (Exception exc)
-    	{
-    		logException("Error retrieving folder list",exc); //$NON-NLS-1$
-    	}
-    	
-        SystemResourceManager.turnOnResourceEventListening();           
-           
-    	return convertToFolderArray(folders);
-    }
-    
-    /**
-     * Return a list of names of folders in the given container
-     * @param folder The folder to query
-     * @param namePrefix Optional prefix all names should match. Can be null.
-     * @param nameSuffix Optional suffix all names should match. Can be null.
-     */
-    public String[] listFolders(IFolder folder, String namePrefix, String nameSuffix)
-    {
-        setListValues(false, true, namePrefix, nameSuffix);   
-        if (!folder.exists())
-        {
-            return new String[0];
-        }
-            
-    	File dirFile = new File(folder.getLocation().toOSString());
-    	//String[] folders = dirFile.listFiles(this);  
-    	File[] fileObjs = dirFile.listFiles(this);
-    	String[] folders = null;
-    	if (fileObjs != null)
-    	{
-    	  folders = new String[fileObjs.length];
-    	  for (int idx=0; idx<folders.length; idx++)
-    	     folders[idx] = fileObjs[idx].getName();
-    	}
-    	else
-    	  folders = new String[0];    	      
-    	return folders;
-    }
-
-    // ------------------------
-    // FILE SPECIFIC METHODS...
-    // ------------------------
- 
-    /**
-     * Get a file whose parent is either a project or a folder
-     */
-    public IFile getFile(IContainer parent, String fileName)
-    {
-    	IFile file = null;
-
-        SystemResourceManager.turnOffResourceEventListening();           
-           
-    	if (parent instanceof IProject)
-    	  file = ((IProject)parent).getFile(fileName);    	
-    	else
-    	  file = ((IFolder)parent).getFile(fileName);
-
-        SystemResourceManager.turnOnResourceEventListening();           
-           
-    	return file;
-    }    
-    /**
-     * Check if a file exists in the file system.
-     * For some reason, the exists() method of IFile cannot be trusted to
-     * report actual file system existence.
-     */
-    public boolean fileExists(IFile file)
-    {
-    	String fileLocation = file.getLocation().toOSString();
-    	//System.out.println("File name = "+file.getName()+" File location = " + fileLocation);
-    	return (new File(fileLocation)).exists();
-    }
-    
-    /**
-     * Delete a file
-     */    
-    public boolean deleteFile(IFile file)
-                    throws Exception
-    {
-        SystemResourceManager.turnOffResourceEventListening();
-        // to ensure success, we force a refresh local action...
-        try {
-    	   file.refreshLocal(IResource.DEPTH_INFINITE, null);
-        } catch (Exception exc) {}
-
-    	boolean ok = true;
-     	file.delete(true,false,null); // force-yes, keep-history-no, no progress monitor
-        SystemResourceManager.turnOnResourceEventListening();
-    	return ok;    	
-    }
-    /**
-     * Rename a file
-     * @param newName - the name name for the file, unqualified!
-     */    
-    public boolean renameFile(IFile file, String newName)
-                    throws Exception
-    {
-    	boolean ok = true;    	
-		IPath newPath = file.getFullPath().removeLastSegments(1).append(newName);    	
-        SystemResourceManager.turnOffResourceEventListening();
-        // to ensure success, we force a refresh local action...
-        try {
-    	   file.refreshLocal(IResource.DEPTH_INFINITE, null);
-        } catch (Exception exc) {}
-        try {
-  	      file.move(newPath, true, false, null); // path, force, keep-history, progress monitor
-        } catch (Exception exc)
-        {
-            SystemResourceManager.turnOnResourceEventListening();
-        	throw exc;
-        }
-        SystemResourceManager.turnOnResourceEventListening();
-    	return ok;    	
-    }    
-    /**
-     * Move a file
-     */    
-    public boolean moveFile(IFolder newParent, IFile file)
-                    throws Exception
-    {
-    	boolean ok = true;    	
-        SystemResourceManager.turnOffResourceEventListening();
-        // to ensure success, we force a refresh local action...
-        try {
-    	   file.refreshLocal(IResource.DEPTH_INFINITE, null);
-        } catch (Exception exc) {}
-        try
-        {
-     	  file.move(newParent.getFullPath().append(file.getName()),true,false,null);
-        } catch (Exception exc)
-        {
-            SystemResourceManager.turnOnResourceEventListening();        	
-        	throw exc;
-        }
-        SystemResourceManager.turnOnResourceEventListening();
-    	return ok;    	
-    }
-
-    /**
-     * Return the path of the given file
-     */
-    public static String getFilePath(IFile file)
-    {
-    	return file.getLocation().toOSString();
-    }
-
-
-
-    /**
-     * Return a list of child files in the given container
-     * @param projectOrFolder The parent container to search.
-     * @return an array of IFile objects
-     */
-    public IFile[] listFiles(IContainer projectOrFolder)
-    {
-    	if (!exists(projectOrFolder))
-    	  return (new IFile[0]);
-
-        SystemResourceManager.turnOffResourceEventListening();           
-           
-    	Vector files = new Vector();
-        // to ensure we get everything, we force a refresh local action...
-        try {
-        	refreshResource(projectOrFolder);
-        } catch (Exception exc) {}
-    	try
-    	{
-            IResource[] members = projectOrFolder.members();
-            if (members != null)
-              for (int idx=0; idx<members.length; idx++)
-                 if (members[idx].getType() == IResource.FILE)		
-                   files.addElement(members[idx]);
-    	} catch (Exception exc)
-    	{
-    		logException("Error retrieving file list",exc); //$NON-NLS-1$
-    	}
-
-        SystemResourceManager.turnOnResourceEventListening();           
-    	return convertToFileArray(files);
-    }
-
-    /**
-     * Return a list of names of files in the given container
-     * @param folder The folder to query
-     * @param namePrefix Optional prefix all names should match. Can be null.
-     * @param nameSuffix Optional suffix all names should match. Can be null.
-     */
-    public String[] listFiles(IFolder folder, String namePrefix, String nameSuffix)
-    {
-        setListValues(true, false, namePrefix, nameSuffix);    	
-    	File dirFile = new File(folder.getLocation().toOSString());
-    	//String[] files = dirFile.list(this);        
-    	File[] fileObjs = dirFile.listFiles(this);
-    	String[] files = null;
-    	if (fileObjs != null)
-    	{
-    	  files = new String[fileObjs.length];
-    	  for (int idx=0; idx<files.length; idx++)
-    	     files[idx] = fileObjs[idx].getName();
-    	}
-    	else
-    	  files = new String[0];
-    	return files;
-    }
-
-    // ------------------------
-    // UTILITY METHODS...
-    // ------------------------
-
-    /**
-     * Convert a vector of IFolder objects to an array of IFolder.
-     * Result is only null if input is null.
-     */
-    public IFolder[] convertToFolderArray(Vector vector)
-    {
-    	if (vector == null)
-    	  return null;
-    	IFolder[] folders = new IFolder[vector.size()];
-    	for (int idx=0; idx<vector.size(); idx++)
-    	   folders[idx] = (IFolder)vector.elementAt(idx);
-    	return folders;
-    }   
-    /**
-     * Convert a vector of IFile objects to an array of IFile.
-     * Result is only null if input is null.
-     */
-    public IFile[] convertToFileArray(Vector vector)
-    {
-    	if (vector == null)
-    	  return null;
-    	IFile[] files = new IFile[vector.size()];
-    	for (int idx=0; idx<vector.size(); idx++)
-    	   files[idx] = (IFile)vector.elementAt(idx);
-    	return files;
-    }   
-
-    /**
-     * Convert a name array to a vector. If array is null or empty, an empty vector is returned.
-     */
-    public Vector convertToVector(String[] array)
-    {
-    	Vector v = new Vector();
-    	if (array != null)
-    	  for (int idx=0; idx<array.length; idx++)
-    	     v.addElement(array[idx]);
-    	return v;
-    }   
-    /**
-     * Convert a name array to a vector. As each name is copied
-     *  to the vector, its prefix and suffix are stripped off.
-     * If array is null or empty, an empty vector is returned.
-     */
-    public Vector convertToVectorAndStrip(String[] array, String namePrefix, String nameSuffix)
-    {
-    	Vector v = new Vector();
-    	if (array != null)
-    	  for (int idx=0; idx<array.length; idx++)
-    	  {
-    	  	 String name = array[idx];
-    	  	 if (namePrefix != null)
-    	  	   name = name.substring(namePrefix.length());
-    	  	 if (nameSuffix != null)
-    	  	   name = name.substring(0,name.lastIndexOf(nameSuffix));
-    	     v.addElement(name);
-    	  }
-    	return v;
-    }   
-        
-    // ------------------------
-    // INTERNAL METHODS...
-    // ------------------------
-
-    /**
-     * Method to set variables to affect the folder content subsetting
-     */
-    public void setListValues(boolean filesOnly, boolean foldersOnly, String namePrefix, String nameSuffix)
-    {
-    	this.filesOnly = filesOnly;
-    	this.foldersOnly = foldersOnly;
-    	this.namePrefix = namePrefix;
-    	this.nameSuffix = nameSuffix;
-    }
-    
-    /**
-     * Method required by FilenameFilter interface, used by java.io.File.list()
-     */
-    //public boolean accept(File file, String name)
-    public boolean accept(File file)
-    {
-    	boolean match = true;
-    	if (filesOnly)
-    	{
-    	  if (!file.isFile())
-    	    return false;
-    	}
-    	else if (foldersOnly)
-    	{
-    	  if (!file.isDirectory())
-    	    return false;
-    	}
-    	String name = file.getName();
-    	if (nameSuffix != null)
-    	{
-    	  if (!name.endsWith(nameSuffix))
-    	    return false;    	    
-    	}
-    	if (namePrefix != null)
-    	{
-    	  if (!name.startsWith(namePrefix))
-    	    return false;
-    	}
-    	return match;
-    }
-        
-    public void logMessage(String msg)
-    {
-    	RSECorePlugin.getDefault().getLogger().logWarning(msg);
-    }
-    public void logException(String msg, Exception exc)
-    {
-    	RSECorePlugin.getDefault().getLogger().logError(msg, exc);
-    }            
-
-
-    /**
-     * For some reason the exists() method on IResource is fundamentally not reliable.
-     * Because of this, we resort to the looking ourselves at the file system.
-     */
-    public boolean exists(IResource resource)
-    {       	
-    	// DKM - doing a refresh while in a wizard causes stack overflow
-    	//  defect #57739
-    	//     I think this is an unnecessary step since in most cases the resource will
-    	//     already exist. 
-    	if (resource.exists())
-    	{
-    		return true;
-    	}
-    	
-    	// it appears the serious reliability problems are due to out of synch problems.
-    	// so, I have decided to do a refresh and see if that is cheaper than creating
-    	// hundreds of these java.io.File objects for every touch of every resource... phil. 10/21/2002. 	
-		refreshResourceShallow(resource);
-		return resource.exists();
-		/*
-    	IPath localOSLocation = resource.getLocation();
-    	if (localOSLocation == null)
-    	  return true; // what else?    	
-    	File osFile = new File(localOSLocation.toOSString());
-    	return osFile.exists();
-    	*/
-    }    
-    
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceManager.java
deleted file mode 100644
index dafce4123..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemResourceManager.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David McKnight (IBM) - [177155] Move from rse.ui/systems/org.eclipse.rse.core
- * Martin Oberhuber (Wind River) - Re-add missing methods for user actions
- * David Dykstal (IBM) - [189858] delayed the creation of the remote systems project
- *                                removed unneeded first time logic and flags
- *                                renamed createRemoteSystemsProjectInternal to ensureRemoteSystemsProject
- *                                made ensureRemoteSystemsProject private instead of protected
- * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands
- *                                API to the user actions plugin
- * David Dykstal (IBM) - [191130] remove getRemoteSystemsProject() and getProfileFolder()
- *    as part of the work to removed the exception printed at startup.
- * Martin Oberhuber (Wind River) - [224671] Fix non-API leakage of ISystemResourceConstants
- ********************************************************************************/
-
-package org.eclipse.rse.core;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemHostPool;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.internal.core.RemoteSystemsProject;
-import org.eclipse.rse.internal.core.SystemResourceConstants;
-
-
-/**
- * Static methods that manage the workbench resource tree for the remote systems
- * project. All code in the framework uses this to access the file system for
- * save/restore purposes. By limiting all access to one place, we simply changes
- * should we decide to change the underlying file system map.
- * <p>
- * <b>Assumptions</b>
- * <ul>
- * <li>Each SystemConnectionPool object manages the connections for a given
- * system profile
- * <li>Each SystemFilterPoolManager object manages the filter pools for a given
- * subsystem factory, for a given system profile!
- * <li>Each SystemFilterPool object is an arbitrary named collection of filters
- * all stored in one folder on disk with the same name as the pool.
- * </ul>
- * <p>
- * 
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class SystemResourceManager
-{
-
-	private static IProject remoteSystemsProject = null;
-	private static IProject remoteSystemsTempFilesProject = null;
-	private static SystemResourceHelpers helpers = null;
-
-	private static ISystemResourceListener _listener = null;
-
-	/**
-	 * Turn off event listening. Please call this before do anything that modifies resources and
-	 * turn it on again after.
-	 */
-	public static void turnOffResourceEventListening()
-	{
-		if (_listener != null)
-			_listener.turnOffResourceEventListening();
-	}
-
-	/**
-	 * Turn off event listening. Please call this after modifying resources.
-	 */
-	public static void turnOnResourceEventListening()
-	{
-		if (_listener != null)
-			_listener.turnOnResourceEventListening();
-	}
-	/**
-	 * Ensure event listening is on. Called at start of team synch action to be safe.
-	 */
-	public static void ensureOnResourceEventListening()
-	{
-		if (_listener != null)
-			_listener.ensureOnResourceEventListening();
-	}
-
-	/**
-	 * Start event listening. Requests to turn on and off are ignored until this is called,
-	 *  which is at the appropriate point in the startup sequence.
-	 */
-	public static void startResourceEventListening(ISystemResourceListener listener)
-	{
-		_listener = listener;
-		listener.turnOnResourceEventListening();
-
-
-		IWorkspace ws = remoteSystemsProject.getWorkspace();
-		int eventMask = IResourceChangeEvent.POST_CHANGE;
-
-		// add listener for global events ;
-		ws.addResourceChangeListener(listener, eventMask);
-	}
-	/**
-	 * End event listening. Requests to turn on and off are ignored after this is called,
-	 *  which is at the appropriate point in the shutdown sequence.
-	 */
-	public static void endResourceEventListening()
-	{
-		if (_listener != null)
-		{
-			IWorkspace ws = remoteSystemsProject.getWorkspace();
-			ws.removeResourceChangeListener(_listener);
-			_listener = null;
-		}
-	}
-
-	/**
-	 * Register a listener for resource change events on objects in our remote system project.
-	 * No attempt is made to filter the events, they are simply passed on and the listener can
-	 * decide if the event applies to them or not.
-	 * <p>
-	 * However, the event will only be fired if a change is made to that resource outside of the
-	 * normal activities of the Remote Systems Framework, and only for resources within the
-	 * Remote Systems Connection project.
-	 */
-	public static void addResourceChangeListener(IResourceChangeListener l)
-	{
-		if (_listener != null)
-			_listener.addResourceChangeListener(l);
-	}
-	/**
-	 * Remove a listener for resource change events on an object in our remote system project.
-	 */
-	public static void removeResourceChangeListener(IResourceChangeListener l)
-	{
-		if (_listener != null)
-			_listener.removeResourceChangeListener(l);
-	}
-
-	/**
-	 * Get the default remote systems project.
-	 * If found but closed, this will open the project.
-	 * @param force if true force the creation of the project if not found.
-	 * In any case, returns handle to the project.
-	 * @return IProject handle of the project. Clients should use
-	 * exists() or isAccessible() to test existence.
-	 */
-	public static IProject getRemoteSystemsProject(boolean force) {
-		if (remoteSystemsProject == null) {
-			remoteSystemsProject = ResourcesPlugin.getWorkspace().getRoot().getProject(SystemResourceConstants.RESOURCE_PROJECT_NAME);
-		}
-		if ((!remoteSystemsProject.exists() && force) || (remoteSystemsProject.exists() && !remoteSystemsProject.isOpen())) {
-			ensureRemoteSystemsProject(remoteSystemsProject);
-		}
-		return remoteSystemsProject;
-	}
-
-	/**
-	 * Get the default remote systems temp files project.
-	 * @return IProject handle of the project. Use exists() to test existence.
-	 */
-	public static IProject getRemoteSystemsTempFilesProject()
-	{
-		if (remoteSystemsTempFilesProject == null)
-		{
-			remoteSystemsTempFilesProject = ResourcesPlugin.getWorkspace().getRoot().getProject(SystemResourceConstants.RESOURCE_TEMPFILES_PROJECT_NAME);
-		}
-		return remoteSystemsTempFilesProject;
-	}
-	/**
-	 * Create a remote systems project, plus the core subfolders required.
-	 * @param proj the handle for the remote systems project
-	 * @return the IProject handle of the project (the argument)
-	 */
-	private static IProject ensureRemoteSystemsProject(IProject proj)
-	{
-		// Check first for the project to be closed. If yes, try to open it and if this fails,
-		// try to delete if first before failing here. The case is that the user removed the
-		// directory in the workspace and we must be able to recover from it.
-		// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=172437.
-		if (!proj.isOpen()) {
-			try {
-				proj.open(null);
-			} catch (Exception e) {
-				try {
-					proj.delete(false, true, null);
-					RSECorePlugin.getDefault().getLogger().logWarning("Removed stale remote systems project reference. Re-creating remote system project to recover."); //$NON-NLS-1$
-				} catch (CoreException exc) {
-					// If the delete fails, the original opening error will be passed to the error log.
-					RSECorePlugin.getDefault().getLogger().logError("error opening remote systems project", e); //$NON-NLS-1$
-				}
-			}
-		}
-		if (!proj.exists()) {
-			try {
-				proj.create(null);
-				proj.open(null);
-				IProjectDescription description = proj.getDescription();
-				String newNatures[] = { RemoteSystemsProject.ID };
-				description.setNatureIds(newNatures);
-				proj.setDescription(description, null);
-			} catch (Exception e) {
-				RSECorePlugin.getDefault().getLogger().logError("error creating remote systems project", e); //$NON-NLS-1$
-			}
-		}
-		return proj;
-	}
-
-	// -------------------
-	// FOLDER ACTIONS...
-	// -------------------
-
-	/**
-	 * Rename a folder
-	 */
-	public static void renameFolder(IFolder folder, String newName)
-	{
-		getResourceHelpers().renameResource(folder, newName);
-	}
-	/**
-	 * Delete a folder
-	 */
-	public static void deleteFolder(IFolder folder)
-	{
-		getResourceHelpers().deleteResource(folder);
-	}
-
-	// -------------------
-	// FILE ACTIONS...
-	// -------------------
-
-	/**
-	 * Rename a file
-	 */
-	public static void renameFile(IFolder folder, String oldName, String newName)
-	{
-		getResourceHelpers().renameResource(
-				getResourceHelpers().getFile(folder,oldName), newName);
-	}
-	/**
-	 * Delete a file
-	 */
-	public static void deleteFile(IFolder folder, String fileName)
-	{
-		getResourceHelpers().deleteResource(
-				getResourceHelpers().getFile(folder, fileName));
-	}
-
-
-	// -------------------
-	// GENERIC HELPERS...
-	// -------------------
-
-	/**
-	 * Map a connection pool name to a profile name.
-	 * Current algorith is that pool name equals profile name, but we use
-	 *  this method to allow flexibility in the future.
-	 */
-	public static String getProfileName(ISystemHostPool pool)
-	{
-		return pool.getName();
-	}
-
-	/**
-	 * Map a filter pool manager name to a profile name
-	 * Current algorith is that manager name equals profile name, but we use
-	 *  this method to allow flexibility in the future.
-	 */
-	public static String getProfileName(ISystemFilterPoolManager mgr)
-	{
-		return mgr.getName();
-	}
-
-	/**
-	 * Map a filter pool name to a folder name
-	 * Current algorith is that pool name equals folder name, but we use
-	 *  this method to allow flexibility in the future.
-	 */
-	public static String getFolderName(ISystemFilterPool pool)
-	{
-		return pool.getName();
-	}
-
-	/**
-	 * Map a system connection object to a folder name
-	 */
-	public static String getFolderName(IHost conn)
-	{
-		return conn.getAliasName();
-	}
-
-	/**
-	 * Map a subsystem factory object to a folder name
-	 */
-	public static String getFolderName(ISubSystemConfiguration ssFactory)
-	{
-		return ssFactory.getId(); // Should we use name instead?? Can we assume the name is unique?
-	}
-
-	/**
-	 * Given any folder, return its path as a string.
-	 */
-	public static String getFolderPath(IFolder folder)
-	{
-		return getResourceHelpers().getFolderPath(folder);
-	}
-
-	/**
-	 * Given any folder, return its path as a string, and an ending '\'
-	 */
-	public static String getFolderPathWithTerminator(IFolder folder)
-	{
-		return addPathTerminator(getResourceHelpers().getFolderPath(folder));
-	}
-
-
-	/**
-	 * Return singleton of resource helpers object
-	 */
-	protected static SystemResourceHelpers getResourceHelpers()
-	{
-		if (helpers == null)
-		{
-			helpers = SystemResourceHelpers.getResourceHelpers();
-			//helpers.setLogFile(RSEUIPlugin.getDefault().getLogFile());
-		}
-		return helpers;
-	}
-
-	/**
-	 * Ensure given path ends with path separator.
-	 */
-	public static String addPathTerminator(String path)
-	{
-		if (!path.endsWith(File.separator))
-			path = path + File.separatorChar;
-		//else
-		//  path = path;
-		return path;
-	}
-
-	/**
-	 * Test if a resource is in use, prior to attempting to rename or delete it.
-	 * @return true if it is in use or read only, false if it is not.
-	 */
-	public static boolean testIfResourceInUse(IResource resource)
-	{
-		return SystemResourceHelpers.testIfResourceInUse(resource);
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemTypeMatcher.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemTypeMatcher.java
deleted file mode 100644
index cce2e2fc8..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/SystemTypeMatcher.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- * Uwe Stieber (Wind River) - initial API and implementation.
- *******************************************************************************/
-package org.eclipse.rse.core;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * Shared system type id list parser and matcher. Parses a given
- * list of system type id's, separated by semicolon and possibly
- * containing the wildcards '*' and '?. 
- */
-public final class SystemTypeMatcher  {
-	private final class SystemTypeIdPattern {
-		private final Pattern pattern;
-		
-		/**
-		 * Constructor.
-		 */
-		public SystemTypeIdPattern(Pattern pattern) {
-			assert pattern != null;
-			this.pattern = pattern;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.rse.core.internal.subsystems.SubSystemConfigurationProxy.ISystemTypePattern#matches(org.eclipse.rse.core.IRSESystemType)
-		 */
-		public boolean matches(IRSESystemType systemType) {
-			assert systemType != null;
-			return pattern.matcher(systemType.getId()).matches();
-		}
-	}
-	
-	// List of patterns to match. The order is preserved.
-	private final List patterns = new LinkedList();
-	private boolean matchAllTypes = false;
-	
-	/**
-	 * Constructor. 
-	 * 
-	 * @param declaredSystemTypeIds  The list of declared system type ids. Might be <code>null</code>.
-	 */
-	public SystemTypeMatcher(String declaredSystemTypeIds) {
-		// Compile the list of patterns out of given lists of declared system types
-		if (declaredSystemTypeIds != null) {
-			String[] ids = declaredSystemTypeIds.split(";"); //$NON-NLS-1$
-			if (ids != null && ids.length > 0) {
-				for (int i = 0; i < ids.length; i++) {
-					String id = ids[i].trim();
-					if (id.equals("*")) { //$NON-NLS-1$
-						matchAllTypes = true;
-						patterns.clear();
-						return;
-					} else if(id.length()>0) {
-						SystemTypeIdPattern pattern = new SystemTypeIdPattern(Pattern.compile(makeRegex(id)));
-						patterns.add(pattern);
-					}
-				}
-			}
-		}
-	}
-	
-	private String makeRegex(String pattern) {
-		assert pattern != null;
-		String translated = pattern;
-		if (translated.indexOf('.') != -1) translated = translated.replaceAll("\\.", "\\."); //$NON-NLS-1$ //$NON-NLS-2$
-		if (translated.indexOf('*') != -1) translated = translated.replaceAll("\\*", ".*"); //$NON-NLS-1$ //$NON-NLS-2$
-		if (translated.indexOf('?') != -1) translated = translated.replaceAll("\\?", "."); //$NON-NLS-1$ //$NON-NLS-2$
-		return translated;
-	}
-	
-	/**
-	 * @return true if this matcher supports all system types.
-	 */
-	public boolean supportsAllSystemTypes() {
-		return matchAllTypes;
-	}
-	
-	/**
-	 * Checks if the specified system type is matched by this pattern.
-	 */
-	public boolean matches(IRSESystemType systemType) {
-		assert systemType != null;
-		if (matchAllTypes) return true;
-		Iterator iterator = patterns.iterator();
-		while (iterator.hasNext()) {
-			SystemTypeIdPattern matcher = (SystemTypeIdPattern)iterator.next();
-			if (matcher.matches(systemType)) return true;
-		}
-		return false;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/ISystemKeystoreProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/ISystemKeystoreProvider.java
deleted file mode 100644
index 269121780..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/ISystemKeystoreProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
- ********************************************************************************/
-
-package org.eclipse.rse.core.comm;
-
-import java.util.List;
-
-/*
- * Interface for the keystoreProviders extension point.
- * Implementors must provide a keystore and it's password.
- */
-public interface ISystemKeystoreProvider
-{
-	public String getKeyStorePassword();
-	public String getKeyStorePath();
-	public boolean importCertificates(List certificates, String systemName);
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/SystemKeystoreProviderManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/SystemKeystoreProviderManager.java
deleted file mode 100644
index f61ad8f89..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/comm/SystemKeystoreProviderManager.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186525] Move keystoreProviders to core
- * Martin Oberhuber (Wind River) - [181939] Deferred class loading for keystoreProviders
- ********************************************************************************/
-
-package org.eclipse.rse.core.comm;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * A Registry of keystore providers, with the ability to instantiate
- * providers lazily when needed.
- */
-public class SystemKeystoreProviderManager
-{
-	private static SystemKeystoreProviderManager _instance = new SystemKeystoreProviderManager();
-	
-	private List _extensions;
-	
-	private static class ExtensionInfo {
-		public Bundle bundle;
-		public String className;
-		public ExtensionInfo(Bundle bundle, String className) {
-			this.bundle = bundle;
-			this.className = className;
-		}
-	}
-	
-	private SystemKeystoreProviderManager()
-	{		
-		_extensions= new ArrayList();
-	}
-	
-	/**
-	 * Return the SystemKeystoreProviderManager Instance.
-	 * @return the singleton instance.
-	 */
-	public static SystemKeystoreProviderManager getInstance()
-	{
-		return _instance;
-	}
-	
-	/**
-	 * Register a keystore provider.
-	 * @param ext keystore provider to register.
-	 */
-	public void registerKeystoreProvider(ISystemKeystoreProvider ext)
-	{
-		_extensions.add(ext);
-	}
-
-	/**
-	 * Register a keystore provider for deferred (lazy) loading.
-	 * 
-	 * @param bundle the bundle that declares the extension. The bundle
-	 *    must be installed and will be activated lazily when trying
-	 *    to load the given class name.
-	 * @param className fully qualified classname of the keystore provider
-	 *     declared in the given bundle.
-	 */
-	public void registerKeystoreProvider(Bundle bundle, String className)
-	{
-		_extensions.add(new ExtensionInfo(bundle, className));
-	}
-	
-	public boolean hasProvider()
-	{
-		return !_extensions.isEmpty();
-	}
-
-	/**
-	 * Return the keystore provider at the given index in the registry,
-	 * or <code>null</code> if there is no provider at the given index
-	 * or it cannot be loaded.
-	 * @return An ISystemKeystoreProvider instance, or <code>null</code>
-	 *    if no provider is found at the given index.
-	 */
-	public ISystemKeystoreProvider getProviderAt(int idx)
-	{
-		if (idx >= 0 && idx < _extensions.size()) {
-			Object o = _extensions.get(idx);
-			if (o instanceof ISystemKeystoreProvider) {
-				return (ISystemKeystoreProvider)o;
-			} else if (o instanceof ExtensionInfo) {
-				ExtensionInfo info = (ExtensionInfo)o;
-				try {
-				    Class keystoreProvider = info.bundle.loadClass(info.className);
-				    ISystemKeystoreProvider extension = (ISystemKeystoreProvider)keystoreProvider.getConstructors()[0].newInstance(null);
-				    _extensions.set(idx, extension);
-				    return extension;
-				} catch(Exception e) {
-					RSECorePlugin.getDefault().getLog().log(
-						new Status(IStatus.ERROR, info.bundle.getSymbolicName(), -1, e.getMessage(), e));
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Return the default keystore provider.
-	 * The default provider is the one which was added last by the
-	 * extension registry, and loads properly.
-	 * @return An ISystemKeystoreProvider instance, or <code>null</code>
-	 *    if no provider is found at the given index.
-	 */
-	public ISystemKeystoreProvider getDefaultProvider()
-	{
-		int idx = _extensions.size()-1;
-		while (idx>=0) {
-			ISystemKeystoreProvider provider = getProviderAt(idx);
-			if (provider!=null) {
-				return provider;
-			}
-			_extensions.remove(idx);
-			idx--;
-		}
-		return null;
-	}
-	
-	/**
-	 * Return an array of all registered keystore providers.
-	 * The default provider is the one which was added last by the
-	 * extension registry, and loads properly.
-	 * @return An array of all registered keystore providers 
-	 *    that load properly.
-	 */
-	public ISystemKeystoreProvider[] getProviders()
-	{
-		List providers = new ArrayList();
-		for (int i = _extensions.size()-1; i>=0; i--) {
-			ISystemKeystoreProvider provider = getProviderAt(i);
-			if (provider!=null) {
-				providers.add(0, provider);
-			} else {
-				_extensions.remove(i);
-			}
-		}
-		ISystemKeystoreProvider[] result = (ISystemKeystoreProvider[])providers.toArray(new ISystemKeystoreProvider[providers.size()]);
-		return result;
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvent.java
deleted file mode 100644
index 289703060..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-/**
- * A change event passed to you when listening for RSE model changes.
- * Note these are post-events, sent after the fact.
- */
-public interface ISystemModelChangeEvent {
-	/**
-	 * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemModelChangeEvents#SYSTEM_RESOURCE_ADDED}.
-	 * @see org.eclipse.rse.core.events.ISystemModelChangeEvents
-	 */
-	public int getEventType();
-
-	/**
-	 * Get the resource type, such as {@link org.eclipse.rse.core.events.ISystemModelChangeEvents#SYSTEM_RESOURCETYPE_CONNECTION}.
-	 * @see org.eclipse.rse.core.events.ISystemModelChangeEvents
-	 */
-	public int getResourceType();
-
-	/**
-	 * Get the resource that this event applies to
-	 */
-	public Object getResource();
-
-	/**
-	 * Get the old name of the resource, in the event of a resource rename. Null for other event types.
-	 */
-	public String getOldName();
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvents.java
deleted file mode 100644
index 0b85781e5..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeEvents.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * David Dykstal (IBM) - [186589] Move User Actions events to the user actions plugin
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-/**
- * The event IDs sent when local resources in the RSE model change. You should
- * monitor for these events in your view if you display any of the resource
- * types listed here.
- * <p>
- * To monitor, implement interface
- * {@link org.eclipse.rse.core.events.ISystemModelChangeListener} and call
- * {@link org.eclipse.rse.core.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)}
- * and in your dispose method, call
- * {@link org.eclipse.rse.core.model.ISystemRegistry#removeSystemModelChangeListener(ISystemModelChangeListener)}.
- * <p>
- * If you are interesting in firing model change events, see
- * {@link org.eclipse.rse.core.model.ISystemRegistry#fireModelChangeEvent(int, int, Object, String)}
- * . These events will typically be signaled in an implementation of
- * ISystemRegistry.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemModelChangeEvents {
-
-	/**
-	 * Event Type: a resource was added
-	 */
-	public static final int SYSTEM_RESOURCE_ADDED = 1;
-
-	/**
-	 * Event Type: a resource was removed
-	 */
-	public static final int SYSTEM_RESOURCE_REMOVED = 2;
-
-	/**
-	 * Event Type: a resource was changed
-	 */
-	public static final int SYSTEM_RESOURCE_CHANGED = 4;
-
-	/**
-	 * Event Type: a resource was renamed
-	 */
-	public static final int SYSTEM_RESOURCE_RENAMED = 8;
-	/**
-	 * Event Type: a resource was reordered relative to its siblings
-	 */
-	public static final int SYSTEM_RESOURCE_REORDERED = 16;
-
-	/**
-	 * Event Type: all resource were reloaded from the workspace: you need to refresh your viewer!
-	 * This is fired after the user selects the Reload RSE action in the Team view, after recieving files from the repository.
-	 */
-	public static final int SYSTEM_RESOURCE_ALL_RELOADED = 128;
-
-	/**
-	 * Resource Type: profile
-	 */
-	public static final int SYSTEM_RESOURCETYPE_PROFILE = 1;
-	/**
-	 * Resource Type: connection
-	 */
-	public static final int SYSTEM_RESOURCETYPE_CONNECTION = 2;
-	/**
-	 * Resource Type: subsystem
-	 */
-	public static final int SYSTEM_RESOURCETYPE_SUBSYSTEM = 4;
-	/**
-	 * Resource Type: filter pool
-	 */
-	public static final int SYSTEM_RESOURCETYPE_FILTERPOOL = 8;
-	/**
-	 * Resource Type: filter pool reference. These are what subsystems contain... references to filter pools.
-	 */
-	public static final int SYSTEM_RESOURCETYPE_FILTERPOOLREF = 16;
-	/**
-	 * Resource Type: filter
-	 */
-	public static final int SYSTEM_RESOURCETYPE_FILTER = 32;
-	//	/**
-	//	 * Resource Type: user action
-	//	 */
-	//	public static final int SYSTEM_RESOURCETYPE_USERACTION = 128;
-	//	/**
-	//	 * Resource Type: named type, which are used in user actions
-	//	 */
-	//	public static final int SYSTEM_RESOURCETYPE_NAMEDTYPE = 256;
-	//	/**
-	//	 * Resource Type: compile command
-	//	 */
-	//	public static final int SYSTEM_RESOURCETYPE_COMPILECMD = 512;
-	/**
-	 * Resource Type: ALL. Used with SYSTEM_RESOURCE_ALL_RELOADED
-	 */
-	public static final int SYSTEM_RESOURCETYPE_ALL = 9999;
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeListener.java
deleted file mode 100644
index f998c4658..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemModelChangeListener.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-/**
- * Interface that listeners interesting in changes to local resources in the RSE model
- *  implement, and subsequently register their interest, via SystemRegistry.
- * <p>
- * If you list any of the resource types defined in {@link org.eclipse.rse.core.events.ISystemModelChangeEvents}
- *  you should monitor by implementing this interface, and registering with the 
- *  system registry via {@link org.eclipse.rse.core.model.ISystemRegistry#addSystemModelChangeListener(ISystemModelChangeListener)}.
- *  In your view's dispose method, you must also de-register by calling
- *  {@link org.eclipse.rse.core.model.ISystemRegistry#removeSystemModelChangeListener(ISystemModelChangeListener)}.
- * <p>
- * If you are interesting in firing model change events, see 
- * {@link org.eclipse.rse.core.model.ISystemRegistry#fireModelChangeEvent(int, int, Object, String)}.
- */
-public interface ISystemModelChangeListener {
-
-	/**
-	 * This is the method in your class that will be called when a resource in the 
-	 *  RSE model changes. You will be called after the resource is changed.
-	 * @see ISystemModelChangeEvent
-	 */
-	public void systemModelResourceChanged(ISystemModelChangeEvent event);
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvent.java
deleted file mode 100644
index f3bf66746..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-/**
- * Interface of event sent when a remote system preference changes.
- * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents
- */
-public interface ISystemPreferenceChangeEvent {
-
-	/**
-	 * Returns the type of the event.
-	 * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents
-	 * @return a type that is one of the constants in ISystemPreferenceChangeEvents.
-	 */
-	public int getType();
-
-	/**
-	 * Set the type of the event.
-	 * @see org.eclipse.rse.core.events.ISystemPreferenceChangeEvents
-	 * @param type the type of the event.
-	 */
-	public void setType(int type);
-
-	/**
-	 * Get the old value of the Preference.
-	 * For boolean will be a Boolean object.
-	 * @return the old value of the Preference.
-	 */
-	public Object getOldValue();
-
-	/**
-	 * Get the new value of the Preference.
-	 * For boolean will be a Boolean object.
-	 * @return the new value of the Preference.
-	 */
-	public Object getNewValue();
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvents.java
deleted file mode 100644
index 4962210a7..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeEvents.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-/**
- * Interface of event ID constants for preferences changed
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemPreferenceChangeEvents {
-	/**
-	 * The Show Filter Pools preference has changed
-	 */
-	public static final int EVENT_SHOWFILTERPOOLS = 5;
-	/**
-	 * The Show Filter String preference has changed
-	 */
-	public static final int EVENT_SHOWFILTERSTRINGS = 10;
-	/**
-	 * The Qualify Connection Names preference has changed
-	 */
-	public static final int EVENT_QUALIFYCONNECTIONNAMES = 15;
-	/**
-	 * The Restore State preference has changed
-	 */
-	public static final int EVENT_RESTORESTATE = 20;
-
-	/**
-	 * A connection type has been enabled or disabled
-	 */
-	public static final int EVENT_ENABLED_CONNECTIONS_CHANGED = 25;
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeListener.java
deleted file mode 100644
index e2fe428c8..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemPreferenceChangeListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-import java.util.EventListener;
-
-/**
- * Interface that listeners interesting in changes to remote
- * system preferences can implement and subsequently register 
- * their interest in with the ISystemRegistry.
- */
-public interface ISystemPreferenceChangeListener extends EventListener {
-	
-	/**
-	 * This method will be called when a Preference changes.
-	 * TODO document on which thread the event will be sent.
-	 * @see ISystemPreferenceChangeEvent
-	 * @param event the event being sent.
-	 */
-	public void systemPreferenceChanged(ISystemPreferenceChangeEvent event);
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvent.java
deleted file mode 100644
index e96012778..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvent.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * David McKnight   (IBM)        - [224313] [api] Create RSE Events for MOVE and COPY holding both source and destination fields
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-
-/**
- * A change event passed to you when listening for remote resource changes.
- * Note these are post-events, sent after the fact.
- */
-public interface ISystemRemoteChangeEvent
-{
-	/**
-	 * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents#SYSTEM_REMOTE_RESOURCE_CREATED}.
-	 * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvents
-	 * @return the event type.
-	 */
-	public int getEventType();
-
-	/**
-	 * Get the resource that this event applies to.
-	 * It must either be the binary object of the resource, or the absolute name of the resource,
-	 * or a List of absolute names of the resources
-	 * @return the resource that this event applies to.
-	 */
-	public Object getResource();
-
-	/**
-	 * Get the parent remote object for the affected remote object. This is not always known,
-	 * but when it is (ie, non null) then it can be used to refresh all expanded occurrences of that parent
-	 * @return the parent remote object of the affected resource,
-	 *     or <code>null</code> if not applicable.
-	 */
-	public Object getResourceParent();
-
-	/**
-	 * Get the old name(s) of the resource(s), in the event of a resource
-	 * rename, move or copy. Null for other event types.
-	 * 
-	 * @return the old names of the resources in case of a rename event, or
-	 *         <code>null</code> if not applicable.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public String[] getOldNames();
-
-	/**
-	 * Get the subsystem in which this resource resides.
-	 * This allows the search for impacts to be limited to subsystems
-	 * of the same parent factory, and to connections with the same
-	 * hostname as the subsystem's connection.
-	 * @return the subsystem in which this resource resides.
-	 */
-	public ISubSystem getSubSystem();
-
-	/**
-	 * Returns the operation of this event if it's not implied by the event
-	 * itself.
-	 * 
-	 * @see ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_COPY
-	 * @see ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_MOVE
-	 * 
-	 * @return the operation that triggered this event
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public String getOperation();
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvents.java
deleted file mode 100644
index 28831a311..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeEvents.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * David McKnight (IBM) - [207100] Events for after a resource is downloaded and uploaded
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-/**
- * The event IDs sent when remote resources in the model change These IDs are
- * used when creating ISystemRemoteChangeEvent objects.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemRemoteChangeEvents
-{
-	/**
-	 * Event Type: a remote resource was added
-	 *
-	 * The event stores the following event parameters:
-	 * <ul>
-	 *  <li>resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter,
-	 *    or a List of absolute names each of which would be given by calling getAbsoluteName on it's remote adapter
-	 *  <li>resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurrences of that parent.
-	 *  <li>subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be
-	 *   limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection.
-	 *  <li>oldName - on a rename operation, this is the absolute name of the resource prior to the rename
-	 *  <li>originatingViewer - optional. If set, this gives the viewer a clue that it should select the affected resource after refreshing its parent.
-	 *    This saves sending a separate event to reveal and select the new created resource on a create event, for example.
-	 * </ul>
-	 */
-	public static final int SYSTEM_REMOTE_RESOURCE_CREATED = 1;
-
-	/**
-	 * Event Type: a remote resource was removed
-	 *
-	 *  The event stores the following event parameters:
-	 * <ul>
-	 *  <li>resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter,
-	 *    or a List of absolute names each of which would be given by calling getAbsoluteName on it's remote adapter
-	 *  <li>resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurrences of that parent.
-	 *  <li>subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be
-	 *   limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection.
-	 *  <li>oldName - on a rename operation, this is the absolute name of the resource prior to the rename
-	 *  <li>originatingViewer - optional. If set, this gives the viewer a clue that it should select the affected resource after refreshing its parent.
-	 *    This saves sending a separate event to reveal and select the new created resource on a create event, for example.
-	 * </ul>
-	 */
-	public static final int SYSTEM_REMOTE_RESOURCE_DELETED = 2;
-
-	/**
-	 * Event Type: a remote resource was changed
-	 *
-	 *  The event stores the following event parameters:
-	 * <ul>
-	 *  <li>resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter,
-	 *  or a List of absolute names each of which would be given by calling getAbsoluteName on it's remote adapter
-	 *  <li>resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurrences of that parent.
-	 *  <li>subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be
-	 *   limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection.
-	 *  <li>oldName - on a rename operation, this is the absolute name of the resource prior to the rename
-	 *  <li>originatingViewer - optional. If set, this gives the viewer a clue that it should select the affected resource after refreshing its parent.
-	 *    This saves sending a separate event to reveal and select the new created resource on a create event, for example.
-	 * </ul>
-	 */
-	public static final int SYSTEM_REMOTE_RESOURCE_CHANGED = 4;
-
-	/**
-	 * Event Type: a remote resource was renamed
-	 *
-	 * The event stores the following event parameters:
-	 * <ul>
-	 *  <li>resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter,
-	 *  or a List of absolute names each of which would be given by calling getAbsoluteName on it's remote adapter
-	 *  <li>resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurrences of that parent.
-	 *  <li>subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be
-	 *   limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection.
-	 *  <li>oldName - on a rename operation, this is the absolute name of the resource prior to the rename
-	 *  <li>originatingViewer - optional. If set, this gives the viewer a clue that it should select the affected resource after refreshing its parent.
-	 *    This saves sending a separate event to reveal and select the new created resource on a create event, for example.
-	 * </ul>
-	 */
-	public static final int SYSTEM_REMOTE_RESOURCE_RENAMED = 8;
-
-
-	/**
-	 * Event Type: a remote resource was uploaded
-	 *
-	 * The event stores the following event parameters:
-	 * <ul>
-	 * <li>resource - the remote resource object, or absolute name of the
-	 * resource as would be given by calling getAbsoluteName on its remote
-	 * adapter
-	 * <li>resourceParent - the remote resource's parent object, or absolute
-	 * name, if that is known. If it is non-null, this will aid in refreshing
-	 * occurrences of that parent.
-	 * <li>subsystem - the subsystem which contains this remote resource. This
-	 * allows the search for impacts to be limited to subsystems of the same
-	 * parent factory, and to connections with the same hostname as the
-	 * subsystem's connection.
-	 * </ul>
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final int SYSTEM_REMOTE_RESOURCE_UPLOADED = 20;
-
-	/**
-	 * Event Type: a remote resource was downloaded
-	 *
-	 * The event stores the following event parameters:
-	 * <ul>
-	 * <li>resource - the remote resource object, or absolute name of the
-	 * resource as would be given by calling getAbsoluteName on its remote
-	 * adapter
-	 * <li>resourceParent - the remote resource's parent object, or absolute
-	 * name, if that is known. If it is non-null, this will aid in refreshing
-	 * occurrences of that parent.
-	 * <li>subsystem - the subsystem which contains this remote resource. This
-	 * allows the search for impacts to be limited to subsystems of the same
-	 * parent factory, and to connections with the same hostname as the
-	 * subsystem's connection.
-	 * </ul>
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final int SYSTEM_REMOTE_RESOURCE_DOWNLOADED = 24;
-
-
-	/**
-	 * Indicates that the event is for a delete operation
-	 *
-	 *  @since org.eclipse.rse.core 3.0
-	 */
-	public static final String SYSTEM_REMOTE_OPERATION_DELETE = "DELETE"; //$NON-NLS-1$
-
-	/**
-	 * Indicates that the event is for a rename operation
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final String SYSTEM_REMOTE_OPERATION_RENAME = "RENAME"; //$NON-NLS-1$
-
-	/**
-	 * Indicates that the event is for a create operation
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final String SYSTEM_REMOTE_OPERATION_CREATE = "CREATE"; //$NON-NLS-1$
-
-	/**
-	 * Indicates that the event is for a move operation
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final String SYSTEM_REMOTE_OPERATION_MOVE   = "MOVE"; //$NON-NLS-1$
-
-	/**
-	 * Indicates that the event is for a copy operation
-	 *
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public static final String SYSTEM_REMOTE_OPERATION_COPY   = "COPY"; //$NON-NLS-1$
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeListener.java
deleted file mode 100644
index e96e721e6..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemRemoteChangeListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-/**
- * Interface that listeners interesting in changes to remote resources
- * implement, and subsequently register their interest, in via SystemRegistry.
- */
-public interface ISystemRemoteChangeListener 
-{
-
-	/**
-	 * This method will be called when a remote resource changes.
-	 * You will be called after the resource is changed.
-	 * TODO document on which thread the event will be sent.
-	 * @param event the event.
-	 */
-    public void systemRemoteResourceChanged(ISystemRemoteChangeEvent event);
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java
deleted file mode 100644
index f26bab95c..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvent.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
-s ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-/**
- * Interface of event sent when a remote system resource changes.
- * 
- * These events are mainly for internal use. BPs/ISVs should instead 
- * fire and monitor for {@link org.eclipse.rse.core.events.ISystemModelChangeEvent}.
- * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents
- */
-public interface ISystemResourceChangeEvent
-{	
-    /**
-     * Returns an object identifying the source of this event.
-     * @see java.util.EventObject
-     *
-     * @return an object identifying the source of this event
-     */
-    public Object getSource();
-    
-	/**
-	 * For multi-target events, return the array of source targets.
-	 * @return array of source objects.
-	 */
-	public Object[] getMultiSource();
-	
-    /**
-     * Returns the parent of the object source.
-     * Only guaranteed to be set for additions and deletions.
-     *
-     * @return an object identifying the parent of the source of this event,
-     *     or <code>null</code> if not applicable.
-     */
-    public Object getParent();
-    
-	/**
-	 * Set the parent object of this event.
-	 * @param parent the parent object.
-	 */
-	public void setParent(Object parent);
-    
-    /**
-     * Returns the grandparent of the object source.
-     * Only guaranteed to be set for special case events, which have a
-     * special contract with the SystemView.
-     *
-     * @return an object identifying the grandparent of the source of this event
-     */
-    public Object getGrandParent();
-    
-	/**
-	 * Return the position value for adding a new item.
-	 * Used in ADD events. A negative number indicates an append operation.
-	 * 
-	 * @return position to add the new item to. 
-	 */
-	public int getPosition();
-	
-	/**
-	 * Set the position value for adding a new item.
-	 * Used in ADD events. A negative number indicates an append operation.
-	 * 
-	 * @param position zero-based position to insert the new item. 
-	 */
-	public void setPosition(int position);
-	
-	/**
-	 * For relative add events, return the previous node this is being added after.
-	 * @return the previous node for adding a new node after.
-	 */
-	public Object getRelativePrevious();
-	
-	/**
-	 * For relative add events, set the previous node this is being added after.
-	 * @param previousObject the object after which to add the new object.
-	 */
-	public void setRelativePrevious(Object previousObject);
-
-    /**
-     * Returns the type of the event.
-     * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents
-     * @return a type that is one of the constants in ISystemResourceChangeEvents.
-     */
-    public int getType();
-    
-    /**
-     * Set the type of this event
-     * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents
-     * @param type a type that is one of the constants in ISystemResourceChangeEvents.
-     */
-    public void setType(int type);
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvents.java
deleted file mode 100644
index 189343978..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeEvents.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- * David McKnight   (IBM)        - [190805] [performance][dstore] Right-click > Disconnect on a dstore connection is slow and spawns many Jobs
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier;
-
-/**
- * Interface of event ID constants
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemResourceChangeEvents
-{
-	/**
-	 * The event is specifically a filter reference add (filter added)
-	 * An ISystemFilter is expected as a parameter of this event
-	 */
-	public static final int EVENT_ADD_FILTER_REFERENCE = 10;
-	/**
-	 * The event is specifically a filter reference rename (filter renamed)
-	 * An ISystemFilter is expected as a parameter of this event
-	 */
-	public static final int EVENT_RENAME_FILTER_REFERENCE = 15;
-	/**
-	 * The event is specifically a filter reference delete (filter deleted)
-	 * An ISystemFilter is expected as a parameter of this event
-	 */
-	public static final int EVENT_DELETE_FILTER_REFERENCE = 20;
-	/**
-	 * The event is specifically a filter reference change (filter strings changes)
-	 * An ISystemFilter is expected as a parameter of this event
-	 */
-	public static final int EVENT_CHANGE_FILTER_REFERENCE = 25;
-
-	/**
-	 * The event is specifically a filter reference move (filters reordered)
-	 * An array of ISystemFilter[] is the expected multi-source
-	 * parameter.  The source is the first item in that array.
-	 */
-	public static final int EVENT_MOVE_FILTER_REFERENCES = 30;
-
-	/**
-	 * The event is specifically a filter string reference add (filterstring added)
-	 * An ISystemFilterString is expected as a parameter of this event
-	 */
-	public static final int EVENT_ADD_FILTERSTRING_REFERENCE = 41;
-
-	/**
-	 * The event is specifically a filter string reference delete (filterstring deleted)
-	 * An ISystemFilterString is expected as a parameter of this event
-	 */
-	public static final int EVENT_DELETE_FILTERSTRING_REFERENCE = 42;
-
-	/**
-	 * The event is specifically a filter string reference change (filterstring changed)
-	 * An ISystemFilterString is expected as a parameter of this event
-	 */
-	public static final int EVENT_CHANGE_FILTERSTRING_REFERENCE = 43;
-
-	/**
-	 * The event is specifically a filter string reference move (filterstrings reordered)
-	 * An array of ISystemFilterString[] is the expected multi-source
-	 * parameter.  The source is the first item in that array.
-	 */
-	public static final int EVENT_MOVE_FILTERSTRING_REFERENCES = 44;
-
-	/**
-	 * The event is a resource add.
-	 * Any RSE object is the expected parameter
-	 */
-	public static final int EVENT_ADD = 50;
-
-	/**
-	 * The event is a multi-resource add.
-	 * An array of RSE objects (i.e. Object[]) is the multi-source
-	 * parameter (the source is the first item in that array) and a parent
-	 * RSE object is expected.
-	 */
-	public static final int EVENT_ADD_MANY = 51;
-
-	/**
-	 * The event is a resource add. The resource is added relative to the "previous" attribute .
-	 * The expected parameters are an RSE object and it's parent RSE object
-	 */
-	public static final int EVENT_ADD_RELATIVE = 53;
-
-	/**
-	 * After an add, you wish to expand the parent to reveal and select the new child.
-	 * This is a harmless operation if the parent was already expanded when EVENT_ADD was sent.
-	 * The expected parameters are an RSE object and the selected object
-	 */
-	public static final int EVENT_REVEAL_AND_SELECT = 52;
-
-	/**
-	 * The event is a single resource deletion.
-	 * An RSE object is the expected parameter
-	 */
-	public static final int EVENT_DELETE = 55;
-
-	/**
-	 * The event is a multiple resource deletion.
-	 * An array of RSE objects (i.e. Object[]) is the expected multi-source
-	 * parameter.  The source is the first item in that array.
-	 */
-	public static final int EVENT_DELETE_MANY = 60;
-
-	/**
-	 * The event is a resource rename.
-	 * An RSE object is the expected parameter
-	 */
-	public static final int EVENT_RENAME = 65;
-
-	/**
-	 * The event is a multiple resource move within the same children set
-	 * An array of RSE objects (i.e. Object[]) is the multi-source
-	 * parameter (the source is the first item in that array) and a parent
-	 * RSE object is expected.
-	 */
-	public static final int EVENT_MOVE_MANY = 75;
-
-	/**
-	 * The event is an icon change event A source RSE object or an array of
-	 * source RSE objects and the parent RSE object are the expected parameters
-	 * 
-	 * @since 3.1 an array of source RSE objects is allowed
-	 */
-	public static final int EVENT_ICON_CHANGE = 81;
-
-	/**
-	 * Refresh the single item passed in the "source" field of the event.
-	 *
-	 * All expanded sub-nodes are re-queried for their children, unexpanded
-	 * nodes lose their children cache. Selection is not maintained by this
-	 * event (use EVENT_REFRESH_REMOTE instead to maintain the selection).
-	 *
-	 * A source RSE object to refresh is the expected parameter
-	 */
-	public static final int EVENT_REFRESH = 82;
-
-	/**
-	 * Refresh the items currently selected in the SystemView.
-	 *
-	 * All expanded sub-nodes are re-queried for their children, unexpanded nodes
-	 * lose their children cache. After refreshing, selection of the currently selected
-	 * elements is restored if possible (in case an absoluteName is available).
-	 *
-	 * In case any of the selected items is a leaf node, the parent of that
-	 * leaf node is refreshed rather than the leaf node itself. In this particular
-	 * case, a multiselect is not considered properly.
-	 *
-	 * The SystemScratchpadView also listens to this event and refreshes those
-	 * elements that are selected in it.
-	 *
-	 * @deprecated obtain the selection yourself and do EVENT_REFRESH or EVENT_REFRESH_REMOTE
-	 */
-	public static final int EVENT_REFRESH_SELECTED = 83;
-
-	/**
-	 * Refresh the parent of the first item currently selected in the SystemView.
-	 *
-	 * This only refreshes the parent TreeItem of the first item in the selection.
-	 * It does not consider multiselect, multiple occurrences of the Item under multiple
-	 * filters, and does not maintain the current selection.
-	 *
-	 * @deprecated obtain the selection yourself and do EVENT_REFRESH or EVENT_REFRESH_REMOTE
-	 */
-	public static final int EVENT_REFRESH_SELECTED_PARENT = 84;
-
-	/**
-	 * Refresh the filter under which the first item currently selected in the
-	 * SystemView is found.
-	 *
-	 * From the filter level, all expanded sub-nodes are re-queried
-	 * for their children, unexpanded nodes lose their children cache.
-	 * After refreshing, selection of the currently selected elements
-	 * is restored if possible. Multiselect is not considered properly.
-	 *
-	 * @deprecated Refreshing a particular context(filter) only can lead
-	 *     to inconsistencies, so better obtain the selection yourself
-	 *     and do EVENT_REFRESH or EVENT_REFRESH_REMOTE
-	 */
-	public static final int EVENT_REFRESH_SELECTED_FILTER = 135;
-
-	/**
-	 * Refresh a remote object in the SystemView, given either the remote
-	 * object or a string that will match on getAbsoluteName, and optionally
-	 * (re)select a list of objects after refreshing.
-	 *
-	 * An object is considered remote if it has an adapter that implements
-	 * {@link ISystemViewElementAdapter} where the adapter returns true for
-	 * the isRemote(Object) call.  This method refreshes all occurrences of
-	 * the remote object, even under multiple filters.  The tricky part about
-	 * remote objects is their actual memory object changes on each refresh,
-	 * so to find one in the tree we must use something more permanent: hence
-	 * the use of getAbsoluteName to find it.
-	 * <p>
-	 * You can optionally pass a child remote object, or string, or Vector of
-	 * objects or strings, in the "parent" parameter of the event, and it/they
-	 * will be selected after the refresh. When passing a string, it must be
-	 * the result of {@link IRemoteObjectIdentifier#getAbsoluteName(Object)}
-	 * on the adapter.
-	 *
-	 * A remote RSE object is the expected source parameter
-	 */
-	public static final int EVENT_REFRESH_REMOTE = 85;
-
-	/**
-	 * The event is a resource property change.
-	 * A source RSE object and it's parent RSE object are the expected parameters
-	 */
-	public static final int EVENT_PROPERTY_CHANGE = 86;
-
-	/**
-	 * The event is a request to update the property sheet of whatever is currently selected.
-	 * A source RSE object and it's parent RSE object are the expected parameters
-	 */
-	public static final int EVENT_PROPERTYSHEET_UPDATE = 87;
-
-	/**
-	 * The event is a resource property change that invalidates child nodes
-	 *  in the GUI (eg, hostname change means the expanded information should
-	 *  be collapsed)
-	 *  A source RSE object is the expected parameter
-	 */
-	public static final int EVENT_MUST_COLLAPSE = 90;
-
-	/**
-	 * The event is a full collapse of the RSE tree
-	 * Pass "false" for the src value to prevent the memory flush, else
-	 *  pass any dummy value for the src to prevent crash, but it is ignored
-	 */
-	public static final int EVENT_COLLAPSE_ALL = 91;
-
-	/**
-	 * The event is a collapse of the selected elements in the tree
-	 * Pass any dummy value for the src to prevent crash, but it is ignored
-	 */
-	public static final int EVENT_COLLAPSE_SELECTED = 92;
-
-	/**
-	 * The event is an expand of the selected elements in the tree
-	 * Pass any dummy value for the src to prevent crash, but it is ignored
-	 */
-	public static final int EVENT_EXPAND_SELECTED = 93;
-
-	/**
-	 * The event is a generic notification that the children have changed
-	 *  and must be refreshed.
-	 *  A source RSE object and (optionally) it's parent RSE object are the
-	 *  expected parameters
-	 */
-	public static final int EVENT_CHANGE_CHILDREN = 95;
-
-	/**
-	 * The event is simply to force selection of the given object.
-	 * A source RSE object is the expected parameter
-	 */
-	public static final int EVENT_SELECT = 100;
-
-	/**
-	 * Select one or more remote objects.
-	 *
-	 * The "src" parameter holds a remote object, or string, or Vector of
-	 * objects or strings. When passing a string, it must be the result of
-	 * {@link IRemoteObjectIdentifier#getAbsoluteName(Object)}
-	 * on the adapter of the object.
-	 * The "parent" parameter can optionally hold a model object that is
-	 * the parent of the objects to be refreshed, in order to optimize searches.
-	 */
-	public static final int EVENT_SELECT_REMOTE = 101;
-
-	/**
-	 * The event is to both select and expand the given object.
-	 * A source RSE object is the expected parameter
-	 */
-	public static final int EVENT_SELECT_EXPAND = 105;
-
-	/**
-	 * The event is to log a command that has been run
-	 * A source RSE object is the expected parameter
-	 */
-	public static final int EVENT_COMMAND_RUN = 110;
-
-	/**
-	 * The event is to log a message from a command that has been run
-	 * A source RSE object and it's parent RSE object are the expected parameters
-	 */
-	public static final int EVENT_COMMAND_MESSAGE = 115;
-
-	/**
-	 * The event is to replace the children (similar to EVENT_ADD_MANY), it will
-	 * expand also
-	 * An array of RSE objects (i.e. Object[]) is the multi-source
-	 * parameter (the source is the first item in that array) and a parent
-	 * RSE object is expected.
-	 */
-	public static final int EVENT_REPLACE_CHILDREN = 120;
-
-	/**
-	 * The event is to log a command that has been run
-	 * @deprecated
-	 */
-	public static final int EVENT_COMPILE_COMMAND_RUN = 125;
-
-	/**
-	 * The event is to update the command history drop-down in the remote shell view
-	 * A source RSE object is the expected parameter
-	 *
-	 * TODO should be moved out of core since this is command-specific
-	 */
-	public static final int EVENT_COMMAND_HISTORY_UPDATE = 130;
-
-	/**
-	 * The event is to update the remote shell view when a command is finished
-	 * @deprecated use EVENT_COMMAND_SHELL_FINISHED
-	 */
-	public static final int EVENT_COMMAND_FINISHED = 140;
-
-	/**
-	 * The event is to update the remote shell view when a command is finished
-	 * A source RSE object is the expected parameter
-	 */
-	public static final int EVENT_COMMAND_SHELL_FINISHED = 140;
-
-	/**
-	 * The event is to indicate that a shell has been removed
-	 * A source RSE object is the expected parameter
-	 */
-	public static final int EVENT_COMMAND_SHELL_REMOVED = 141;
-
-	/**
-	 * The event is to update the search view when a search is finished
-	 * A IHostSearchResultConfiguration is the expected parameter
-	 */
-	public static final int EVENT_SEARCH_FINISHED = 150;
-
-	/**
-	 * Predefined event object for a property sheet update.
-	 */
-	public static final ISystemResourceChangeEvent PROPERTYSHEET_UPDATE_EVENT =
-		new SystemResourceChangeEvent("dummy",EVENT_PROPERTYSHEET_UPDATE,null); //$NON-NLS-1$
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeListener.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeListener.java
deleted file mode 100644
index 84777e2b5..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/ISystemResourceChangeListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-import java.util.EventListener;
-
-/**
- * Interface that listeners interesting in changes to remote
- * system connections and subsystems can listen implement and
- * subsequently register their interest in via SystemRegistry.
- */
-public interface ISystemResourceChangeListener extends EventListener
-{
-	/**
-	 * This is the method in your class that will be called when a
-	 * system resource changes.
-	 * @see ISystemResourceChangeEvent
-	 */
-    public void systemResourceChanged(ISystemResourceChangeEvent event);
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemRemoteChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemRemoteChangeEvent.java
deleted file mode 100644
index 3e6992a95..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemRemoteChangeEvent.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * David McKnight   (IBM)        - [224313] [api] Create RSE Events for MOVE and COPY holding both source and destination fields
- *******************************************************************************/
-
-package org.eclipse.rse.core.events;
-
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * For listeners interested in changes with remote resources. These events are
- * designed to state what the change to the resource was, not to optimize those
- * events for a GUI (eg, a delete event versus a refresh event).
- *
- * In RSE 3.0, the concept of Operation type was added (See
- * {@link #setOperation(String)} and the new Constructors, and the oldNames
- * property was extended from a single String into a String array.
- */
-public class SystemRemoteChangeEvent implements ISystemRemoteChangeEvent
-{
-	private int eventType;
-	private Object resource, parent;
-	private String[] oldNames;
-	private ISubSystem subsystem;
-	private Object originatingViewer;
-	private String operation;
-
-	/**
-	 * Constructor for non-rename event
-	 * @param eventType - one of the constants from {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents}
-	 * @param resource - the remote resource object, or absolute name of the resource as would be given by calling getAbsoluteName on its remote adapter,
-	 * or List of absoluteNames
-	 * @param resourceParent - the remote resource's parent object, or absolute name, if that is known. If it is non-null, this will aid in refreshing occurences of that parent.
-	 * @param subsystem - the subsystem which contains this remote resource. This allows the search for impacts to be
-	 *   limited to subsystems of the same parent factory, and to connections with the same hostname as the subsystem's connection.
-	 */
-	public SystemRemoteChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem)
-	{
-		super();
-		this.eventType = eventType;
-		this.resource = resource;
-		this.parent = resourceParent;
-		this.subsystem = subsystem;
-	}
-
-
-	/**
-	 * Constructor for a rename event.
-	 *
-	 * @param eventType - one of the constants from
-	 *            {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents}
-	 * @param resource - the remote resource object, or absolute name of the
-	 *            resource as would be given by calling getAbsoluteName on its
-	 *            remote adapter, or List of absoluteNames
-	 * @param resourceParent - the remote resource's parent object, or absolute
-	 *            name, if that is known. If it is non-null, this will aid in
-	 *            refreshing occurrences of that parent.
-	 * @param subsystem - the subsystem which contains this remote resource.
-	 *            This allows the search for impacts to be limited to subsystems
-	 *            of the same parent factory, and to connections with the same
-	 *            hostname as the subsystem's connection.
-	 * @param oldNames - on a rename, copy or move operation, these are the
-	 *            absolute names of the resources prior to the operation
-	 * @since 3.0 replaced String oldName by String[] oldNames
-	 */
-	public SystemRemoteChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames)
-	{
-		this(eventType, resource, resourceParent, subsystem);
-		this.oldNames = oldNames;
-	}
-
-	/**
-	 * Constructor for non-rename event
-	 * 
-	 * @param operation - the operation for which this event was fired. From
-	 *            {@link ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_COPY}
-	 *            and related String constants
-	 * @param eventType - one of the constants from
-	 *            {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents}
-	 * @param resource - the remote resource object, or absolute name of the
-	 *            resource as would be given by calling getAbsoluteName on its
-	 *            remote adapter, or List of absoluteNames
-	 * @param resourceParent - the remote resource's parent object, or absolute
-	 *            name, if that is known. If it is non-null, this will aid in
-	 *            refreshing occurrences of that parent.
-	 * @param subsystem - the subsystem which contains this remote resource.
-	 *            This allows the search for impacts to be limited to subsystems
-	 *            of the same parent factory, and to connections with the same
-	 *            hostname as the subsystem's connection.
-	 * @since 3.0
-	 */
-	public SystemRemoteChangeEvent(String operation, int eventType, Object resource, Object resourceParent, ISubSystem subsystem)
-	{
-		super();
-		this.eventType = eventType;
-		this.resource = resource;
-		this.parent = resourceParent;
-		this.subsystem = subsystem;
-		this.operation = operation;
-	}
-
-	/**
-	 * Constructor for a rename event.
-	 *
-	 * @param operation - the operation for which this event was fired. From
-	 *            {@link ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_COPY}
-	 *            and related String constants
-	 * @param eventType - one of the constants from
-	 *            {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents}
-	 * @param resource - the remote resource object, or absolute name of the
-	 *            resource as would be given by calling getAbsoluteName on its
-	 *            remote adapter, or List of absoluteNames
-	 * @param resourceParent - the remote resource's parent object, or absolute
-	 *            name, if that is known. If it is non-null, this will aid in
-	 *            refreshing occurrences of that parent.
-	 * @param subsystem - the subsystem which contains this remote resource.
-	 *            This allows the search for impacts to be limited to subsystems
-	 *            of the same parent factory, and to connections with the same
-	 *            hostname as the subsystem's connection.
-	 * @param oldNames - on a rename, copy or move operation, these are the
-	 *            absolute names of the resources prior to the operation
-	 * @since 3.0
-	 */
-	public SystemRemoteChangeEvent(String operation, int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames)
-	{
-		this(operation, eventType, resource, resourceParent, subsystem);
-		this.oldNames = oldNames;
-	}
-	/**
-	 * Constructor you shouldn't use unless you intend to call the setters
-	 */
-	public SystemRemoteChangeEvent()
-	{
-	}
-
-	/**
-	 * Reset the event type
-	 */
-	public void setEventType(int eventType)
-	{
-		this.eventType = eventType;
-	}
-
-	/**
-	 * Reset the resource
-	 */
-	public void setResource(Object resource)
-	{
-		this.resource = resource;
-	}
-
-	/**
-	 * Reset the resource's remote resource parent
-	 */
-	public void setResourceParent(Object resourceParent)
-	{
-		this.parent = resourceParent;
-	}
-
-	/**
-	 * Reset the subsystem
-	 */
-	public void setSubSystem(ISubSystem subsystem)
-	{
-		this.subsystem = subsystem;
-	}
-
-	/**
-	 * Reset the old names on a rename, move or copy event
-	 *
-	 * @since 3.0
-	 */
-	public void setOldNames(String[] oldNames)
-	{
-		this.oldNames = oldNames;
-	}
-
-	/**
-	 * Get the event type, such as {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents#SYSTEM_REMOTE_RESOURCE_CREATED}.
-	 * @see org.eclipse.rse.core.events.ISystemRemoteChangeEvents
-	 */
-	public int getEventType()
-	{
-		return eventType;
-	}
-
-	/**
-	 * Get the resource that this event applies to
-	 * It must either be the binary object of the resource, or the absolute name of the resource,
-	 * or List of absoluteNames.
-	 */
-	public Object getResource()
-	{
-		return resource;
-	}
-
-	/**
-	 * Get the parent remote object for the affected remote object. This is not always known,
-	 *  but when it is (ie, non null) then it can be used to refresh all expanded occurrences of that parent
-	 */
-	public Object getResourceParent()
-	{
-		return parent;
-	}
-
-	/**
-	 * Get the subsystem in which this resource resides.
-	 * This allows the search for impacts to be limited to subsystems of the same parent factory, and to connections
-	 *   with the same hostname as the subsystem's connection.
-	 */
-	public ISubSystem getSubSystem()
-	{
-		return subsystem;
-	}
-
-	/**
-	 * Get the old name of the resource, in the event of a resource rename. Null
-	 * for other event types.
-	 *
-	 * @since 3.0
-	 */
-	public String[] getOldNames()
-	{
-		return oldNames;
-	}
-
-	/**
-	 * Set the originating viewer.
-	 * Only this viewer is candidate for updating the selection. Eg, on a
-	 * create event, if this and the resource parent is set, the newly
-	 * created object is selected after the parent's contents are refreshed,
-	 * for the originating viewer.
-	 */
-	public void setOriginatingViewer(Object originatingViewer) {
-		this.originatingViewer = originatingViewer;
-	}
-
-	/**
-	 * Get the originating viewer from which this remote resource change event
-	 * comes from. The combination of this, if non-null, plus the resource parent,
-	 * allows viewers to decide whether to update the selection within the
-	 * parent resource, after refreshing that resource.
-	 */
-	public Object getOriginatingViewer() {
-		return originatingViewer;
-	}
-
-
-	/**
-	 * @since 3.0
-	 * @param operation from
-	 *            {@link ISystemRemoteChangeEvents#SYSTEM_REMOTE_OPERATION_COPY}
-	 *            and related String constants
-	 */
-	public void setOperation(String operation){
-		this.operation = operation;
-	}
-
-	/**
-	 * Returns the operation of this event if it's not implied by the event
-	 * itself. The operation can be optionally specified when the event is
-	 * constructed. By default this will return null.
-	 *
-	 * @return the operation that triggered this event
-	 * @since 3.0
-	 */
-	public String getOperation() {
-		return operation;
-	}
-
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemResourceChangeEvent.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemResourceChangeEvent.java
deleted file mode 100644
index 24cef06c2..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/events/SystemResourceChangeEvent.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- ********************************************************************************/
-
-package org.eclipse.rse.core.events;
-import java.util.EventObject;
-
-/**
- * Event object sent to SystemResourceChangeListeners when a
- * remote system object is created, changed, removed, etc.
- * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents
- */
-public class SystemResourceChangeEvent
-	   extends EventObject
-	   implements ISystemResourceChangeEvent
-{
-	private static final long serialVersionUID = 1;
-	private Object parent,grandparent, prevObj;
-	private Object[] multiSource;
-	private int type;
-	private int position = -1;
-	
-	/**
-	 * Constructor for SystemResourceChangeEvent.
-     * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents
-	 * @param source The object that was added,deleted,renamed,changed.
-	 * @param type The type of event, one of ISystemChangeEvent constants.
-	 * @param parent The parent of the object that was added or deleted.
-	 */
-	public SystemResourceChangeEvent(Object source, int type, Object parent)
-	{
-		super(source);
-		setType(type);
-		setParent(parent);
-	}
-	/**
-	 * Constructor for SystemResourceChangeEvent when the source is multipe resources.
-     * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents
-	 * @param source The array of objects that were added,deleted,renamed,changed.
-	 * @param type The type of event, one of ISystemChangeEvent constants.
-	 * @param parent The parent of the object that was added or deleted.
-	 */
-	public SystemResourceChangeEvent(Object[] source, int type, Object parent)
-	{
-		super(((source!=null) && (source.length>0)) ? source[0] : "nada"); // defect 42112 //$NON-NLS-1$
-		this.multiSource = source;
-		this.type = type;
-		this.parent = parent;
-	}	
-
-	/**
-	 * For multi-target events, return the array of source targets.
-	 */
-	public Object[] getMultiSource()
-	{
-		return multiSource;
-	}
-
-	/**
-	 * Return the parent of the object added or removed.
-	 * @see ISystemResourceChangeEvent#getParent()
-	 */
-	public Object getParent()
-	{
-		return parent;
-	}
-	/**
-	 * Set the parent
-	 */
-	public void setParent(Object parent)
-	{
-		this.parent = parent;
-	}
-
-	/**
-	 * Return the grand parent of the object added or removed.
-	 * @see ISystemResourceChangeEvent#getParent()
-	 */
-	public Object getGrandParent()
-	{
-		return grandparent;
-	}
-	/**
-	 * Set the grand parent of the object added or removed.
-	 */
-	public void setGrandParent(Object grandparent)
-	{
-		this.grandparent = grandparent;
-	}
-	/**
-	 * Return the position value. Used in ADD events.
-	 * @return position to add the new item to. A negative number indicates an append operation
-	 */
-	public int getPosition()
-	{
-		return position;
-	}
-	/**
-	 * Set the position value. Used in ADD events.
-	 * @param position zero-based position to insert the new item. A negative number indicates an append operation
-	 */
-	public void setPosition(int position)
-	{
-		this.position = position;
-	}
-
-	/**
-	 * Return the type of the event (add, change, remove, rename, change, property change).
-     * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents
-	 * @see org.eclipse.rse.core.events.ISystemResourceChangeEvent
-	 * @see org.eclipse.rse.core.events.ISystemResourceChangeEvent#getType()
-	 */
-	public int getType()
-	{
-		return type;
-	}
-    /**
-     * Set the type
-     * @see org.eclipse.rse.core.events.ISystemResourceChangeEvents
-     */
-    public void setType(int type)
-    {
-    	this.type = type;
-    }
-    
-	/**
-	 * For relative add events, return the previous node this is being added after
-	 */
-	public Object getRelativePrevious()
-	{
-		return prevObj;
-	}
-	/**
-	 * For relative add events, set the previous node this is being added after
-	 */
-	public void setRelativePrevious(Object previousObject)
-	{
-		this.prevObj = previousObject;
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java
deleted file mode 100644
index efa87b80d..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java
+++ /dev/null
@@ -1,652 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - cleanup format and javadoc
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.model.IRSEModelObject;
-import org.eclipse.rse.core.references.IRSEReferencedObject;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * A filter consists of filter strings and may be contained in a filter pool.
- * Filter pools are referenced by subsystems. Subsystems are responsible for
- * interpreting the filters. Filters, in and of themselves, provide no
- * interpretation of themselves when applied to the resources managed by a
- * subsystem.
- * 
- * @noimplement This interface is not intended to be implemented by clients. The
- *              allowable implementations already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-
-public interface ISystemFilter extends IRSEReferencedObject, ISystemFilterContainer, IRSEModelObject {
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <p>
-	 * This is the name of the filter. It may be present in the user interface and is also
-	 * used to refer to the filter when it is persisted.
-	 * </p>
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 */
-	public String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getName <em>Name</em>}' attribute.
-	 * This is the name of the filter. It may be present in the user interface and is also
-	 * used to refer to the filter when it is persisted.
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 */
-	public void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * <p>
-	 * Filters may be further typed for use by subsystems. The type is also uninterpreted by the
-	 * filter. The type may be used to select a parser/interpreter for the filter strings.
-	 * </p>
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see #setType(String)
-	 */
-	public String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getType <em>Type</em>}' attribute.
-	 * Filters may be further typed for use by subsystems. The type is also uninterpreted by the
-	 * filter. The type may be used to select a parser/interpreter for the filter strings.
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see #getType()
-	 */
-	public void setType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Supports Nested Filters</b></em>' attribute.
-	 * <p>
-	 * Specifies whether filters may be nested or not. If nested the intent is to apply this filter
-	 * to the results of the parent filter - further restricting the resources selected by the
-	 * parent filter. However, it is up to the subsystem to interpret exactly what "nesting" means.
-	 * </p>
-	 * @return the value of the '<em>Supports Nested Filters</em>' attribute.
-	 * @see #setSupportsNestedFilters(boolean)
-	 */
-	public boolean isSupportsNestedFilters();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSupportsNestedFilters <em>Supports Nested Filters</em>}' attribute.
-	 * <p>
-	 * Specifies whether filters may be nested or not. If nested the intent is to apply this filter
-	 * to the results of the parent filter - further restricting the resources selected by the
-	 * parent filter. However, it is up to the subsystem to interpret exactly what "nesting" means.
-	 * </p>
-	 * @param value the new value of the '<em>Supports Nested Filters</em>' attribute.
-	 * @see #isSupportsNestedFilters()
-	 */
-	public void setSupportsNestedFilters(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Relative Order</b></em>' attribute.
-	 * <p>
-	 * The relative order of a filter is intended to be used
-	 * by a persistence mechanism to keep the filters in a particular order
-	 * when restoring them into a filter pool. Filters with higher numbers should
-	 * occur later in the pool. It may be employed in the absence of another
-	 * mechanism for maintaining order.
-	 * </p>
-	 * @return the value of the '<em>Relative Order</em>' attribute.
-	 * @see #setRelativeOrder(int)
-	 */
-	public int getRelativeOrder();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getRelativeOrder <em>Relative Order</em>}' attribute.
-	 * The relative order of a filter is intended to be used
-	 * by a persistence mechanism to keep the filters in a particular order
-	 * when restoring them into a filter pool. Filters with higher numbers should
-	 * occur later in the pool. It may be employed in the absence of another
-	 * mechanism for maintaining order.
-	 * @param value the new value of the '<em>Relative Order</em>' attribute.
-	 * @see #getRelativeOrder()
-	 */
-	public void setRelativeOrder(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Default</b></em>' attribute.
-	 * <p>
-	 * This filter is a "default" filter in this filter pool.
-	 * The meaning of "default" is determined by the subsystem in which it is deployed.
-	 * It typically means that the filter is supplied by the subsystem at the time the subsystem is created.
-	 * That is, the filter is "vendor supplied".
-	 * There is no restriction on the number of default filters in a pool.
-	 * </p>
-	 * @return the value of the '<em>Default</em>' attribute.
-	 * @see #setDefault(boolean)
-	 */
-	public boolean isDefault();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isDefault <em>Default</em>}' attribute.
-	 * Make this filter is a "default" filter in this filter pool.
-	 * The meaning of "default" is determined by the subsystem in which it is deployed.
-	 * It typically means that the filter is supplied by the subsystem at the time the subsystem is created.
-	 * That is, the filter is "vendor supplied".
-	 * There is no restriction on the number of default filters in a pool.
-	 * @param value the new value of the '<em>Default</em>' attribute.
-	 * @see #isDefault()
-	 */
-	public void setDefault(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Strings Case Sensitive</b></em>' attribute.
-	 * <p>
-	 * An attribute that may be used by the subystems when interpreting the filter. Used
-	 * to indicate whether or not comparisons involving the filter should be considered
-	 * case sensitive.
-	 * This attribute is optional and may be known (set) or unknown (unset).
-	 * </p>
-	 * <p>
-	 * If unset the value
-	 * returned is from the parent filter pool.
-	 * </p>
-	 * @return the value of the '<em>Strings Case Sensitive</em>' attribute.
-	 * @see #isSetStringsCaseSensitive()
-	 * @see #unsetStringsCaseSensitive()
-	 * @see #setStringsCaseSensitive(boolean)
-	 */
-	public boolean isStringsCaseSensitive();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsCaseSensitive <em>Strings Case Sensitive</em>}' attribute.
-	 * <p>
-	 * An attribute that may be used by the subystems when interpreting the filter. Used
-	 * to indicate whether or not comparisons involving the filter should be considered
-	 * case sensitive.
-	 * This attribute is optional and may be known (set) or unknown (unset).
-	 * </p>
-	 * <p>
-	 * This will cause this attribute to be set in this filter.
-	 * </p>
-	 * @param value the new value of the '<em>Strings Case Sensitive</em>' attribute.
-	 * @see #isSetStringsCaseSensitive()
-	 * @see #unsetStringsCaseSensitive()
-	 * @see #isStringsCaseSensitive()
-	 */
-	void setStringsCaseSensitive(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsCaseSensitive <em>Strings Case Sensitive</em>}' attribute.
-	 * <p>
-	 * An attribute that may be used by the subystems when interpreting the filter. Used
-	 * to indicate whether or not comparisons involving the filter should be considered
-	 * case sensitive.
-	 * This attribute is optional and may be known (set) or unknown (unset).
-	 * </p><p>
-	 * Causes this filter to use the value specified by the parent filter pool.
-	 * </p>
-	 * @see #isSetStringsCaseSensitive()
-	 * @see #isStringsCaseSensitive()
-	 * @see #setStringsCaseSensitive(boolean)
-	 */
-	public void unsetStringsCaseSensitive();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsCaseSensitive <em>Strings Case Sensitive</em>}' attribute is set.
-	 * <p>
-	 * An attribute that may be used by the subystems when interpreting the filter. Used
-	 * to indicate whether or not comparisons involving the filter should be considered
-	 * case sensitive.
-	 * This attribute is optional and may be known (set) or unknown (unset).
-	 * </p><p>
-	 * This will be true if this attribute is explicitly specified for this filter. It will be false if this
-	 * is being inherited from the parent filter pool.
-	 * </p>
-	 * @return whether the value of the '<em>Strings Case Sensitive</em>' attribute is set.
-	 * @see #unsetStringsCaseSensitive()
-	 * @see #isStringsCaseSensitive()
-	 * @see #setStringsCaseSensitive(boolean)
-	 */
-	public boolean isSetStringsCaseSensitive();
-
-	/**
-	 * Returns the value of the '<em><b>Promptable</b></em>' attribute.
-	 * <p>
-	 * An attribute that may be used by the subystems when interpreting the filter.
-	 * Typically used to indicate whether or not some sort of prompting is to occur when the
-	 * filter is used. Typically used when applying a filter in the UI to indicate
-	 * the start of a wizard or dialog. It may also have an effect on whether
-	 * the state of the filter is saved when the workbench is shut down.
-	 * </p>
-	 * @return the value of the '<em>Promptable</em>' attribute.
-	 * @see #setPromptable(boolean)
-	 */
-	public boolean isPromptable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isPromptable <em>Promptable</em>}' attribute.
-	 * <p>
-	 * An attribute that may be used by the subystems when interpreting the filter.
-	 * Typically used to indicate whether or not some sort of prompting is to occur when the
-	 * filter is used. Typically used when applying a filter in the UI to indicate
-	 * the start of a wizard or dialog. It may also have an effect on whether
-	 * the state of the filter is saved when the workbench is shut down.
-	 * </p>
-	 * @param value the new value of the '<em>Promptable</em>' attribute.
-	 * @see #isPromptable()
-	 */
-	public void setPromptable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Supports Duplicate Filter Strings</b></em>' attribute.
-	 * <p>
-	 * This attribute may be used by subsystems when interpreting the filter.
-	 * Typically used when adding filter strings to the filter or as a hint when
-	 * applying the filter to the resources understood by the subsystem.
-	 * </p>
-	 * @return the value of the '<em>Supports Duplicate Filter Strings</em>' attribute.
-	 * @see #setSupportsDuplicateFilterStrings(boolean)
-	 */
-	public boolean isSupportsDuplicateFilterStrings();
-
-	/**
-	 * Does this support duplicate filter strings?
-	 * A convenience method for {@link #isSupportsDuplicateFilterStrings()}.
-	 */
-	public boolean supportsDuplicateFilterStrings();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSupportsDuplicateFilterStrings <em>Supports Duplicate Filter Strings</em>}' attribute.
-	 * <p>
-	 * This attribute may be used by subsystems when interpreting the filter.
-	 * Typically used when adding filter strings to the filter or as a hint when
-	 * applying the filter to the resources understood by the subsystem.
-	 * </p>
-	 * @param value the new value of the '<em>Supports Duplicate Filter Strings</em>' attribute.
-	 * @see #isSupportsDuplicateFilterStrings()
-	 */
-	public void setSupportsDuplicateFilterStrings(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Deletable</b></em>' attribute.
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be deleted.
-	 * </p>
-	 * @return the value of the '<em>Non Deletable</em>' attribute.
-	 * @see #setNonDeletable(boolean)
-	 */
-	public boolean isNonDeletable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isNonDeletable <em>Non Deletable</em>}' attribute.
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be deleted.
-	 * </p>
-	 * @param value the new value of the '<em>Non Deletable</em>' attribute.
-	 * @see #isNonDeletable()
-	 */
-	public void setNonDeletable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Renamable</b></em>' attribute.
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be renamed.
-	 * </p>
-	 * @return the value of the '<em>Non Renamable</em>' attribute.
-	 * @see #setNonRenamable(boolean)
-	 */
-	public boolean isNonRenamable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isNonRenamable <em>Non Renamable</em>}' attribute.
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be renamed.
-	 * </p>
-	 * @param value the new value of the '<em>Non Renamable</em>' attribute.
-	 * @see #isNonRenamable()
-	 */
-	public void setNonRenamable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Changable</b></em>' attribute.
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be modifiable.
-	 * </p>
-	 * @return the value of the '<em>Non Changable</em>' attribute.
-	 * @see #setNonChangable(boolean)
-	 */
-	public boolean isNonChangable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isNonChangable <em>Non Changable</em>}' attribute.
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters should not be modifiable.
-	 * </p>
-	 * @param value the new value of the '<em>Non Changable</em>' attribute.
-	 * @see #isNonChangable()
-	 */
-	public void setNonChangable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Strings Non Changable</b></em>' attribute.
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters contain filter strings that should not be modifiable.
-	 * </p>
-	 * @return the value of the '<em>Strings Non Changable</em>' attribute.
-	 * @see #setStringsNonChangable(boolean)
-	 */
-	public boolean isStringsNonChangable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isStringsNonChangable <em>Strings Non Changable</em>}' attribute.
-	 * <p>
-	 * An attribute that can be used when managing filters in filter pools.
-	 * Some filters contain filter strings that should not be modifiable.
-	 * </p>
-	 * @param value the new value of the '<em>Strings Non Changable</em>' attribute.
-	 * @see #isStringsNonChangable()
-	 */
-	public void setStringsNonChangable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Release</b></em>' attribute.
-	 * <p>
-	 * This is an attribute specifying the release level of the
-	 * filter. This will be persisted in the filter definition and
-	 * can be used to migrate the internal form of the filter.
-	 * </p>
-	 * @return the value of the '<em>Release</em>' attribute.
-	 * @see #setRelease(int)
-	 */
-	public int getRelease();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getRelease <em>Release</em>}' attribute.
-	 * <p>
-	 * This is an attribute specifying the release level of the
-	 * filter. This will be persisted in the filter definition and
-	 * can be used to migrate the internal form of the filter.
-	 * </p>
-	 * @param value the new value of the '<em>Release</em>' attribute.
-	 * @see #getRelease()
-	 */
-	public void setRelease(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Single Filter String Only</b></em>' attribute.
-	 * <p>
-	 * This attribute specifies that the filter may contain only a single
-	 * filter string. Used by a filter manager to ensure that the
-	 * filter contains only one string. May, alternatively, be enforced
-	 * by the filter implementation.
-	 * </p><p>
-	 * This attribute may be set or unset. If unset this value will be inherited
-	 * from the parent filter pool.
-	 * </p>
-	 * @return the value of the '<em>Single Filter String Only</em>' attribute.
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	public boolean isSingleFilterStringOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute.
-	 * <p>
-	 * This attribute specifies that the filter may contain only a single
-	 * filter string. Used by a filter manager to ensure that the
-	 * filter contains only one string. May, alternatively, be enforced
-	 * by the filter implementation.
-	 * </p><p>
-	 * This causes the attribute to be set for this filter, ignoring the value
-	 * specified for the parent filter pool.
-	 * </p>
-	 * @param value the new value of the '<em>Single Filter String Only</em>' attribute.
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 */
-	public void setSingleFilterStringOnly(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute.
-	 * This causes the value of this attribute to be inherited from the parent filter pool.
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	public void unsetSingleFilterStringOnly();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute is set.
-	 * If true then the value of this attribute is set in this filter. If false it is inherited from the parent filter pool.
-	 * @return whether the value of the '<em>Single Filter String Only</em>' attribute is set.
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	public boolean isSetSingleFilterStringOnly();
-
-	/**
-	 * Returns the value of the '<em><b>Nested Filters</b></em>'
-	 * containment reference list. It is bidirectional and its opposite is '{@link org.eclipse.rse.core.filters.ISystemFilter#getParentFilter <em>Parent Filter</em>}'.
-	 * <p>
-	 * If this filter can contain child filters this will return the list of
-	 * children.
-	 * </p>
-	 *
-	 * @return the value of the '<em>Nested Filters</em>' containment
-	 *         reference list.
-	 * @see org.eclipse.rse.core.filters.ISystemFilter#getParentFilter
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilter[] getNestedFilters();
-
-	/**
-	 * Returns the value of the '<em><b>Parent Filter</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.rse.core.filters.ISystemFilter#getNestedFilters <em>Nested Filters</em>}'.
-	 * <p>
-	 * If this filter can be nested inside another this will return the parent filter. Will be
-	 * null if there is no parent.
-	 * </p>
-	 * @return the value of the '<em>Parent Filter</em>' container reference.
-	 * @see #setParentFilter(ISystemFilter)
-	 * @see org.eclipse.rse.core.filters.ISystemFilter#getNestedFilters
-	 */
-	public ISystemFilter getParentFilter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilter#getParentFilter <em>Parent Filter</em>}' container reference.
-	 * This is used by a filter manager to set the parent filter when one filter is nested inside another.
-	 * @param value the new value of the '<em>Parent Filter</em>' container reference.
-	 * @see #getParentFilter()
-	 */
-	public void setParentFilter(ISystemFilter value);
-
-	/**
-	 * Returns the value of the '<em><b>Strings</b></em>' containment
-	 * reference list.
-	 *
-	 * @return the value of the '<em>Strings</em>' containment reference
-	 *         list.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilterString[] getStrings();
-
-	/**
-	 * @return the parent pool of this filter. For nested filters, this will walk up the parent chain
-	 * until we find the pool. May return null if this is a simple filter that has no parent pool.
-	 */
-	public ISystemFilterPool getParentFilterPool();
-
-	/**
-	 * Internal use method to set the parent filter pool. This should be invoked only by a filter manager
-	 * or a filter pool manager when adding a filter to a filter pool.
-	 * @param parentPool the filter pool that contains or will contain this filter.
-	 */
-	public void setParentFilterPool(ISystemFilterPool parentPool);
-
-	/**
-	 * Set this filter's filter strings by giving an array of String objects.
-	 * This will construct the filter strings objects.
-	 * @param strings the array of String objects.
-	 */
-	public void setFilterStrings(String[] strings);
-
-	/**
-	 * @return this filter's filter strings as an array of String objects. This array will
-	 * not be null, but may be empty.
-	 */
-	public String[] getFilterStrings();
-
-	/**
-	 * @return this filter's filter string objects as an array of IFilterString objects.
-	 * This array will not be null, but may be empty.
-	 */
-	public ISystemFilterString[] getSystemFilterStrings();
-
-	/**
-	 * @return the number of filter strings this filter currently contains.
-	 */
-	public int getFilterStringCount();
-
-	/**
-	 * @return a filter string given its string value. This will be null if there
-	 * is no string matching the argument.
-	 */
-	public ISystemFilterString getSystemFilterString(String string);
-
-	/**
-	 * Append a new filter string to this filter's list of filter strings.
-	 * This will construct a filter string object.
-	 * @param newString the string to append
-	 */
-	public ISystemFilterString addFilterString(String newString);
-
-	/**
-	 * Insert a new filter string to this filter's list, at the given zero-based position.
-	 * Thsi will construct a filter string object.
-	 * @param newString the string from which to construct the filter string to be added.
-	 * @param position the zero-based position at which to add the string.
-	 */
-	public ISystemFilterString addFilterString(String newString, int position);
-
-	/**
-	 * Update a new filter string's string value.
-	 * The filter string need not belong to this filter.
-	 * @param filterString the string update.
-	 * @param newValue the new value of that string.
-	 */
-	public void updateFilterString(ISystemFilterString filterString, String newValue);
-
-	/**
-	 * Delete a filter string from this filter's list.
-	 * @param oldString the string to remove
-	 * @return the SystemFilterString object deleted, or null if not found
-	 */
-	public ISystemFilterString removeFilterString(String oldString);
-
-	/**
-	 * Remove a filter string from this filter's list, given its zero-based position
-	 * @param position the position of the filter string.
-	 * @return the SystemFilterString object deleted, or null if not found
-	 */
-	public ISystemFilterString removeFilterString(int position);
-
-	/**
-	 * Remove a filter string from this filter's list, given its SystemFilterString object.
-	 * The specific filter string will be removed, based on object identity.
-	 * @param filterString the filterString to be removed.
-	 * @return true if the given string existed and hence was deleted.
-	 */
-	public boolean removeFilterString(ISystemFilterString filterString);
-
-	/**
-	 * Move a given filter string to a given zero-based location. This will
-	 * do nothing if the argument is not a string already contained by this filter.
-	 * @param pos the new position of this filter string
-	 * @param filterString the filter string to move
-	 */
-	public void moveSystemFilterString(int pos, ISystemFilterString filterString);
-
-	/**
-	 * Copies a given filter string from this filter to another filter in this pool or another pool
-	 * in this manager or another manager. Will do nothing if the filter string is not
-	 * originally contained in this filter.
-	 * @param targetFilter the filter to which to copy the filter string
-	 * @param oldFilterString the filter string to copy
-	 */
-	public ISystemFilterString copySystemFilterString(ISystemFilter targetFilter, ISystemFilterString oldFilterString);
-
-	/**
-	 * @return true if this filter is a nested filter or not. If not, its parent is the filter pool.
-	 */
-	public boolean isNested();
-
-	/**
-	 * @return true if this a transient or simple filter that is not intended to be
-	 * saved or part of the filter framework. It will have no manager or provider.
-	 */
-	public boolean isTransient();
-
-	/**
-	 * Set the subsytem of this filter.
-	 * This is ignored if the filter is not transient.
-	 * @param subsystem a subsystem associated with this transient filter
-	 * @since 3.0
-	 */
-	public void setSubSystem(ISubSystem subsystem);
-
-	/**
-	 * Get the subsystem for this filter.
-	 * This will return null if the filter is not transient.
-	 * @return the subsystem
-	 * @since 3.0
-	 */
-	public Object getSubSystem();
-
-	/**
-	 * Clones a given filter to the given target filter.
-	 * All filter strings, and all nested filters, are copied.
-	 * Typically used when copying a whole filter.
-	 * @param targetFilter new filter into which all the data of this filter will be copied.
-	 */
-	public void clone(ISystemFilter targetFilter);
-
-	/**
-	 * @return the ISystemFilterContainer parent of this filter. This will be either
-	 * an ISystemFilterPool or an ISystemFilter if this is a nested filter.
-	 */
-	public ISystemFilterContainer getParentFilterContainer();
-
-	/**
-	 * @return the caller which instantiated the filter pool manager overseeing this filter framework instance.
-	 * This will typically be a subsystem configuration.
-	 */
-	public ISystemFilterPoolManagerProvider getProvider();
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java
deleted file mode 100644
index 7e81541b9..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.model.IRSEPersistableContainer;
-
-/**
- * Filter containers are any objects that contain filters.
- * This includes filter pools and filters themselves.
- * @noimplement This interface is not intended to be implemented by clients.
- * The allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterContainer extends IRSEPersistableContainer {
-	/**
-	 * @return the filter pool manager managing this collection of filter pools and their filters.
-	 */
-	public ISystemFilterPoolManager getSystemFilterPoolManager();
-
-	/**
-	 * @return The value of the StringsCaseSensitive attribute Are filters in
-	 *         this filter container case sensitive? If not set locally, queries
-	 *         the parent filter pool manager's attribute.
-	 */
-	public boolean areStringsCaseSensitive();
-
-	/**
-	 * Adds a new system filter to this container (SystemFilterPool or
-	 * SystemFilter) and populates it with the filter strings created from the
-	 * strings provided. Does nothing if this filter already exists in this
-	 * container.
-	 * 
-	 * @param aliasName The name to give the new filter. Must be unique for this
-	 *            pool.
-	 * @param filterStrings The list of String objects that represent the filter
-	 *            strings.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilter createSystemFilter(String aliasName, String[] filterStrings);
-
-	/**
-	 * Adds given filter to the list without populating the filter strings.
-	 * @param filter SystemFilter object to add
-	 * @return true if added, false if a filter with this aliasname already existed.
-	 */
-	public boolean addSystemFilter(ISystemFilter filter);
-
-	/**
-	 * Get the names of existing filters in this container. Typically used by
-	 * name validators for New and Rename actions to verify new name is unique.
-	 * 
-	 * @return String array of the names of existing filters in this container.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public String[] getSystemFilterNames();
-
-	/**
-	 * @return an array of the ISystemFilter objects contained in this filter container.
-	 */
-	public ISystemFilter[] getSystemFilters();
-
-	/**
-	 * @return a system filter given its name. Will return null if no filter by this name is found.
-	 */
-	public ISystemFilter getSystemFilter(String filterName);
-
-	/**
-	 * @return the parent pool of this container.
-	 * If this is itself a pool, returns "this".
-	 * For a nested filter, returns the pool that is the ultimate parent of this filter.
-	 */
-	public ISystemFilterPool getSystemFilterPool();
-
-	/**
-	 * @return how many filters are directly defined in this filter container.
-	 */
-	public int getSystemFilterCount();
-
-	/**
-	 * Removes a given filter from the list. Will do nothing if the specified filter
-	 * is not in this filter container.
-	 * @param filter SystemFilter object to remove
-	 */
-	public void deleteSystemFilter(ISystemFilter filter);
-
-	/**
-	 * Renames a given filter in the list. The new name is assumed to be valid.
-	 * Will perform the rename whether or not the filter is contained in this
-	 * container.
-	 * @param filter SystemFilter object to rename
-	 * @param newName New name to assign it.
-	 */
-	public void renameSystemFilter(ISystemFilter filter, String newName);
-
-	/**
-	 * @return a given filter's zero-based location. Will return -1 if the filter
-	 * is not present in this container.
-	 */
-	public int getSystemFilterPosition(ISystemFilter filter);
-
-	/**
-	 * Move a given filter to a given zero-based location.
-	 * Does nothing if the filter is not in this container.
-	 * @param pos the new position of the filter.
-	 * @param filter the filter to move.
-	 */
-	public void moveSystemFilter(int pos, ISystemFilter filter);
-
-	/**
-	 * Updates a given filter.
-	 * The filter need not be present in this container but will operate on
-	 * any filter.
-	 * @param filter SystemFilter object to update
-	 * @param newName New name to assign it. Assumes unique checking already done.
-	 * @param newStrings New strings to assign it. Replaces current strings.
-	 */
-	public void updateSystemFilter(ISystemFilter filter, String newName, String[] newStrings);
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java
deleted file mode 100644
index 3e05fcaa1..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * Both ISystemFilter and ISystemFilterPool may contain filters, so the
- * common methods for filters are abstracted out in SystemFilterContainer,
- * which both classes implement.
- * Both ISystemFilterReference and ISystemFilterPoolReference hold references
- * to ISystemFilterContainer objects.
- * There are methods common to both classes, related to
- * getting an array of references to the filters that are held by the referenced
- * object.
- * This interface captures those common methods, and both 
- * SystemFilterReference and SystemFilterPoolReference
- * implement this interface and hence these methods.
- * @noimplement This interface is not intended to be implemented by clients.
- * The allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterContainerReference {
-	/**
-	 * @return the filter container object which is referenced.
-	 */
-	public ISystemFilterContainer getReferencedSystemFilterContainer();
-
-	/**
-	 * Build and return an array of SystemFilterReference objects.
-	 * Each object is created new. There is one for each of the filters
-	 * in the reference SystemFilter or SystemFilterPool.
-	 * For performance reasons, we will cache this array and only 
-	 * return a fresh one if something changes in the underlying 
-	 * filter list.
-	 * @param subSystem the subsystem from which to get the filter references.
-	 */
-	public ISystemFilterReference[] getSystemFilterReferences(ISubSystem subSystem);
-
-	/**
-	 * Finds an existing filter in a particular subsystem.
-	 * @param subSystem the subsystem in which to look for the filter reference.
-	 * @param filter the filter for which to look.
-	 * @return an existing reference to a given system filter. 
-	 * If no reference currently exists to this filter, returns null.
-	 * @see #getSystemFilterReference(ISubSystem, ISystemFilter)
-	 */
-	public ISystemFilterReference getExistingSystemFilterReference(ISubSystem subSystem, ISystemFilter filter);
-
-	/**
-	 * Find or create a single filter refererence to a given filter.
-	 * If there already is a reference to this filter, in this subsystem it will be returned.
-	 * If not, a new reference is created and added at the end of the list of filter references.
-	 * @param subSystem the subsystem in which to find or create the filter.
-	 * @param filter the filter to for which to create a reference.
-	 * @see #getExistingSystemFilterReference(ISubSystem, ISystemFilter)
-	 */
-	public ISystemFilterReference getSystemFilterReference(ISubSystem subSystem, ISystemFilter filter);
-
-	/**
-	 * @return the name of the SystemFilter or SystemFilterPool that we reference.
-	 */
-	public String getName();
-
-	/**
-	 * @return true if this container has filters.
-	 */
-	public boolean hasFilters();
-
-	/**
-	 * @return the number of filters in the referenced container
-	 */
-	public int getFilterCount();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java
deleted file mode 100644
index 924610cdb..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - cleanup - format and javadoc
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.model.IRSEModelObject;
-import org.eclipse.rse.core.references.IRSEPersistableReferencedObject;
-
-/**
- * This interface represents a system filter pool, which is a means of
- * grouping filters to be referenced together.
- * @noimplement This interface is not intended to be implemented by clients.
- * The allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterPool extends IRSEPersistableReferencedObject, ISystemFilterContainer, IRSEModelObject {
-
-	/**
-	 * @return the object that instantiated the filter pool manager owning this filter pool
-	 */
-	public ISystemFilterPoolManagerProvider getProvider();
-
-	/**
-	 * @return true if filters in this pool support nested filters.
-	 */
-	public boolean supportsNestedFilters();
-
-	/**
-	 * @return true if filters in this pool supports duplicate filter strings.
-	 */
-	public boolean supportsDuplicateFilterStrings();
-
-	/**
-	 * @return true if the filters in this pool are case sensitive
-	 */
-	public boolean isStringsCaseSensitive();
-
-	/**
-	 * Set the filter pool manager for this filter pool. Should only be done when the filter
-	 * pool is created by the manager.
-	 * @param mgr the manager of this filter pool
-	 */
-	public void setSystemFilterPoolManager(ISystemFilterPoolManager mgr);
-
-	/**
-	 * @return the filter pool manager managing this collection of filter pools and their filters.
-	 */
-	public ISystemFilterPoolManager getSystemFilterPoolManager();
-
-	/**
-	 * Set a data object to be associated with this filter pool. This data is uninterpreted by this
-	 * filter pool.
-	 * @param data the data object
-	 */
-	public void setSystemFilterPoolData(Object data);
-
-	/**
-	 * @return the data object set using setFilterPoolData.
-	 */
-	public Object getSystemFilterPoolData();
-
-	/**
-	 * Clone the attributes from this filter pool into another filter pool.
-	 * Assumes the core attributes were already set when filter pool was created:
-	 * <ul>
-	 *   <li>Name
-	 *   <li>Deletable
-	 *   <li>Supports nested filters
-	 *   <li>Manager
-	 * </ul>
-	 * Attributes we clone:
-	 * <ul>
-	 *   <li>Data
-	 *   <li>Type
-	 *   <li>Default
-	 * </ul>
-	 * @param targetPool the filter pool that will receive the new attributes
-	 */
-	public void cloneSystemFilterPool(ISystemFilterPool targetPool) throws Exception;
-
-	/**
-	 * Copy a system filter to this or another filter pool.
-	 * @param targetPool the receiving pool
-	 * @param oldFilter the filter to copy
-	 * @param newName the name which to give the new copy of the filter
-	 * @return the newly created filter
-	 */
-	public ISystemFilter copySystemFilter(ISystemFilterPool targetPool, ISystemFilter oldFilter, String newName) throws Exception;
-
-	/**
-	 * Order filters according to the names in the list. Typically used to enforce
-	 * a particular ordering in the filter list. If a name appears in this list and
-	 * does not name a filter it is ignored. If there are filters in this pool that
-	 * are not named in this list their order in the pool is undefined.
-	 * @param names the names of the filters in this pool in the order they should be returned.
-	 */
-	public void orderSystemFilters(String[] names);
-
-	/**
-	 * @return the id of the filter pool. Used for referencing this filter pool from filter pool references.
-	 */
-	public String getId();
-
-	/**
-	 * @return The value of the Name attribute
-	 */
-	public String getName();
-
-	/**
-	 * Sets the filter pool name for this filter pool.
-	 * Filter pool names must not contain 3 consecutive underscores "___" since these are used to separate
-	 * profile names from filter pool names in a filter pool reference.
-	 * @param value The new value of the Name attribute.
-	 * @throws IllegalArgumentException if the name contains three consecutive underscore characters.
-	 */
-	public void setName(String value);
-
-	/**
-	 * @return The value of the Type attribute
-	 * Allows tools to have typed filter pools.
-	 * Type is not interpreted by the filter pool, but may be used by a subsystem.
-	 */
-	public String getType();
-
-	/**
-	 * @param value The new value of the Type attribute
-	 * Allows tools to have typed filter pools.
-	 * Type is not interpreted by the filter pool, but may be used by a subsystem.
-	 */
-	public void setType(String value);
-
-	/**
-	 * @return The value of the SupportsNestedFilters attribute
-	 */
-	public boolean isSupportsNestedFilters();
-
-	/**
-	 * @param value The new value of the SupportsNestedFilters attribute
-	 */
-	public void setSupportsNestedFilters(boolean value);
-
-	/**
-	 * @return The value of the Deletable attribute
-	 */
-	public boolean isDeletable();
-
-	/**
-	 * @param value The new value of the Deletable attribute
-	 */
-	public void setDeletable(boolean value);
-
-	/**
-	 * @return The value of the Default attribute
-	 * true if this is a vendor-supplied pool versus user-created pool
-	 */
-	public boolean isDefault();
-
-	/**
-	 * @param value The new value of the Default attribute
-	 */
-	public void setDefault(boolean value);
-
-	/**
-	 * Sets the attribute for this filter pool that determines whether strings of
-	 * filters contained in this pool are case sensitive or not. If not set
-	 * this attribute is inherited from the containing filter pool manager.
-	 * @param value The new value of the StringsCaseSensitive attribute
-	 */
-	public void setStringsCaseSensitive(boolean value);
-
-	/**
-	 * Unsets the StringsCaseSensitive attribute. Causes the case sensitivity of the
-	 * filter pool to be determined by its filter pool manager.
-	 */
-	public void unsetStringsCaseSensitive();
-
-	/**
-	 * @return <b>true</b> if the StringsCaseSensitive attribute has been set
-	 */
-	public boolean isSetStringsCaseSensitive();
-
-	/**
-	 * Return the filters in this pool.
-	 * 
-	 * @return An array of filters in this pool
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilter[] getFilters();
-
-	/**
-	 * @return The value of the SupportsDuplicateFilterStrings attribute
-	 */
-	public boolean isSupportsDuplicateFilterStrings();
-
-	/**
-	 * @param value The new value of the SupportsDuplicateFilterStrings attribute
-	 */
-	public void setSupportsDuplicateFilterStrings(boolean value);
-
-	/**
-	 * @return The value of the Release attribute
-	 * The release in which this filter pool was initially created.
-	 * Typically, will be the version and release times 10, as in 40 or 51.
-	 */
-	public int getRelease();
-
-	/**
-	 * @param value The new value of the Release attribute
-	 */
-	public void setRelease(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Single Filter String Only</b></em>' attribute.
-	 * <p>
-	 * If true then filters in this filter pool can have only a single filter string unless the
-	 * filter has overriden this attribute.
-	 * </p>
-	 * @return the value of the '<em>Single Filter String Only</em>' attribute.
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	public boolean isSingleFilterStringOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute.
-	 * If set to true filters in this filter pool can hold only a single filter string unless overridden by the filter itself.
-	 * If false then the filter may hold more than one filter string.
-	 * @param value the new value of the '<em>Single Filter String Only</em>' attribute.
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 */
-	public void setSingleFilterStringOnly(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute.
-	 * Causes the value of the single filter string attribute to be inherited from the containing filter pool manager.
-	 * @see #isSetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	public void unsetSingleFilterStringOnly();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute is set.
-	 * This will be true if this attribute has been set for this filter pool. It will be false if this
-	 * attribute is inherited from the filter pool manager.
-	 * @return whether the value of the '<em>Single Filter String Only</em>' attribute is set.
-	 * @see #unsetSingleFilterStringOnly()
-	 * @see #isSingleFilterStringOnly()
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	public boolean isSetSingleFilterStringOnly();
-
-	/**
-	 * Returns the value of the '<em><b>Owning Parent Name</b></em>' attribute.
-	 * <p>
-	 * If the meaning of the '<em>Owning Parent Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * @return the value of the '<em>Owning Parent Name</em>' attribute.
-	 * @see #setOwningParentName(String)
-	 */
-	public String getOwningParentName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#getOwningParentName <em>Owning Parent Name</em>}' attribute.
-	 * @param value the new value of the '<em>Owning Parent Name</em>' attribute.
-	 * @see #getOwningParentName()
-	 */
-	public void setOwningParentName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Non Renamable</b></em>' attribute.
-	 * <p>
-	 * If the meaning of the '<em>Non Renamable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * @return the value of the '<em>Non Renamable</em>' attribute.
-	 * @see #setNonRenamable(boolean)
-	 */
-	public boolean isNonRenamable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPool#isNonRenamable <em>Non Renamable</em>}' attribute.
-	 * @param value the new value of the '<em>Non Renamable</em>' attribute.
-	 * @see #isNonRenamable()
-	 */
-	public void setNonRenamable(boolean value);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java
deleted file mode 100644
index cba804178..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java
+++ /dev/null
@@ -1,644 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [197036] All filter pools created on clean workspace
- * cleaned javadoc for renameSystemFilterPool
- * David Dykstal (IBM) - [222270] clean up interfaces in org.eclipse.rse.core.filters
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import java.util.List;
-
-import org.eclipse.rse.core.model.IRSEPersistableContainer;
-import org.eclipse.rse.core.model.ISystemProfile;
-
-/**
- * A filter pool manager manages filter pools.
- * <p>
- * Further, this is the front door for working with filters too. By forcing all
- * filter related activity through a single point like this, we can ensure that
- * all changes are saved to disk, and events are fired properly.
- * 
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterPoolManager extends IRSEPersistableContainer {
-	// ---------------------------------
-	// ATTRIBUTE METHODS
-	// ---------------------------------
-	/**
-	 * Return the caller which instantiated the filter pool manager
-	 */
-	public ISystemFilterPoolManagerProvider getProvider();
-
-	/**
-	 * Return the owning profile for this provider
-	 */
-	public ISystemProfile getSystemProfile();
-
-	/**
-	 * Set the caller instance which instantiated the filter pool manager.
-	 * This is only recorded to enable getProvider from any filter framework object.
-	 */
-	public void setProvider(ISystemFilterPoolManagerProvider caller);
-
-	/**
-	 * This is to set transient data that is subsequently queryable.
-	 */
-	public void setSystemFilterPoolManagerData(Object data);
-
-	/**
-	 * Return transient data set via setFilterPoolDataManager.
-	 */
-	public Object getSystemFilterPoolManagerData();
-
-	/**
-	 * Return the name of this manager.
-	 * This matches the name of the folder, which is the parent of the individual filter pool folders.
-	 */
-	public String getName();
-
-	/**
-	 * Set the name of this manager.
-	 */
-	public void setName(String name);
-
-	/**
-	 * Return attribute indicating if filter pools managed by this manager support nested filters.
-	 */
-	public boolean supportsNestedFilters();
-
-	/**
-	 * Return attribute indicating if filters managed by this manager support nested duplicate filter strings.
-	 */
-	public boolean supportsDuplicateFilterStrings();
-
-	/**
-	 * Set attribute indicating if filter pools managed by this manager support nested filters, by default.
-	 */
-	public void setSupportsNestedFilters(boolean supports);
-
-	/**
-	 * Set attribute indicating if filters managed by this manager support duplicate filter strings, by default.
-	 */
-	public void setSupportsDuplicateFilterStrings(boolean supports);
-
-	/**
-	 * @return The value of the StringsCaseSensitive attribute
-	 * Are filter strings in this filter case sensitive?
-	 */
-	public boolean isStringsCaseSensitive();
-
-	/**
-	 * @return The value of the StringsCaseSensitive attribute
-	 * Are filter strings in this filter case sensitive?
-	 * Same as isStringsCaseSensitive()
-	 */
-	public boolean areStringsCaseSensitive();
-
-	/**
-	 * Return false if the instantiation of this filter pool manager resulting in a new manager versus a restoration
-	 */
-	public boolean wasRestored();
-
-	// ---------------------------------
-	// FILTER POOL METHODS
-	// ---------------------------------
-	/**
-	 * Get array of filter pool names currently existing.
-	 */
-	public String[] getSystemFilterPoolNames();
-
-	/**
-	 * Return array of SystemFilterPools managed by this manager.
-	 */
-	public ISystemFilterPool[] getSystemFilterPools();
-
-	/**
-	 * Given a filter pool name, return that filter pool object.
-	 * If not found, returns null.
-	 */
-	public ISystemFilterPool getSystemFilterPool(String name);
-
-	/**
-	 * Return the first pool that has the default attribute set to true.
-	 * If none found, returns null.
-	 */
-	public ISystemFilterPool getFirstDefaultSystemFilterPool();
-
-	/**
-	 * Create a new filter pool.
-	 * Inherits the following attributes from this manager:
-	 * <ul>
-	 *   <li>data ... the transient data to be associated with every filter pool and filter
-	 *   <li>supportsNestedFilters ... whether filters in the pool can themselves contain filters
-	 * </ul>
-	 * <p>
-	 * If a pool of this name already exists, null will be returned.
-	 * <p>
-	 * Depending on the save policy, a new folder to hold the pool may be created. Its name will
-	 *   be derived from the pool name.
-	 * <p>
-	 * If the operation is successful, the pool will be saved to disk.
-	 * <p>
-	 * If this operation fails unexpectedly, an exception will be thrown.
-	 * @see ISystemFilterPool#setName(String)
-	 */
-	public ISystemFilterPool createSystemFilterPool(String name, boolean isDeletable) throws Exception;
-
-	/**
-	 * Delete a given filter pool. Dependending on the save policy, the
-	 *  appropriate file or folder on disk will also be deleted.
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Removes all references
-	 *   <li>Removes pool object from in-memory model
-	 *   <li>Removes folder from disk for policies of one folder per pool
-	 *   <li>Removes file from disk for policy of one file per pool
-	 *   <li>Saves model to disk for policy of one file per manager
-	 *   <li>Invalidates in-memory caches
-	 *   <li>Calls back to inform caller of this event
-	 * </ul>
-	 * @param pool The filter pool object to physically delete
-	 */
-	public void deleteSystemFilterPool(ISystemFilterPool pool) throws Exception;
-
-	/**
-	 * Delete all existing filter pools. Call this when you are about to delete this manager, say.
-	 */
-	public void deleteAllSystemFilterPools();
-
-	/**
-	 * Pre-test if we are going to run into any trouble renaming any of the files or folders
-	 *  used to persist a filter pool.
-	 * @return true if everything seems ok, false if a file/folder is in use.
-	 */
-	public boolean preTestRenameFilterPool(ISystemFilterPool pool) throws Exception;
-
-	/**
-	 * Rename a filter pool.
-	 * <ul>
-	 * <li>Renames pool object
-	 * <li>Informs any filter pool references to this pool
-	 * <li>Schedules a save of the pool object
-	 * </ul>
-	 * @param pool The filter pool object to rename
-	 * @param newName The new name to give the pool
-	 * @see ISystemFilterPool#setName(String)
-	 */
-	public void renameSystemFilterPool(ISystemFilterPool pool, String newName) throws Exception;
-
-	/**
-	 * Copy the specified filter pool from this manager to this manager or another manager.
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Clones all filters within the pool
-	 *   <li>Clones all filter strings within each filter
-	 *   <li>Asks target manager to save to disk
-	 *   <li>Calls back to target manager provider, unless callbacks are suspended
-	 * </ul>
-	 * @param targetMgr The target manager to copy our filter pool to. Can be this manager, but target pool name must be unique.
-	 * @param pool The filter pool to copy
-	 * @param newName The new name to give the copied pool
-	 * @return the new copy of the copied system filter pool
-	 * @see ISystemFilterPool#setName(String)
-	 */
-	public ISystemFilterPool copySystemFilterPool(ISystemFilterPoolManager targetMgr, ISystemFilterPool pool, String newName) throws Exception;
-
-	/**
-	 * Copy all filter pools from this manager to another manager.
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Clones all filter pools
-	 *   <li>Clones all filters within each pool
-	 *   <li>Clones all filter strings within each filter
-	 *   <li>Asks target manager to save to disk
-	 *   <li>Does not callback to caller to fire events, assumes caller doesn't want to know
-	 * </ul>
-	 * @param targetMgr The target manager to copy our filter pools to
-	 */
-	public void copySystemFilterPools(ISystemFilterPoolManager targetMgr) throws Exception;
-
-	/**
-	 * Move the specified filter pool from this manager to another manager.
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Performs a {@link #copySystemFilterPool(ISystemFilterPoolManager, ISystemFilterPool, String) copySystemFilterPool} operation.
-	 *   <li>If copy is successful, updates all references to reference the new copy.
-	 *   <li>If copy is successful, deletes original filter pool in this manager
-	 *   <li>If this final delete fails, deletes the copied version and restore original references
-	 *   <li>Asks target manager to save to disk
-	 *   <li>Saves this manager to disk
-	 *   <li>Calls back to both targer manager provider and this manager provider, unless callbacks are suspended
-	 * </ul>
-	 * @param targetMgr The target manager to move our filter pool to. Cannot be this manager.
-	 * @param oldPool The filter pool to move
-	 * @param newName The new name to give the moved pool
-	 * @return the new copy of the moved system filter pool
-	 * @see ISystemFilterPool#setName(String)
-	 */
-	public ISystemFilterPool moveSystemFilterPool(ISystemFilterPoolManager targetMgr, ISystemFilterPool oldPool, String newName) throws Exception;
-
-	// ---------------------------------
-	// FILTER METHODS
-	// ---------------------------------
-	/**
-	 * Creates a new system filter within the given filter container (either a
-	 * filter pool, or a filter). This creates the filter, and then saves the
-	 * filter pool.
-	 * <p>
-	 * Calls back to provider to inform of the event (filterEventFilterCreated)
-	 * 
-	 * @param parent The parent which is either a SystemFilterPool or a
-	 *            SystemFilter
-	 * @param aliasName The name to give the new filter. Must be unique for this
-	 *            pool.
-	 * @param filterStrings The list of String objects that represent the filter
-	 *            strings.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, String[] filterStrings) throws Exception;
-
-	/**
-	 * Creates a new system filter within the given filter container (either a
-	 * filter pool, or a filter). This creates the filter, and then saves the
-	 * filter pool.
-	 * <p>
-	 * Calls back to provider to inform of the event (filterEventFilterCreated)
-	 * 
-	 * @param parent The parent which is either a SystemFilterPool or a
-	 *            SystemFilter
-	 * @param aliasName The name to give the new filter. Must be unique for this
-	 *            pool.
-	 * @param filterStrings The list of String objects that represent the filter
-	 *            strings.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, List filterStrings) throws Exception;
-
-	/**
-	 * Creates a new system filter that is typed. Same as
-	 * {@link #createSystemFilter(ISystemFilterContainer, String, String[])} but
-	 * takes a filter type as an additional parameter.
-	 * <p>
-	 * A filter's type is an arbitrary string that is not interpreted or used by
-	 * the base framework. This is for use entirely by tools who wish to support
-	 * multiple types of filters and be able to launch unique actions per type,
-	 * say.
-	 * 
-	 * @param parent The parent which is either a SystemFilterPool or a
-	 *            SystemFilter
-	 * @param aliasName The name to give the new filter. Must be unique for this
-	 *            pool.
-	 * @param filterStrings The list of String objects that represent the filter
-	 *            strings.
-	 * @param type The type of this filter
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, String[] filterStrings, String type) throws Exception;
-
-	/**
-	 * Creates a new system filter that is typed. Same as
-	 * {@link #createSystemFilter(ISystemFilterContainer, String, String[])} but
-	 * takes a filter type as an additional parameter.
-	 * <p>
-	 * A filter's type is an arbitrary string that is not interpreted or used by
-	 * the base framework. This is for use entirely by tools who wish to support
-	 * multiple types of filters and be able to launch unique actions per type,
-	 * say.
-	 * 
-	 * @param parent The parent which is either a SystemFilterPool or a
-	 *            SystemFilter
-	 * @param aliasName The name to give the new filter. Must be unique for this
-	 *            pool.
-	 * @param filterStrings The list of String objects that represent the filter
-	 *            strings.
-	 * @param type The type of this filter
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, List filterStrings, String type) throws Exception;
-
-	/**
-	 * Creates a new system filter that is typed and promptable Same as
-	 * {@link #createSystemFilter(ISystemFilterContainer, String ,String[], String)}
-	 * but takes a boolean indicating if it is promptable.
-	 * <p>
-	 * A promptable filter is one in which the user is prompted for information
-	 * at expand time. There is no base filter framework support for this, but
-	 * tools can query this attribute and do their own thing at expand time.
-	 * 
-	 * @param parent The parent which is either a SystemFilterPool or a
-	 *            SystemFilter
-	 * @param aliasName The name to give the new filter. Must be unique for this
-	 *            pool.
-	 * @param filterStrings The list of String objects that represent the filter
-	 *            strings.
-	 * @param type The type of this filter
-	 * @param promptable Pass true if this is a promptable filter
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, String[] filterStrings, String type, boolean promptable) throws Exception;
-
-	/**
-	 * Creates a new system filter that is typed and promptable Same as
-	 * {@link #createSystemFilter(ISystemFilterContainer, String ,String[], String)}
-	 * but takes a boolean indicating if it is promptable.
-	 * <p>
-	 * A promptable filter is one in which the user is prompted for information
-	 * at expand time. There is no base filter framework support for this, but
-	 * tools can query this attribute and do their own thing at expand time.
-	 * 
-	 * @param parent The parent which is either a SystemFilterPool or a
-	 *            SystemFilter
-	 * @param aliasName The name to give the new filter. Must be unique for this
-	 *            pool.
-	 * @param filterStrings The list of String objects that represent the filter
-	 *            strings.
-	 * @param type The type of this filter
-	 * @param promptable Pass true if this is a promptable filter
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilter createSystemFilter(ISystemFilterContainer parent, String aliasName, List filterStrings, String type, boolean promptable) throws Exception;
-
-	/**
-	 * Delete an existing system filter.
-	 * Does the following:
-	 * <ul>
-	 *   <li>Removes filter from its parent in memory.
-	 *   <li>If appropriate for the save policy, deletes the filter's file from disk.
-	 *   <li>Save the SystemFilterPool which direct or indirectly contains the filter.
-	 *   <li>Calls back to provider to inform of the event (filterEventFilterDelete)
-	 * </ul>
-	 */
-	public boolean deleteSystemFilter(ISystemFilter filter) throws Exception;
-
-	/**
-	 * Renames a filter. This is better than filter.setName(String newName) as it
-	 *  saves the parent pool to disk.
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Renames the object in the in-memory cache
-	 *   <li>If appropriate for the save policy, rename's the filter's file on disk.
-	 *   <li>Save parent filter pool's in-memory object to disk.
-	 *   <li>Calls back to provider to inform of the event (filterEventFilterRenamed)
-	 * </ul>
-	 */
-	public void renameSystemFilter(ISystemFilter filter, String newName) throws Exception;
-
-	/**
-	 * Updates a filter. This is better than doing it directly as it saves it to disk.
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Updates the object in the in-memory cache
-	 *   <li>Save parent filter pool's in-memory object to disk.
-	 *   <li>Calls back to provider to inform of the event (filterEventFilterUpdated). Will be two callbacks if the name is changed ((filterEventFilterRenamed)
-	 * </ul>
-	 */
-	public void updateSystemFilter(ISystemFilter filter, String newName, String[] strings) throws Exception;
-
-	/**
-	 * Sets a filter's type. This is better than calling filter.setType(String) directly as it saves the filter to disk after.
-	 * <p>
-	 * A filter's type is an arbitrary string that is not interpreted or used by the base framework. This
-	 * is for use entirely by tools who wish to support multiple types of filters and be able to launch unique
-	 * actions per type, say.
-	 * @param filter The parent which is either a SystemFilter
-	 * @param newType The type of this filter
-	 */
-	public void setSystemFilterType(ISystemFilter filter, String newType) throws Exception;
-
-	/**
-	 * Copy a system filter to a pool in this or another filter manager.
-	 */
-	public ISystemFilter copySystemFilter(ISystemFilterPool targetPool, ISystemFilter oldFilter, String newName) throws Exception;
-
-	/**
-	 * Return the zero-based position of a SystemFilter object within its container
-	 */
-	public int getSystemFilterPosition(ISystemFilter filter);
-
-	/**
-	 * Move a system filter to a pool in this or another filter manager.
-	 * Does this by first copying the filter, and only if successful, deleting the old copy.
-	 */
-	public ISystemFilter moveSystemFilter(ISystemFilterPool targetPool, ISystemFilter oldFilter, String newName) throws Exception;
-
-	/**
-	 * Move existing filters a given number of positions in the same container.
-	 * If the delta is negative, they are all moved up by the given amount. If
-	 * positive, they are all moved down by the given amount.<p>
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>After the move, the pool containing the filter is saved to disk.
-	 *   <li>Calls back to provider to inform of the event (filterEventFiltersRePositioned)
-	 * </ul>
-	 * @param filters Array of SystemFilters to move.
-	 * @param delta the amount by which to move the filters
-	 */
-	public void moveSystemFilters(ISystemFilter filters[], int delta) throws Exception;
-
-	/**
-	 * Order filters according to user preferences.
-	 * <p>
-	 * While the framework has all the code necessary to arrange filters and save/restore
-	 * that arrangement, you may choose to use preferences instead of this support.
-	 * In this case, call this method and pass in the saved and sorted filter name list.
-	 * <p>
-	 * Called by someone after restore.
-	 */
-	public void orderSystemFilters(ISystemFilterPool pool, String[] names) throws Exception;
-
-	// -------------------------------
-	// SYSTEM FILTER STRING METHODS...
-	// -------------------------------
-	/**
-	 * Append a new filter string to the given filter's list
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Adds the filter string to the in-memory cache
-	 *   <li>Saves parent filter pool to disk.
-	 *   <li>Calls back to provider to inform it of this event (filterEventFilterStringCreated)
-	 * </ul>
-	 */
-	public ISystemFilterString addSystemFilterString(ISystemFilter filter, String newString) throws Exception;
-
-	/**
-	 * Insert a new filter string to the given filter's list, at the given zero-based position
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Adds the filter string to the in-memory cache
-	 *   <li>Saves parent filter pool to disk.
-	 *   <li>Calls back to provider to inform it of this event (filterEventFilterStringCreated)
-	 * </ul>
-	 */
-	public ISystemFilterString addSystemFilterString(ISystemFilter filter, String newString, int position) throws Exception;
-
-	/**
-	 * Remove a filter string from this filter's list, given its SystemFilterString object.
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Removes the filter string from the in-memory cache
-	 *   <li>Saves parent filter pool to disk.
-	 *   <li>Calls back to provider to inform it of this event (filterEventFilterStringDeleted)
-	 * </ul>
-	 * @return true if the given string existed and hence was deleted.
-	 */
-	public boolean removeSystemFilterString(ISystemFilter filter, ISystemFilterString filterString) throws Exception;
-
-	/**
-	 * Delete a filter string from the given filter's list
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Removes the filter string from the in-memory cache
-	 *   <li>Saves parent filter pool to disk.
-	 *   <li>Calls back to provider to inform it of this event (filterEventFilterStringDeleted)
-	 * </ul>
-	 * @return true if given string was found and hence was deleted.
-	 */
-	public boolean removeSystemFilterString(ISystemFilter filter, String oldString) throws Exception;
-
-	/**
-	 * Remove a filter string from the given filter's list, given its zero-based position
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Removes the filter string from the in-memory cache
-	 *   <li>Saves parent filter pool to disk.
-	 *   <li>Calls back to provider to inform it of this event (filterEventFilterStringDeleted)
-	 * </ul>
-	 * @return true if a string existed at the given position and hence was deleted.
-	 */
-	public boolean removeSystemFilterString(ISystemFilter filter, int position) throws Exception;
-
-	/**
-	 * Update a filter string's string vale
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>Update the filter string in the in-memory cache
-	 *   <li>Saves parent filter pool to disk.
-	 *   <li>Calls back to provider to inform it of this event (filterEventFilterStringUpdated)
-	 * </ul>
-	 */
-	public void updateSystemFilterString(ISystemFilterString filterString, String newValue) throws Exception;
-
-	/**
-	 * Return the zero-based position of a SystemFilterString object within its filter
-	 */
-	public int getSystemFilterStringPosition(ISystemFilterString filterString);
-
-	/**
-	 * Copy a system filter string to a filter in this or another filter pool manager.
-	 */
-	public ISystemFilterString copySystemFilterString(ISystemFilter targetFilter, ISystemFilterString oldFilterString) throws Exception;
-
-	/**
-	 * Move a system filter string to a filter in this or another filter pool manager.
-	 * Does this by doing a copy operation, then if successful doing a delete operation.
-	 */
-	public ISystemFilterString moveSystemFilterString(ISystemFilter targetFilter, ISystemFilterString oldFilterString) throws Exception;
-
-	/**
-	 * Move existing filter strings a given number of positions in the same filter
-	 * If the delta is negative, they are all moved up by the given amount. If
-	 * positive, they are all moved down by the given amount.<p>
-	 * <p>
-	 * Does the following:
-	 * <ul>
-	 *   <li>After the move, the filter pool containing the filter containing the filter strings is saved to disk.
-	 *   <li>Calls back to provider to inform of the event (filterEventFilterStringsRePositioned)
-	 * </ul>
-	 * @param filterStrings Array of SystemFilterStrings to move.
-	 * @param delta the amount by which to move the filters
-	 */
-	public void moveSystemFilterStrings(ISystemFilterString filterStrings[], int delta) throws Exception;
-
-	// -----------------------------------
-	// SUSPEND/RESUME CALLBACKS METHODS...
-	// -----------------------------------
-	/**
-	 * Suspend callbacks to the provider
-	 */
-	public void suspendCallbacks(boolean suspend);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the SupportsNestedFilters attribute
-	 */
-	boolean isSupportsNestedFilters();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value The new value of the StringsCaseSensitive attribute
-	 */
-	void setStringsCaseSensitive(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return The value of the SupportsDuplicateFilterStrings attribute
-	 */
-	boolean isSupportsDuplicateFilterStrings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * Unsets the SupportsDuplicateFilterStrings attribute
-	 */
-	void unsetSupportsDuplicateFilterStrings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return <b>true</b> if the SupportsDuplicateFilterStrings attribute has been set
-	 */
-	boolean isSetSupportsDuplicateFilterStrings();
-
-	/**
-	 * Returns the value of the '<em><b>Single Filter String Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Single Filter String Only</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Single Filter String Only</em>' attribute.
-	 * @see #setSingleFilterStringOnly(boolean)
-	 */
-	boolean isSingleFilterStringOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.rse.core.filters.ISystemFilterPoolManager#isSingleFilterStringOnly <em>Single Filter String Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Single Filter String Only</em>' attribute.
-	 * @see #isSingleFilterStringOnly()
-	 * @generated
-	 */
-	void setSingleFilterStringOnly(boolean value);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java
deleted file mode 100644
index 8f5a56c5f..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * An interface for classes that instantiate SystemFilterPoolManager objects.
- * This is the "caller" and as is recorded and recoverable from any object within
- * the filter framework. This enables callers to get back instances of themselves
- * given any filter object. Important when enabling UI actions against user
- * selected filter framework objects
- * <p>
- * Further, the goal is the allow all the filter framework UI actions to work 
- * independently, able to fully handle all actions without intervention on the
- * provider's part. However, often the provider needs to be informed of all events
- * in order to fire events to update its GUI. So this interface captures those 
- * callbacks that done to the provider for every interesting event. Should you 
- * not care about these, supply empty shells for these methods.
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterPoolManagerProvider extends IAdaptable {
-
-	/**
-	 * Return the unique id for this provider
-	 * @return the id
-	 */
-	public String getId();
-
-	/**
-	 * Return the manager object for the given manager name.
-	 */
-	public ISystemFilterPoolManager getSystemFilterPoolManager(String managerName);
-
-	/**
-	 * Return all the manager objects this provider owns
-	 */
-	public ISystemFilterPoolManager[] getSystemFilterPoolManagers();
-
-	/**
-	 * Return all the manager objects this provider owns, to which it wants 
-	 *  to support referencing from the given filter reference manager.
-	 * <p>
-	 * Called by SystemFilterPoolReferenceManager.
-	 */
-	public ISystemFilterPoolManager[] getReferencableSystemFilterPoolManagers(ISystemFilterPoolReferenceManager refMgr);
-
-	/**
-	 * Last chance call, by a filter pool reference manager, when a reference to a filter
-	 * pool is found but the referenced master filter pool is not found in those the reference
-	 * manager by getSystemFilterPoolManagers().
-	 * <p>
-	 * If this returns null, then this broken reference will be deleted
-	 */
-	public ISystemFilterPool getSystemFilterPoolForBrokenReference(ISystemFilterPoolReferenceManager callingRefenceMgr, String missingPoolMgrName, String missingPoolName);
-
-	// ---------------------
-	// FILTER POOL EVENTS...
-	// ---------------------
-	/**
-	 * A new filter pool has been created
-	 */
-	public void filterEventFilterPoolCreated(ISystemFilterPool newPool);
-
-	/**
-	 * A filter pool has been deleted
-	 */
-	public void filterEventFilterPoolDeleted(ISystemFilterPool oldPool);
-
-	/**
-	 * A filter pool has been renamed
-	 */
-	public void filterEventFilterPoolRenamed(ISystemFilterPool pool, String oldName);
-
-	/**
-	 * One or more filter pools have been re-ordered within their manager
-	 */
-	public void filterEventFilterPoolsRePositioned(ISystemFilterPool[] pools, int delta);
-
-	// ---------------------
-	// FILTER EVENTS...
-	// ---------------------
-	/**
-	 * A new filter has been created
-	 */
-	public void filterEventFilterCreated(ISystemFilter newFilter);
-
-	/**
-	 * A filter has been deleted
-	 */
-	public void filterEventFilterDeleted(ISystemFilter oldFilter);
-
-	/**
-	 * A filter has been renamed
-	 */
-	public void filterEventFilterRenamed(ISystemFilter filter, String oldName);
-
-	/**
-	 * A filter's strings have been updated
-	 */
-	public void filterEventFilterUpdated(ISystemFilter filter);
-
-	/**
-	 * One or more filters have been re-ordered within their pool or filter (if nested)
-	 */
-	public void filterEventFiltersRePositioned(ISystemFilter[] filters, int delta);
-
-	// -----------------------
-	// FILTER STRING EVENTS...
-	// -----------------------
-	/**
-	 * A new filter string has been created
-	 */
-	public void filterEventFilterStringCreated(ISystemFilterString newFilterString);
-
-	/**
-	 * A filter string has been deleted
-	 */
-	public void filterEventFilterStringDeleted(ISystemFilterString oldFilterString);
-
-	/**
-	 * A filter string has been updated
-	 */
-	public void filterEventFilterStringUpdated(ISystemFilterString filterString);
-
-	/**
-	 * One or more filters have been re-ordered within their filter
-	 */
-	public void filterEventFilterStringsRePositioned(ISystemFilterString[] filterStrings, int delta);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java
deleted file mode 100644
index 53ab4dee8..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.model.IRSEModelObject;
-import org.eclipse.rse.core.references.IRSEPersistableReferencingObject;
-
-/**
- * Interface implemented by references to filter pools. Filter pools are stored at the profile
- * level, while subsystems contain references to one or more pools. A pool can be referenced
- * by multiple connections. Pools don't go away until explicitly deleted by the user, regardless
- * of their reference count.
- * @noimplement This interface is not intended to be implemented by clients.
- * The allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterPoolReference extends IRSEPersistableReferencingObject, ISystemFilterContainerReference, IRSEModelObject {
-	/**
-	 * @return the reference manager which is managing this filter pool reference
-	 */
-	public ISystemFilterPoolReferenceManager getFilterPoolReferenceManager();
-
-	/**
-	 * @return the object which instantiated the pool reference manager object.
-	 * Makes it easy to get back to the point of origin, given any filter pool reference.
-	 */
-	public ISystemFilterPoolReferenceManagerProvider getProvider();
-
-	/**
-	 * @return the simple name of the filter pool we reference. Not qualified by the manager name.
-	 */
-	public String getReferencedFilterPoolName();
-
-	/**
-	 * @return name of the filter pool manager containing the pool we reference.
-	 */
-	public String getReferencedFilterPoolManagerName();
-
-	/**
-	 * Reset the name of the filter pool we reference. 
-	 * Called on filter pool rename operations.
-	 * @param newName the new name of the filer pool
-	 */
-	public void resetReferencedFilterPoolName(String newName);
-
-	/**
-	 * Set the filter pool that we reference.
-	 * This should also call addReference(this) on that pool.
-	 * @param pool the pool to which this reference refers.
-	 */
-	public void setReferenceToFilterPool(ISystemFilterPool pool);
-
-	/**
-	 * @return referenced filter pool object. 
-	 * This may be null if the reference is broken
-	 * or is yet to be resolved.
-	 */
-	public ISystemFilterPool getReferencedFilterPool();
-
-	/**
-	 * @return the fully qualified name that includes the name of the filter pool manager
-	 */
-	public String getFullName();
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java
deleted file mode 100644
index 7427cab08..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.references.IRSEBasePersistableReferenceManager;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * This class manages a persistable list of objects each of which reference
- * a filter pool. This class builds on the parent class SystemPersistableReferenceManager,
- * offering convenience versions of the parent methods that are typed to the
- * classes in the filters framework.
- * @noimplement This interface is not intended to be implemented by clients.
- * The allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterPoolReferenceManager extends IRSEBasePersistableReferenceManager {
-	/**
-	 * Get the object which instantiated this instance of the filter pool reference manager.
-	 * This is also available from any filter reference framework object.
-	 */
-	public ISystemFilterPoolReferenceManagerProvider getProvider();
-
-	/**
-	 * Set the object which instantiated this instance of the filter pool reference manager.
-	 * This makes it available to retrieve from any filter reference framework object,
-	 * via the ubiquitous getProvider interface method.
-	 */
-	public void setProvider(ISystemFilterPoolReferenceManagerProvider caller);
-
-	/**
-	 * Turn off callbacks to the provider until turned on again.
-	 */
-	public void setProviderEventNotification(boolean fireEvents);
-
-	// ------------------------------------------------------------
-	// Methods for setting and querying related filterpool manager
-	// ------------------------------------------------------------
-	/*
-	 * Set the managers of the master list of filter pools, from which
-	 *  objects in this list reference.
-	 * NOW DELETED SO THAT WE DYNAMICALLY QUERY THIS LIST FROM THE
-	 * ASSOCIATED SYSTEMFILTERPOOLMANAGER PROVIDER, SO IT IS ALWAYS UP
-	 * TO DATE. psc.
-	 */
-	//public void setSystemFilterPoolManagers(SystemFilterPoolManager[] mgrs);
-	/**
-	 * Set the associated master pool manager provider. Note the provider
-	 *  typically manages multiple pool managers and we manage references
-	 *  across those.
-	 */
-	public void setSystemFilterPoolManagerProvider(ISystemFilterPoolManagerProvider poolMgrProvider);
-
-	/**
-	 * Get the associated master pool manager provider. Note the provider
-	 *  typically manages multiple pool managers and we manage references
-	 *  across those.
-	 */
-	public ISystemFilterPoolManagerProvider getSystemFilterPoolManagerProvider();
-
-	/**
-	 * Get the managers of the master list of filter pools, from which
-	 *  objects in this list reference.
-	 */
-	public ISystemFilterPoolManager[] getSystemFilterPoolManagers();
-
-	/**
-	 * Get the managers of the master list of filter pools, from which
-	 *  objects in this list reference, but which are not in the list of
-	 *  managers our pool manager supplier gives us. That is, these are
-	 *  references to filter pools outside the expected list.
-	 * @return null if no unmatched managers found, else an array of such managers.
-	 */
-	public ISystemFilterPoolManager[] getAdditionalSystemFilterPoolManagers();
-
-	/**
-	 * Set the default manager of the master list of filter pools, from which
-	 *  objects in this list reference.
-	 */
-	public void setDefaultSystemFilterPoolManager(ISystemFilterPoolManager mgr);
-
-	/**
-	 * Get the default manager of the master list of filter pools, from which
-	 *  objects in this list reference.
-	 */
-	public ISystemFilterPoolManager getDefaultSystemFilterPoolManager();
-
-	// ---------------------------------------------------
-	// Methods that work on FilterPool referencing objects
-	// ---------------------------------------------------
-	/**
-	 * Ask each referenced pool for its name, and update it.
-	 * Called after the name of the pool or its manager changes.
-	 */
-	public void regenerateReferencedSystemFilterPoolNames();
-
-	/**
-	 * Return array of SystemFilterPoolReference objects.
-	 * Result will never be null, although it may be an array of length zero.
-	 */
-	public ISystemFilterPoolReference[] getSystemFilterPoolReferences();
-
-	/**
-	 * In one shot, set the filter pool references
-	 * <p> Calls back to inform provider
-	 * @param filterPoolReferences of filter pool reference objects to set the list to.
-	 * @param deReference true to first de-reference all objects in the existing list.
-	 */
-	public void setSystemFilterPoolReferences(ISystemFilterPoolReference[] filterPoolReferences, boolean deReference);
-
-	/**
-	 * Add a filter pool referencing object to the list.
-	 * @return the new count of referencing objects
-	 */
-	public int addSystemFilterPoolReference(ISystemFilterPoolReference filterPoolReference);
-
-	/**
-	 * Reset the filter pool a reference points to. Called on a move-filter-pool operation
-	 */
-	public void resetSystemFilterPoolReference(ISystemFilterPoolReference filterPoolReference, ISystemFilterPool newPool);
-
-	/**
-	 * Remove a filter pool referencing object from the list.
-	 * @param filterPoolReference the reference to remove
-	 * @param deReference true if we want to dereference the referenced object (call removeReference on it)
-	 * @return the new count of referencing objects
-	 */
-	public int removeSystemFilterPoolReference(ISystemFilterPoolReference filterPoolReference, boolean deReference);
-
-	/**
-	 * Return count of referenced filter pools
-	 */
-	public int getSystemFilterPoolReferenceCount();
-
-	/**
-	 * Return the zero-based position of a SystemFilterPoolReference object within this list
-	 */
-	public int getSystemFilterPoolReferencePosition(ISystemFilterPoolReference filterPoolRef);
-
-	/**
-	 * Move a given filter pool reference to a given zero-based location
-	 * <p> Calls back to inform provider
-	 */
-	public void moveSystemFilterPoolReference(ISystemFilterPoolReference filterPoolRef, int pos);
-
-	/**
-	 * Move existing filter pool references a given number of positions.
-	 * If the delta is negative, they are all moved up by the given amount. If
-	 * positive, they are all moved down by the given amount.<p>
-	 * <p> Calls back to inform provider
-	 * @param filterPoolRefs Array of SystemFilterPoolReferences to move.
-	 * @param delta the amount by which to move the filter pool references.
-	 */
-	public void moveSystemFilterPoolReferences(ISystemFilterPoolReference[] filterPoolRefs, int delta);
-
-	// ----------------------------------------------
-	// Methods that work on FilterPool master objects
-	// ----------------------------------------------
-	/**
-	 * Return array of filter pools currently referenced by this manager
-	 * Result will never be null, although it may be an array of length zero.
-	 */
-	public ISystemFilterPool[] getReferencedSystemFilterPools();
-
-	/**
-	 * Return true if the given filter pool has a referencing object in this list.
-	 */
-	public boolean isSystemFilterPoolReferenced(ISystemFilterPool filterPool);
-
-	/**
-	 * Given a filter pool, locate the referencing object for it and return it.
-	 * @return the referencing object if found, else null
-	 */
-	public ISystemFilterPoolReference getReferenceToSystemFilterPool(ISystemFilterPool filterPool);
-
-	/**
-	 * Given a filter pool, create a referencing object and add it to the list.
-	 * <p> Calls back to inform provider
-	 * @return new filter pool reference
-	 */
-	public ISystemFilterPoolReference addReferenceToSystemFilterPool(ISystemFilterPool filterPool);
-
-	/**
-	 * Given a filter pool name, create a referencing object and add it to the list.
-	 * This creates an unresolved reference to that filter pool. It will be resolved on first use.
-	 * <p> Calls back to inform provider
-	 * @param filterPoolName the name of the filter pool being referenced.
-	 * @return new filter pool reference
-	 */
-	public ISystemFilterPoolReference addReferenceToSystemFilterPool(String filterPoolName);
-
-	/**
-	 * Given a filter pool, locate the referencing object for it and remove it from the list.
-	 * <p> Calls back to inform provider
-	 * @return the new count of referencing objects
-	 */
-	public int removeReferenceToSystemFilterPool(ISystemFilterPool filterPool);
-
-	/**
-	 * A reference filter pool has been renamed. Update our stored name...
-	 * <p> Calls back to inform provider
-	 */
-	public void renameReferenceToSystemFilterPool(ISystemFilterPool pool);
-
-	/**
-	 * In one shot, set the filter pool references to new references to supplied filter pools.
-	 * <p> Calls back to inform provider
-	 * @param filterPools of filter pool objects to create references for
-	 * @param deReference true to first de-reference all objects in the existing list.
-	 */
-	public void setSystemFilterPoolReferences(ISystemFilterPool[] filterPools, boolean deReference);
-
-	// -------------------------
-	// SPECIAL CASE METHODS
-	// -------------------------
-	/**
-	 * Create a single filter refererence to a given filter. Needed when a filter
-	 *  is added to a pool, and the GUI is not showing pools but rather all filters
-	 *  in all pool references.
-	 */
-	public ISystemFilterReference getSystemFilterReference(ISubSystem subSystem, ISystemFilter filter);
-
-	/**
-	 * Concatenate all filter references from all filter pools we reference, into one
-	 * big list.
-	 */
-	public ISystemFilterReference[] getSystemFilterReferences(ISubSystem subSystem);
-
-	/**
-	 * Given a filter reference, return its position within this reference manager
-	 *  when you think of all filter references from all filter pool references as
-	 *  being concatenated
-	 */
-	public int getSystemFilterReferencePosition(ISystemFilterReference filterRef);
-
-	/**
-	 * Given a filter, return its position within this reference manager
-	 *  when you think of all filter references from all filter pool references as
-	 *  being concatenated
-	 */
-	public int getSystemFilterReferencePosition(ISubSystem subSystem, ISystemFilter filter);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java
deleted file mode 100644
index 2f3ecd817..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-/**
- * An interface for classes that instantiate SystemFilterPoolReferenceManager objects.
- * This is the "caller" and as is recorded and recoverable from any object within
- * the filter reference framework. This enables callers to get back instances of themselves
- * given any filter reference object. Important when enabling UI actions against user
- * selected filter reference framework objects
- * <p>
- * Further, the goal is the allow all the filter framework UI actions to work 
- * independently, able to fully handle all actions without intervention on the
- * provider's part. However, often the provider needs to be informed of all events
- * in order to fire events to update its GUI. So this interface captures those 
- * callbacks that done to the provider for every interesting event. Should you 
- * not care about these, supply empty shells for these methods.
- * @noimplement This interface is not intended to be implemented by clients.
- * The allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterPoolReferenceManagerProvider {
-	/**
-	 * Return the SystemFilterPoolReferenceManager object this provider holds/provides.
-	 */
-	public ISystemFilterPoolReferenceManager getSystemFilterPoolReferenceManager();
-
-	/**
-	 * Return the owning filter pool that is unique to this provider
-	 */
-	public ISystemFilterPool getUniqueOwningSystemFilterPool(boolean createIfNotFound);
-
-	// -------------------------------
-	// FILTER POOL REFERENCE EVENTS...
-	// -------------------------------
-	/**
-	 * A new filter pool reference has been created
-	 */
-	public void filterEventFilterPoolReferenceCreated(ISystemFilterPoolReference newPoolRef);
-
-	/**
-	 * A filter pool reference has been deleted
-	 */
-	public void filterEventFilterPoolReferenceDeleted(ISystemFilterPoolReference filterPoolRef);
-
-	/**
-	 * A single filter pool reference has been reset to reference a new pool
-	 */
-	public void filterEventFilterPoolReferenceReset(ISystemFilterPoolReference filterPoolRef);
-
-	/**
-	 * All filter pool references has been reset
-	 */
-	public void filterEventFilterPoolReferencesReset();
-
-	/**
-	 * A filter pool reference has been renamed (ie, its reference filter pool renamed)
-	 */
-	public void filterEventFilterPoolReferenceRenamed(ISystemFilterPoolReference poolRef, String oldName);
-
-	/**
-	 * One or more filter pool references have been re-ordered within their manager
-	 */
-	public void filterEventFilterPoolReferencesRePositioned(ISystemFilterPoolReference[] poolRefs, int delta);
-
-	// -------------------------------
-	// FILTER REFERENCE EVENTS...
-	// -------------------------------
-	/**
-	 * A new filter has been created. This is called when a filter pool reference is selected and a new filter
-	 *  is created, so that the provider can expand the selected filter pool reference and reveal the new filter 
-	 *  within the selected pool reference. 
-	 * <p>
-	 * Only the selected node should be expanded if not already. All other references to this pool will already
-	 * have been informed of the new addition, and will have refreshed their children but not expanded them.
-	 */
-	public void filterEventFilterCreated(Object selectedObject, ISystemFilter newFilter);
-
-	// ---------------------------------
-	// FILTER STRING REFERENCE EVENTS...
-	// ---------------------------------
-	/**
-	 * A new filter string has been created. This is called when a filter reference is selected and a new filter
-	 *  string is created, so that the provider can expand the selected filter reference and reveal the new filter 
-	 *  string within the selected filter reference. 
-	 * <p>
-	 * Only the selected node should be expanded if not already. All other references to this filter will already
-	 * have been informed of the new addition, and will have refreshed their children but not expanded them.
-	 */
-	public void filterEventFilterStringCreated(Object selectedObject, ISystemFilterString newFilterString);
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java
deleted file mode 100644
index 79f7994e6..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-
-/**
- * An interface required if you wish to be called back by the system filter
- * wizard, when the user selects a target filter pool.
- * 
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterPoolSelectionValidator {
-
-	/**
-	 * Delimiter used to qualify filter names by filter pool name, when calling
-	 *  filter pool selection validator in new filter wizard.
-	 */
-	public static final String DELIMITER_FILTERPOOL_FILTER = "_____"; //$NON-NLS-1$
-
-	/**
-	 * Validate the given selection.
-	 * @param filterPool the user-selected filter pool
-	 * @return null if no error, else a SystemMessage
-	 */
-	public SystemMessage validate(ISystemFilterPool filterPool);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java
deleted file mode 100644
index 213232618..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-/**
- * The system filter wizard allows callers to pass a list of wrapper objects for
- * the user to select a filter pool.
- * 
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterPoolWrapper {
-
-	/**
-	 * Get the name to display in the combo box for this wrapper
-	 */
-	public String getDisplayName();
-
-	/**
-	 * Get the wrappered SystemFilterPool object
-	 */
-	public ISystemFilterPool getSystemFilterPool();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java
deleted file mode 100644
index 00108bb9e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-/**
- * The system filter wizard allows callers to pass a list of wrapper objects for
- * the user to select a filter pool. Effectively, this prompting for euphemisms
- * to filter pools. This requires an array of wrapper objects, and requires
- * replacement text for the pool prompt and tooltip text, and the verbiage above
- * it.
- * <p>
- * This is all encapsulated in this interface. There is also a class offered
- * that implements all this and is populated via setters.
- * 
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterPoolWrapperInformation {
-
-	/**
-	 * Get the label
-	 */
-	public String getPromptLabel();
-
-	/**
-	 * Get the tooltip
-	 */
-	public String getPromptTooltip();
-
-	public String getVerbiageLabel();
-
-	/**
-	 * Get the list of wrappered filter pool objects to show in the combo. The wrappering allows
-	 *  each to be displayed with a different name in the list than just pool.getName()
-	 */
-	public ISystemFilterPoolWrapper[] getWrappers();
-
-	/**
-	 * Get the wrapper to preselect in the list.
-	 */
-	public ISystemFilterPoolWrapper getPreSelectWrapper();
-
-	/**
-	 * Add a wrapper object
-	 * @since 3.0
-	 */
-	public void addWrapper(ISystemFilterPoolWrapper wrapper);
-	/**
-	 * Add a filter pool, which we will wrapper here by creating a SystemFilterPoolWrapper object for you
-	 * @since 3.0
-	 */
-	public void addWrapper(String displayName, ISystemFilterPool poolToWrap, boolean preSelect);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java
deleted file mode 100644
index 6d91b3c93..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.model.ISystemContainer;
-import org.eclipse.rse.core.model.ISystemContentsType;
-import org.eclipse.rse.core.references.IRSEReferencingObject;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * Represents a shadow or reference to a system filter. Such references are only
- * transient, not savable to disk.
- *
- * @noimplement This interface is not intended to be implemented by clients. The
- *              allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterReference extends IRSEReferencingObject, ISystemFilterContainerReference, ISystemContainer {
-	/**
-	 * Return the reference manager which is managing this filter reference
-	 * framework object.
-	 */
-	public ISystemFilterPoolReferenceManager getFilterPoolReferenceManager();
-
-	/**
-	 * Return the object which instantiated the pool reference manager object.
-	 * Makes it easy to get back to the point of origin, given any filter reference
-	 * framework object
-	 */
-	public ISystemFilterPoolReferenceManagerProvider getProvider();
-
-	/**
-	 * Gets the subsystem that contains this reference
-	 * @return the subsystem
-	 */
-	public ISubSystem getSubSystem();
-
-	/**
-	 * Sets the subsystem that contains this reference
-	 * @param subSystem the subsystem that holds this reference
-	 */
-	public void setSubSystem(ISubSystem subSystem);
-
-	/**
-	 * Return the filter to which we reference...
-	 */
-	public ISystemFilter getReferencedFilter();
-
-	/**
-	 * Set the filter to which we reference...
-	 */
-	public void setReferencedFilter(ISystemFilter filter);
-
-	/**
-	 * Get the parent of this reference.
-	 * It will be either a SystemFilterPoolReference, or
-	 *  a SystemFilterReference(if nested).
-	 */
-	public ISystemFilterContainerReference getParent();
-
-	/**
-	 * Get parent or super parent filter pool reference.
-	 */
-	public ISystemFilterPoolReference getParentSystemFilterReferencePool();
-
-	// -------------------------------------------------
-	// Methods for returning filter string references...
-	// -------------------------------------------------
-	/**
-	 * Return the number of filter strings in the referenced filter
-	 */
-	public int getSystemFilterStringCount();
-
-	/**
-	 * Get the filter strings contained by this filter. But get references to each,
-	 *  not the masters.
-	 */
-	public ISystemFilterStringReference[] getSystemFilterStringReferences();
-
-	/**
-	 * Create a single filter string refererence to a given filter string
-	 */
-	public ISystemFilterStringReference getSystemFilterStringReference(ISystemFilterString filterString);
-
-	/*
-	 * Sets the cached contents for this filter reference.  If the filter changes or is refreshed, these cached
-	 * items will be removed.
-	 */
-	public void setContents(ISystemContentsType type, Object[] cachedContents);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java
deleted file mode 100644
index 9528134aa..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.model.ISystemProfile;
-import org.eclipse.rse.logging.Logger;
-
-/**
- * @noimplement This interface is not intended to be implemented by clients.
- * The allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterStartHere {
-
-	/**
-	 * Factory to create a filter pool manager, when you do NOT want it to worry about
-	 *  saving and restoring the filter data to disk. Rather, you will save and restore
-	 *  yourself.
-	 * @param logger A logging object into which to log errors as they happen in the framework
-	 * @param caller Objects which instantiate this class should implement the
-	 *   SystemFilterPoolManagerProvider interface, and pass "this" for this parameter.
-	 *   Given any filter framework object, it is possible to retrieve the caller's
-	 *   object via the getProvider method call.
-	 * @param name the name of the filter pool manager. Not currently used but you may
-	 *   find a use for it.
-	 * @param allowNestedFilters true if filters inside filter pools in this manager are
-	 *   to allow nested filters. This is the default, but can be overridden at the
-	 *   individual filter pool level.
-	 */
-	public ISystemFilterPoolManager createSystemFilterPoolManager(ISystemProfile profile, Logger logger, ISystemFilterPoolManagerProvider caller, String name, boolean allowNestedFilters);
-
-	/**
-	 * Create a SystemFilterPoolReferenceManager instance, when you do NOT want
-	 * it to be saved and restored to its own file. Rather, you will save and
-	 * restore it yourself.
-	 * 
-	 * @param caller Objects which instantiate this class should implement the
-	 *            SystemFilterPoolReferenceManagerProvider interface, and pass
-	 *            "this" for this parameter. Given any filter framework object,
-	 *            it is possible to retrieve the caller's object via the
-	 *            getProvider method call.
-	 * @param relatedPoolMgrProvider The creator of the managers that own the
-	 *            master list of filter pools that this manager will contain
-	 *            references to.
-	 * @param name the name of the filter pool reference manager. This is not
-	 *            currently used, but you may find a use for it.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISystemFilterPoolReferenceManager createSystemFilterPoolReferenceManager(ISystemFilterPoolReferenceManagerProvider caller, ISystemFilterPoolManagerProvider relatedPoolMgrProvider,
-			String name);
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java
deleted file mode 100644
index c68911f26..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - Cleanup Javadoc.
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.rse.core.model.IRSEModelObject;
-import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
-
-/**
- * A filter string is a pattern used by the server-side code to know what to return to
- *  the client. A filter contains one or more filter strings. Basically, its nothing more
- *  than a string, and its up to each consumer to know what to do with it. Generally,
- *  a filter string edit pane is designed to prompt the user for the contents of the 
- *  string in a domain-friendly way.
- * @noimplement This interface is not intended to be implemented by clients.
- * The allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterString extends IRSEBaseReferencedObject, IAdaptable, IRSEModelObject {
-	/**
-	 * Return the caller which instantiated the filter pool manager overseeing this filter framework instance
-	 */
-	public ISystemFilterPoolManagerProvider getProvider();
-
-	/**
-	 * Return the filter pool manager managing this collection of filter pools and their filters and their filter strings.
-	 */
-	public ISystemFilterPoolManager getSystemFilterPoolManager();
-
-	/**
-	 * Set the transient parent back-pointer. Called by framework at restore/create time.
-	 */
-	public void setParentSystemFilter(ISystemFilter filter);
-
-	/**
-	 * Get the parent filter that contains this filter string.
-	 */
-	public ISystemFilter getParentSystemFilter();
-
-	/**
-	 * Clones this filter string's attributes into the given filter string
-	 */
-	public void clone(ISystemFilterString targetString);
-
-	/**
-	 * Check if this filter string is changeable.
-	 * Depends on attributes of parent filter.
-	 */
-	public boolean isChangable();
-
-	/**
-	 * @return The value of the String attribute
-	 */
-	String getString();
-
-	/**
-	 * @param value The new value of the String attribute
-	 */
-	void setString(String value);
-
-	/**
-     * Returns the type attribute.
-     * Intercepted to return SystemFilterConstants.DEFAULT_TYPE if it is currently null
-	 * Allows tools to have typed filter strings
-	 * @return The value of the Type attribute
-	 */
-	String getType();
-
-	/**
-	 * @param value The new value of the Type attribute
-	 */
-	void setType(String value);
-
-	/**
-	 * Check if this is a vendor-supplied filter string versus a user-defined filter string.
-	 * @return The value of the Default attribute
-	 */
-	boolean isDefault();
-
-	/**
-	 * @param value The new value of the Default attribute
-	 */
-	void setDefault(boolean value);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java
deleted file mode 100644
index c6de9bb7e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
-
-/**
- * Represents a reference to a filter string.
- * Needed so the UI can show the same filter string multiple times.
- * @noimplement This interface is not intended to be implemented by clients.
- * The allowable implementations are already present in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemFilterStringReference extends IRSEBaseReferencingObject {
-	/**
-	 * Return the reference manager which is managing this filter reference
-	 * framework object.
-	 */
-	public ISystemFilterPoolReferenceManager getFilterPoolReferenceManager();
-
-	/**
-	 * Return the object which instantiated the pool reference manager object.
-	 * Makes it easy to get back to the point of origin, given any filter reference
-	 * framework object
-	 */
-	public ISystemFilterPoolReferenceManagerProvider getProvider();
-
-	/**
-	 * Get the master filter string
-	 */
-	public ISystemFilterString getReferencedFilterString();
-
-	/**
-	 * Get the referenced filter that contains this filter string reference.
-	 */
-	public ISystemFilterReference getParent();
-
-	/**
-	 * Get the actual filter that contain the actual filter string we reference
-	 */
-	public ISystemFilter getParentSystemFilter();
-
-	/**
-	 * Same as getReferencedFilterString().getString()
-	 */
-	public String getString();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java
deleted file mode 100644
index 69e807299..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterReference.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - 142806: refactoring persistence framework
- * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- ********************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.core.model.IRSEPersistableContainer;
-import org.eclipse.rse.core.model.ISystemContainer;
-import org.eclipse.rse.core.model.ISystemContentsType;
-import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
-import org.eclipse.rse.core.references.SystemReferencingObject;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.internal.core.filters.SystemFilterContainerReferenceCommonMethods;
-import org.eclipse.rse.internal.core.filters.SystemFilterStringReference;
-
-/**
- * Represents a shadow or reference to a system filter.
- * Such references are only transient, not savable to disk.
- * All major function is inherited.
- * <p>
- * SystemFilter references typically exist for only one reason:
- * <ol>
- *  <li>As a simple shadow to enable a unique object in a GUI tree. For example,
- *       if it is possible for the same filter to show up in different places in 
- *       the tree, then we must create shadows for each place it shows up.
- * </ol>
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- * Use the factory method {@link #createSystemFilterReference(ISubSystem, ISystemFilterContainerReference, ISystemFilter, boolean)}.
- */
-public class SystemFilterReference extends SystemReferencingObject implements IAdaptable, ISystemFilterReference {
-	private SystemFilterContainerReferenceCommonMethods containerHelper = null;
-	private ISystemFilterContainerReference parent = null;
-	private ISystemFilter referencedFilter = null;
-	private ISystemFilterStringReference[] referencedFilterStrings = null;
-	protected boolean persistent;
-	protected boolean isStale;
-//	protected Object[] cachedContents;
-	protected ISubSystem _subSystem;
-
-	protected HashMap cachedContents;
-
-	public static final boolean PERSISTENT_YES = true;
-	public static final boolean PERSISTENT_NO = false;
-
-	/**
-	 * Constructor.
-	 */
-	protected SystemFilterReference() {
-		super();
-		containerHelper = new SystemFilterContainerReferenceCommonMethods(this);
-		persistent = true;
-		isStale = true;
-		cachedContents = new HashMap();
-	}
-
-	/**
-	 * Create a new instance of this class.
-	 * @param parent The SystemFilterReference or SystemFilterPoolReference object that we are a child of.
-	 * @param filter The master object to be referenced.
-	 * @param persistent Whether we should formally register our reference with the target filter or not.
-	 */
-	public static ISystemFilterReference createSystemFilterReference(ISubSystem subSystem, ISystemFilterContainerReference parent, ISystemFilter filter, boolean persistent) {
-		SystemFilterReference newRef = new SystemFilterReference();
-		newRef.persistent = persistent;
-		newRef.setSubSystem(subSystem);
-		newRef.setParent(parent);
-		newRef.setReferencedFilter(filter);
-		filter.addReference(newRef);
-		return newRef;
-	}
-
-	/**
-	 * Gets the subsystem that contains this reference
-	 * @return the subsystem
-	 */
-	public ISubSystem getSubSystem() {
-		return _subSystem;
-	}
-
-	/**
-	 * Sets the subsystem that contains this reference
-	 * @param subSystem the subsystem that holds this reference
-	 */
-	public void setSubSystem(ISubSystem subSystem) {
-		_subSystem = subSystem;
-	}
-
-	/**
-	 * Return the reference manager which is managing this filter reference
-	 * framework object.
-	 */
-	public ISystemFilterPoolReferenceManager getFilterPoolReferenceManager() {
-		ISystemFilterPoolReference pool = getParentSystemFilterReferencePool();
-		if (pool != null)
-			return pool.getFilterPoolReferenceManager();
-		else
-			return null;
-	}
-
-	/**
-	 * Return the object which instantiated the pool reference manager object.
-	 * Makes it easy to get back to the point of origin, given any filter reference
-	 * framework object
-	 */
-	public ISystemFilterPoolReferenceManagerProvider getProvider() {
-		ISystemFilterPoolReferenceManager mgr = getFilterPoolReferenceManager();
-		if (mgr != null) {
-			ISystemFilterPoolReferenceManagerProvider provider = mgr.getProvider();
-			if (provider == null) {
-				provider = getSubSystem();
-			}
-			return provider;
-		} else
-			return null;
-	}
-
-	/**
-	 * If this is a reference to a nested filter, the parent is the
-	 * reference to the nested filter's parent. Else, it is the 
-	 * reference to the parent filter pool
-	 */
-	public void setParent(ISystemFilterContainerReference parent) {
-		this.parent = parent;
-	}
-
-	/**
-	 * The parent will either by a SystemFilterPoolReference or
-	 *  a SystemFilterReference.
-	 */
-	public ISystemFilterContainerReference getParent() {
-		return parent;
-	}
-
-	/**
-	 * Return the filter to which we reference...
-	 */
-	public ISystemFilter getReferencedFilter() {
-		return persistent ? (ISystemFilter) super.getReferencedObject() : referencedFilter;
-	}
-
-	/**
-	 * Set the filter to which we reference...
-	 */
-	public void setReferencedFilter(ISystemFilter filter) {
-		if (persistent)
-			super.setReferencedObject(filter);
-		else
-			referencedFilter = filter;
-	}
-
-	/**
-	 * If this is a reference to a nested filter, the parent is the
-	 * reference to the nested filter's parent. Else, it is the 
-	 * reference to the parent filter pool
-	 */
-	public ISystemFilterPoolReference getParentSystemFilterReferencePool() {
-		if (parent instanceof ISystemFilterPoolReference)
-			return (ISystemFilterPoolReference) parent;
-		else
-			return ((ISystemFilterReference) parent).getParentSystemFilterReferencePool();
-	}
-
-	/**
-	 * This is the method required by the IAdaptable interface.
-	 * Given an adapter class type, return an object castable to the type, or
-	 *  null if this is not possible.
-	 */
-	public Object getAdapter(Class adapterType) {
-		return Platform.getAdapterManager().getAdapter(this, adapterType);
-	}
-
-	// -------------------------------------------------------------
-	// Methods common with SystemFilterPoolReferenceImpl, and hence
-	//  abstracted out into SystemFilterContainerReference...
-	// -------------------------------------------------------------
-	/**
-	 * Return the object to which we hold a reference. This is either
-	 * SystemFilter or SystemFilterPool. Since both implement 
-	 * SystemFilterContainer, that is what we return.
-	 * <p>
-	 * Of course, this is a generic method, and in our case it is always
-	 * true that we only hold a SystemFilter. Hence, this is the same
-	 * as calling getReferenceFilter and casting the result.
-	 */
-	public ISystemFilterContainer getReferencedSystemFilterContainer() {
-		return getReferencedFilter();
-	}
-
-	/**
-	 * Build and return an array of SystemFilterReference objects.
-	 * Each object is created new. There is one for each of the filters
-	 * in the reference SystemFilter or SystemFilterPool.
-	 * For performance reasons, we will cache this array and only 
-	 * return a fresh one if something changes in the underlying 
-	 * filter list.
-	 */
-	public ISystemFilterReference[] getSystemFilterReferences(ISubSystem subSystem) {
-		List references = containerHelper.getSystemFilterReferences(subSystem);
-		ISystemFilterReference[] result = new ISystemFilterReference[references.size()];
-		references.toArray(result);
-		return result;
-	}
-
-	/**
-	 * Create a single filter refererence to a given filter. 
-	 * If there already is a reference to this filter, it is returned.
-	 * If not, a new reference is created and appended to the end of the existing filter reference array.
-	 * @see #getExistingSystemFilterReference(ISubSystem, ISystemFilter)
-	 */
-	public ISystemFilterReference getSystemFilterReference(ISubSystem subSystem, ISystemFilter filter) {
-		//return containerHelper.generateFilterReference(filter);
-		return containerHelper.generateAndRecordFilterReference(subSystem, filter);
-	}
-
-	/**
-	 * Return an existing reference to a given system filter. 
-	 * If no reference currently exists to this filter, returns null.
-	 * @see #getSystemFilterReference(ISubSystem, ISystemFilter)
-	 */
-	public ISystemFilterReference getExistingSystemFilterReference(ISubSystem subSystem, ISystemFilter filter) {
-		return containerHelper.getExistingSystemFilterReference(subSystem, filter);
-	}
-
-	/**
-	 * Return true if the referenced pool or filter has filters.
-	 */
-	public boolean hasFilters() {
-		return containerHelper.hasFilters();
-	}
-
-	/**
-	 * Return count of the number of filters in the referenced pool or filter
-	 */
-	public int getFilterCount() {
-		return containerHelper.getFilterCount();
-	}
-
-	/**
-	 * Return the name of the SystemFilter or SystemFilterPool that we reference.
-	 * For such objects this is what we show in the GUI.
-	 */
-	public String getName() {
-		ISystemFilter filter = getReferencedFilter();
-		if (filter != null)
-			return filter.getName();
-		else
-			return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Override of Object method. Turn this filter in an outputable string
-	 */
-	public String toString() {
-		return getName();
-	}
-
-	// -------------------------------------------------
-	// Methods for returning filter string references...
-	// -------------------------------------------------
-	/**
-	 * Return the number of filter strings in the referenced filter
-	 */
-	public int getSystemFilterStringCount() {
-		int count = 0;
-		ISystemFilter referencedFilter = getReferencedFilter();
-		if (referencedFilter != null) count = referencedFilter.getFilterStringCount();
-		return count;
-	}
-
-	/**
-	 * Get the filter strings contained by this filter. But get references to each,
-	 *  not the masters.
-	 */
-	public ISystemFilterStringReference[] getSystemFilterStringReferences() {
-		// These reference objects are built on the fly, each time, rather than
-		//  maintaining a persisted list of such references. The reason
-		//  is we do no at this time allow users to subset the master list
-		//  of strings maintained by a filter. Hence, we always simply
-		//  return a complete list. However, to save memory we try to only
-		//  re-gen the list if something has changed.
-		ISystemFilterString[] filterStrings = getReferencedFilter().getStrings();
-		List filterStringList = Arrays.asList(filterStrings);
-		boolean needToReGen = compareFilterStrings(filterStringList);
-		if (needToReGen) referencedFilterStrings = generateFilterStringReferences(filterStringList);
-		return referencedFilterStrings;
-	}
-
-	/**
-	 * Create a single filter string refererence to a given filter string
-	 */
-	public ISystemFilterStringReference getSystemFilterStringReference(ISystemFilterString filterString) {
-		return new SystemFilterStringReference(this, filterString);
-	}
-
-	/**
-	 * To save memory, we try to only regenerate the referenced filter list
-	 * if something has changed.
-	 */
-	private boolean compareFilterStrings(List newFilterStrings) {
-		boolean mustReGen = false;
-		if (newFilterStrings == null) {
-			if (referencedFilterStrings != null)
-				return true;
-			else
-				return false;
-		} else if (referencedFilterStrings == null) {
-			return true; // newFilterStrings != null && referencedFilterStrings == null        	 
-		}
-		// both old and new are non-null
-		if (newFilterStrings.size() != referencedFilterStrings.length) return true;
-		Iterator i = newFilterStrings.iterator();
-		for (int idx = 0; !mustReGen && (idx < referencedFilterStrings.length); idx++) {
-			ISystemFilterString newFilterString = (ISystemFilterString) i.next();
-			if (!(referencedFilterStrings[idx].getReferencedFilterString().equals(newFilterString))) mustReGen = true;
-		}
-		return mustReGen;
-	}
-
-	/**
-	 * Get references to filter strings from a list of the filter strings
-	 */
-	private ISystemFilterStringReference[] generateFilterStringReferences(List newFilterStrings) {
-		if (newFilterStrings == null) return null;
-		ISystemFilterStringReference[] refs = new ISystemFilterStringReference[newFilterStrings.size()];
-		Iterator i = newFilterStrings.iterator();
-		int idx = 0;
-		while (i.hasNext()) {
-			refs[idx++] = getSystemFilterStringReference((ISystemFilterString) i.next());
-		}
-		return refs;
-	}
-
-	// -----------------------------------
-	// IRSEReferencingObject methods...
-	// -----------------------------------
-
-	/**
-	 * Set the object to which we reference. Override of inherited
-	 */
-	public void setReferencedObject(IRSEBaseReferencedObject obj) {
-		setReferencedFilter((ISystemFilter) obj);
-	}
-
-	/**
-	 * Get the object which we reference. Override of inherited
-	 */
-	public IRSEBaseReferencedObject getReferencedObject() {
-		return getReferencedFilter();
-	}
-
-	/**
-	 * Fastpath to getReferencedObject().removeReference(this).
-	 * @return new reference count of master object
-	 */
-	public int removeReference() {
-		int count = 0;
-		if (persistent) super.removeReference();
-		setReferencedFilter(null);
-		return count;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.model.ISystemContainer#hasContents(org.eclipse.rse.model.ISystemContentsType)
-	 */
-	public boolean hasContents(ISystemContentsType contentsType) {
-		if (cachedContents.containsKey(contentsType)) {
-			return true;
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.model.ISystemContainer#getContents(org.eclipse.rse.model.ISystemContentsType)
-	 */
-	public Object[] getContents(ISystemContentsType contentsType) {
-		return (Object[]) cachedContents.get(contentsType);
-	}
-
-	public void setContents(ISystemContentsType type, Object[] cachedContents) {
-		this.cachedContents.put(type, cachedContents);
-
-		isStale = false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.model.ISystemContainer#isStale()
-	 */
-	public boolean isStale() {
-		return isStale;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.model.ISystemContainer#markStale(boolean)
-	 */
-	public void markStale(boolean isStale) {
-		markStale(isStale, true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.model.ISystemContainer#markStale(boolean)
-	 */
-	public void markStale(boolean isStale, boolean clearCache) {
-		this.isStale = isStale;
-		if (clearCache && isStale) {
-			Iterator iterator = cachedContents.values().iterator();
-			while (iterator.hasNext()) {
-				Object[] arr = (Object[]) iterator.next();
-				for (int i = 0; i < arr.length; i++) {
-					Object obj = arr[i];
-					if (obj instanceof ISystemContainer) {
-						((ISystemContainer) obj).markStale(true);
-					}
-				}
-			}
-			cachedContents.clear();
-		}
-	}
-
-	public boolean commit() {
-		return false;
-	}
-
-	public IRSEPersistableContainer getPersistableParent() {
-		return null;
-	}
-
-	public IRSEPersistableContainer[] getPersistableChildren() {
-		return IRSEPersistableContainer.NO_CHILDREN;
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterUtil.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterUtil.java
deleted file mode 100644
index 51e0d4388..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/SystemFilterUtil.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*********************************************************************************
- * Copyright (c) 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
- * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
- *********************************************************************************/
-
-package org.eclipse.rse.core.filters;
-
-import org.eclipse.rse.internal.core.filters.SystemFilterSimple;
-
-/**
- * Utilities to be used in the construction and manipulation of filters.
- *
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- * @since org.eclipse.rse.core 3.0
- */
-public class SystemFilterUtil {
-
-	public static ISystemFilter makeSimpleFilter(String name) {
-		return new SystemFilterSimple(name);
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/AbstractSystemResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/AbstractSystemResourceSet.java
deleted file mode 100644
index d274bee27..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/AbstractSystemResourceSet.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-
-/**
- * The common abstract implementation of a ISystemResourceSet.
- * Extenders can use this to inherit the basic implementations.
- */
-public abstract class AbstractSystemResourceSet implements ISystemResourceSet {
-	private List _resourceSet;
-	private SystemMessage _message;
-	private long _byteSize;
-
-	public AbstractSystemResourceSet() {
-		_resourceSet = new ArrayList();
-	}
-
-	public AbstractSystemResourceSet(Object[] set) {
-		_resourceSet = new ArrayList();
-		if (set != null) {
-			for (int i = 0; i < set.length; i++) {
-				addResource(set[i]);
-			}
-		}
-	}
-
-	public AbstractSystemResourceSet(List set) {
-		_resourceSet = set;
-	}
-
-	public int size() {
-		return _resourceSet.size();
-	}
-
-	public Object get(String absoluteName) {
-		for (int i = 0; i < _resourceSet.size(); i++) {
-			String path = pathFor(_resourceSet.get(i));
-			if (path.equals(absoluteName)) {
-				return _resourceSet.get(i);
-			}
-		}
-		return null;
-	}
-
-	public Object get(int index) {
-		return _resourceSet.get(index);
-	}
-
-	public List getResourceSet() {
-		return _resourceSet;
-	}
-
-	public void addResource(Object src) {
-		_resourceSet.add(src);
-	}
-
-	public void removeResource(Object src) {
-		_resourceSet.remove(src);
-	}
-
-	public String pathFor(Object resource) {
-		return resource.toString();
-	}
-
-	public String toString() {
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < _resourceSet.size(); i++) {
-			Object resource = _resourceSet.get(i);
-			buf.append(pathFor(resource));
-			if (i < _resourceSet.size()) {
-				buf.append(", "); //$NON-NLS-1$
-			}
-			buf.append('\n');
-		}
-		return buf.toString();
-	}
-
-	public void setMessage(SystemMessage message) {
-		_message = message;
-	}
-
-	public SystemMessage getMessage() {
-		return _message;
-	}
-
-	public boolean hasMessage() {
-		return _message != null;
-	}
-
-	public boolean hasByteSize() {
-		return (_byteSize > 0);
-	}
-
-	public long byteSize() {
-		return _byteSize;
-	}
-
-	public void setByteSize(long byteSize) {
-		_byteSize = byteSize;
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java
deleted file mode 100644
index a8a0a7e16..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/DummyHost.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType 
- * David Dykstal (IBM) - 142806: refactoring persistence framework
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * A DummyHost is used as a placeholder during the construction of hosts by wizards.
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class DummyHost extends PlatformObject implements IHost
-{
-	protected String _hostName;
-	protected IRSESystemType _systemType;
-	
-	/**
-	 * Constructor.
-	 * @param hostName name of the dummy host
-	 * @param systemType sytem type. May be <code>null</code>.
-	 */
-	public DummyHost(String hostName, IRSESystemType systemType)
-	{
-		_hostName = hostName;
-		_systemType = systemType;
-	}
-	public ISystemProfile getSystemProfile()
-	{
-		return null;
-	}
-
-	public String getSystemProfileName()
-	{
-		return null;
-	}
-
-	public void setHostPool(ISystemHostPool pool)
-	{
-		//Auto-generated method stub
-	}
-
-	public ISystemHostPool getHostPool()
-	{
-		return null;
-	}
-
-	public ISubSystem[] getSubSystems()
-	{
-		return null;
-	}
-
-
-
-	public String getLocalDefaultUserId()
-	{
-		return null;
-	}
-
-	public void clearLocalDefaultUserId()
-	{
-		//Auto-generated method stub
-	}
-
-	public void deletingHost()
-	{
-		//Auto-generated method stub
-	}
-
-	public void renamingSystemProfile(String oldName, String newName)
-	{
-		//Auto-generated method stub
-	}
-
-	public boolean getForceUserIdToUpperCase()
-	{
-		return false;
-	}
-
-	public boolean compareUserIds(String userId1, String userId2)
-	{
-		return false;
-	}
-
-	public IRSESystemType getSystemType()
-	{
-		return _systemType;
-	}
-
-	public void setSystemType(IRSESystemType value)
-	{
-		//Auto-generated method stub
-	}
-
-	public String getAliasName()
-	{
-		return null;
-	}
-
-	public void setAliasName(String value)
-	{
-		//Auto-generated method stub
-	}
-
-	public String getHostName()
-	{
-		return _hostName;
-	}
-
-	public void setHostName(String value)
-	{
-		//Auto-generated method stub
-	}
-
-	public String getDescription()
-	{
-		return null;
-	}
-
-	public void setDescription(String value)
-	{
-		//Auto-generated method stub
-	}
-
-	public String getDefaultUserId()
-	{
-		return null;
-	}
-
-	public void setDefaultUserId(String value)
-	{
-		//Auto-generated method stub
-	}
-
-	public boolean isPromptable()
-	{
-		return false;
-	}
-
-	public void setPromptable(boolean value)
-	{
-		//Auto-generated method stub
-	}
-
-	public boolean isOffline()
-	{
-		return false;
-	}
-
-	public void setOffline(boolean value)
-	{
-		//Auto-generated method stub
-	}
-
-	public IConnectorService[] getConnectorServices()
-	{
-		return null;
-	}
-
-	public String getName()
-	{
-		return null;
-	}
-
-	public IPropertySet[] getPropertySets()
-	{
-		return null;
-	}
-
-	public IPropertySet getPropertySet(String name)
-	{
-		return null;
-	}
-
-	public IPropertySet createPropertySet(String name, String description)
-	{
-		return null;
-	}
-	
-	public IPropertySet createPropertySet(String name)
-	{
-		return null;
-	}
-
-
-	public boolean addPropertySet(IPropertySet set)
-	{
-		return false;
-	}
-
-	public boolean addPropertySets(IPropertySet[] sets)
-	{
-		return false;
-	}
-
-	public boolean removePropertySet(String name)
-	{
-		return false;
-	}
-
-	public boolean isDirty()
-	{
-		return false;
-	}
-
-	public void setDirty(boolean flag)
-	{
-	}
-
-	public boolean commit()
-	{
-		return false;
-	}
-
-	public boolean wasRestored()
-	{
-		return false;
-	}
-
-	public void setWasRestored(boolean flag)
-	{
-	}
-	
-	public IRSEPersistableContainer getPersistableParent() {
-		return null;
-	}
-	
-	public IRSEPersistableContainer[] getPersistableChildren() {
-		return IRSEPersistableContainer.NO_CHILDREN;
-	}
-
-	public boolean isTainted() {
-		return false;
-	}
-	
-	public void beginRestore() {
-	}
-	
-	public void endRestore() {
-	}
-
-	public void setTainted(boolean flag) {
-	}
-	
-	public String getDefaultEncoding(boolean checkRemote) {
-		return null;
-	}
-	
-	public void setDefaultEncoding(String encoding, boolean fromRemote) {
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Host.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Host.java
deleted file mode 100644
index e16c162a0..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Host.java
+++ /dev/null
@@ -1,602 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - using new API from RSECorePlugin, RSEPreferencesManager
- *                     - moved SystemsPreferencesManager to a new plugin
- * Uwe Stieber (Wind River) - Dynamic system type provider extensions.
- *                          - Moved to package org.eclipse.rse.model for being extendable.
- * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType 
- * David Dykstal (IBM) - 142806: refactoring persistence framework
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() 
- * Kevin Doyle (IBM) - [203365] Profile should not be saved as a result of file transfer
- * David Dykstal (IBM) - [225911] Exception received after deleting a profile containing a connection
- * David McKnight (IBM)          - [226324] Default user ID from preferences not inherited
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.RSEPreferencesManager;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * Default implementation of the <code>IHost</code> interface.
- * <p>
- * Dynamic system type providers may extend this implementation
- * if needed.
- */
-public class Host extends RSEModelObject implements IHost {
-
-	private boolean ucId = true;
-	private boolean userIdCaseSensitive = true;
-	private ISystemHostPool pool;
-	protected String previousUserIdKey;
-	
-	private static final String ENCODING_PROPERTY_SET = "EncodingPropertySet"; //$NON-NLS-1$
-	private static final String ENCODING_REMOTE_PROPERTY_KEY = "EncodingRemotePropertyKey"; //$NON-NLS-1$
-	private static final String ENCODING_NON_REMOTE_PROPERTY_KEY = "EncodingNonRemotePropertyKey"; //$NON-NLS-1$
-
-	/**
-	 * The system type which is associated to this <code>IHost</code> object.
-	 */
-	private IRSESystemType systemType = null;
-	
-	/**
-	 * The alias name of this <code>IHost</code> object.
-	 */
-	private String aliasName = null;
-
-	/**
-	 * The host name of the target which is associated to this <code>IHost</code> object.
-	 */
-	private String hostName = null;
-	
-	/**
-	 * The description of this <code>IHost</code> object.
-	 */
-	private String description = null;
-	
-	/**
-	 * The default user id to use to login to the target host.
-	 */
-	private String defaultUserId = null;
-	
-	/**
-	 * Prompt for user id and password.
-	 */
-	private boolean promptable = false;
-	
-	/**
-	 * Offline mode.
-	 */
-	private boolean offline = false;
-
-	/**
-	 * The system profile associated with this <code>IHost</code> object.
-	 */
-	private ISystemProfile _profile;
-
-	/**
-	 * Constructor
-	 */
-	public Host(ISystemProfile profile) {
-		super();
-		_profile = profile;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#setHostPool(org.eclipse.rse.core.model.ISystemHostPool)
-	 */
-	public void setHostPool(ISystemHostPool pool) {
-		this.pool = pool;
-		previousUserIdKey = getPreferencesKey();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getHostPool()
-	 */
-	public ISystemHostPool getHostPool() {
-		return pool;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getConnectorServices()
-	 */
-	public IConnectorService[] getConnectorServices() {
-		return RSECorePlugin.getTheSystemRegistry().getConnectorServices(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getSubSystems()
-	 */
-	public ISubSystem[] getSubSystems() {
-		return RSECorePlugin.getTheSystemRegistry().getSubSystems(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#deletingHost()
-	 */
-	public void deletingHost() {
-		String oldUserId = null;
-		if (previousUserIdKey != null) oldUserId = getLocalDefaultUserId(previousUserIdKey);
-		// if the userId attribute held a preference store key of the form profileName.connectionName,
-		// we have to delete that key entry from the preference store and re-gen a new keyed entry with the same
-		// value (the actual user id) the old keyed entry held.
-		if (oldUserId != null) {
-			RSEPreferencesManager.clearUserId(previousUserIdKey);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#renamingSystemProfile(java.lang.String, java.lang.String)
-	 */
-	public void renamingSystemProfile(String oldName, String newName) {
-		String userIdValue = null;
-		if (previousUserIdKey != null) userIdValue = getLocalDefaultUserId(previousUserIdKey);
-		// if the userId attribute held a preference store key of the form profileName.connectionName,
-		// we have to delete that key entry from the preference store and re-gen a new keyed entry with the same
-		// value (the actual user id) the old keyed entry held.
-		String newKey = getPreferencesKey(newName, getAliasName());
-		if ((userIdValue != null) && (userIdValue.length() > 0)) {
-			RSEPreferencesManager.clearUserId(previousUserIdKey);
-			RSEPreferencesManager.setUserId(newKey, userIdValue); // store old value with new preference key
-		}
-		previousUserIdKey = newKey;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getSystemProfile()
-	 */
-	public ISystemProfile getSystemProfile() {
-		return _profile;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getSystemProfileName()
-	 */
-	public String getSystemProfileName() {
-		String result = null;
-		if (_profile != null) {
-			result = _profile.getName();
-		} else if (pool != null) {
-			ISystemProfile profile = pool.getSystemProfile();
-			if (profile != null) {
-				result =  profile.getName();
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Intercept of setAliasName so we can potentially rename the default-user-id key
-	 * for the preferences store. That key is profileName.connectionAliasName so is 
-	 * affected when the alias name changes.
-	 */
-	public void setAliasName(String newName) {
-		String userIdValue = null;
-		if (previousUserIdKey != null) userIdValue = getLocalDefaultUserId(previousUserIdKey);
-		this.setAliasNameGen(newName); // update mof-modelled attribute
-		// if the userId attribute held a preference store key of the form profileName.connectionAliasName,
-		// we have to delete that key entry from the preference store and re-gen a new keyed entry with the same
-		// value (the actual user id) the old keyed entry held.
-		String newKey = getPreferencesKey(getSystemProfileName(), newName);
-		if ((userIdValue != null) && (userIdValue.length() > 0)) {
-			RSEPreferencesManager.clearUserId(previousUserIdKey);
-			RSEPreferencesManager.setUserId(newKey, userIdValue); // store old value with new preference key
-		}
-		previousUserIdKey = newKey;
-	}
-
-	/**
-	 * Intercept of setSystemType so we can decide if the user ID is case sensitive
-	 */
-	public void setSystemType(IRSESystemType systemType) {
-		// defect 43219
-		if (systemType != null) {
-			//FIXME MOB this should be in IRSESystemType.isForceUC() / IRSESystemType.isUIDCaseSensitive()
-			String systemTypeId = systemType.getId();
-			boolean forceUC = systemTypeId.equals(IRSESystemType.SYSTEMTYPE_ISERIES_ID);
-			boolean caseSensitiveUID = systemTypeId.equals(IRSESystemType.SYSTEMTYPE_UNIX_ID) || systemTypeId.equals(IRSESystemType.SYSTEMTYPE_LINUX_ID)
-																	|| (systemType.isLocal() && !systemType.isWindows());
-			setForceUserIdToUpperCase(forceUC);
-			setUserIdCaseSensitive(caseSensitiveUID);
-		}
-		this.setSystemTypeGen(systemType);
-	}
-
-	/**
-	 * Intercept of setHostName so we can force it to uppercase.
-	 * IPv4 host names are case insensitive. Much data is stored using the host
-	 * name as part of the key. Therefore, the host name is capitalized here so that
-	 * these comparisons work naturally.
-	 * However, this must be done using the US locale since IPv4 host names
-	 * use can be compared using this locale. See RFC1035.
-	 */
-	public void setHostName(String name) {
-		if (name != null) {
-			name = name.toUpperCase(Locale.US);
-		}
-		this.setHostNameGen(name);
-	}
-
-	/**
-	 * Intercept of setDefaultUserId so we can force it to uppercase.
-	 * Also, we do not store the user Id per se in the attribute, but rather
-	 * we store it in the preference with a key name unique to this connection.
-	 * We store that key name in this attribute. However, this is all transparent to
-	 * the caller.
-	 */
-	public void setDefaultUserId(String newId) {
-		if ((newId != null) && ucId) newId = newId.toUpperCase();
-
-		if ((newId == null) || (newId.length() == 0)) // a "clear" request?
-		{
-			clearLocalDefaultUserId();
-		}
-		else {
-			String key = getPreferencesKey();
-			if (key != null) {
-				RSEPreferencesManager.setUserId(key, newId);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getDefaultUserId()
-	 */
-	public String getDefaultUserId() {
-		String uid = getLocalDefaultUserId();
-		if ((uid == null) || (uid.length() == 0)) {
-			uid = RSEPreferencesManager.getDefaultUserId(getSystemType()); // resolve from preferences	
-			if ((uid != null) && ucId) uid = uid.toUpperCase();
-		}
-		return uid;
-	}
-
-	/**
-	 * Return the local default user Id without resolving up the food chain.
-	 * @see #getDefaultUserId()
-	 */
-	protected static String getLocalDefaultUserId(String key) {
-		String uid = null;
-		if ((key != null) && (key.length() > 0)) {
-			uid = RSEPreferencesManager.getUserId(key); // resolve from preferences	
-		}
-		return uid;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getLocalDefaultUserId()
-	 */
-	public String getLocalDefaultUserId() {
-		return getLocalDefaultUserId(getPreferencesKey());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#clearLocalDefaultUserId()
-	 */
-	public void clearLocalDefaultUserId() {
-		if (previousUserIdKey != null) RSEPreferencesManager.clearUserId(previousUserIdKey);
-	}
-
-	/**
-	 * Helper method to compute a unique name for a given subsystem instance
-	 */
-	protected String getPreferencesKey() {
-		if ((getSystemProfileName() == null) || (getAliasName() == null)) return null;
-		return getPreferencesKey(getSystemProfileName());
-	}
-
-	/**
-	 * Helper method to compute a unique name for a given subsystem instance, given a profile name
-	 */
-	protected String getPreferencesKey(String profileName) {
-		String connectionName = getAliasName();
-		if (connectionName == null) return null;
-		return getPreferencesKey(profileName, connectionName);
-	}
-
-	/**
-	 * Helper method to compute a unique name for a given subsystem instance, given a profile name and connection name
-	 */
-	protected String getPreferencesKey(String profileName, String connectionName) {
-		return profileName + "." + connectionName; //$NON-NLS-1$
-	}
-
-	/**
-	 * Call this with false to turn off the default behaviour of forcing the default userId to uppercase.
-	 */
-	public void setForceUserIdToUpperCase(boolean force) {
-		this.ucId = force;
-	}
-
-	/**
-	 * Call this to turn off the default behaviour of considering case when comparing userIds
-	 */
-	public void setUserIdCaseSensitive(boolean caseSensitive) {
-		this.userIdCaseSensitive = caseSensitive;
-	}
-
-	/**
-	 * Call this to query whether the default userId is to be uppercased.
-	 */
-	public boolean getForceUserIdToUpperCase() {
-		return ucId;
-	}
-
-	/**
-	 * Call this to query whether the default userId is case sensitive
-	 */
-	public boolean getUserIdCaseSensitive() {
-		return userIdCaseSensitive;
-	}
-
-	/**
-	 * Call this to compare two userIds taking case sensitivity
-	 */
-	public boolean compareUserIds(String userId1, String userId2) {
-		if (userId1 == null) userId1 = ""; //$NON-NLS-1$
-		if (userId2 == null) userId2 = ""; //$NON-NLS-1$
-		if (userIdCaseSensitive)
-			return userId1.equals(userId2);
-		else return userId1.equalsIgnoreCase(userId2);
-	}
-
-	public String toString() {
-		if (getAliasName() == null) {
-			StringBuffer result = new StringBuffer(super.toString());
-			result.append(" (systemType: "); //$NON-NLS-1$
-			result.append(systemType);
-			result.append(", aliasName: "); //$NON-NLS-1$
-			result.append(aliasName);
-			result.append(", hostName: "); //$NON-NLS-1$
-			result.append(hostName);
-			result.append(", description: "); //$NON-NLS-1$
-			result.append(description);
-			result.append(", defaultUserId: "); //$NON-NLS-1$
-			result.append(defaultUserId);
-			result.append(", promptable: "); //$NON-NLS-1$
-			result.append(promptable);
-			result.append(", offline: "); //$NON-NLS-1$
-			result.append(offline);
-			result.append(')');
-			return result.toString();
-		}
-		
-		return getAliasName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapterType) {
-		return Platform.getAdapterManager().getAdapter(this, adapterType);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getSystemType()
-	 */
-	public IRSESystemType getSystemType() {
-		return systemType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IRSEModelObject#getName()
-	 */
-	public String getName() {
-		return getAliasName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getAliasName()
-	 */
-	public String getAliasName() {
-		return aliasName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getHostName()
-	 */
-	public String getHostName() {
-		return hostName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.RSEModelObject#getDescription()
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#setDescription(java.lang.String)
-	 */
-	public void setDescription(String newDescription) {
-		setDirty(!compareStrings(description, newDescription));
-		description = newDescription;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#isPromptable()
-	 */
-	public boolean isPromptable() {
-		return promptable;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#setPromptable(boolean)
-	 */
-	public void setPromptable(boolean newPromptable) {
-		setDirty(promptable != newPromptable);
-		promptable = newPromptable;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#isOffline()
-	 */
-	public boolean isOffline() {
-		return offline;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#setOffline(boolean)
-	 */
-	public void setOffline(boolean newOffline) {
-		setDirty(offline != newOffline);
-		offline = newOffline;
-	}
-
-	private void setSystemTypeGen(IRSESystemType newSystemType) {
-		setDirty( systemType==null ? (newSystemType==null) : !systemType.equals(newSystemType) );
-		systemType = newSystemType;
-	}
-
-	private void setAliasNameGen(String newAliasName) {
-		setDirty(!compareStrings(aliasName, newAliasName));
-		aliasName = newAliasName;
-	}
-
-	private void setHostNameGen(String newHostName) {
-		setDirty(!compareStrings(hostName, newHostName));
-		hostName = newHostName;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IRSEPersistableContainer#commit()
-	 */
-	public boolean commit() {
-		ISystemProfile profile = getSystemProfile();
-		boolean result = profile.commit();
-		return result;
-	}
-	
-	public IRSEPersistableContainer getPersistableParent() {
-		return _profile;
-	}
-	
-	public IRSEPersistableContainer[] getPersistableChildren() {
-		List children = new ArrayList(10);
-		children.addAll(Arrays.asList(getPropertySets()));
-		children.addAll(Arrays.asList(getConnectorServices()));
-		IRSEPersistableContainer[] result = new IRSEPersistableContainer[children.size()];
-		children.toArray(result);
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#getDefaultEncoding(boolean)
-	 */
-	public String getDefaultEncoding(boolean fromRemote) {
-		
-		IPropertySet encPropertySet = getPropertySet(ENCODING_PROPERTY_SET);
-		
-		if (encPropertySet == null) {
-			return null;
-		}
-		else {
-			String nonRemoteEncoding = encPropertySet.getPropertyValue(ENCODING_NON_REMOTE_PROPERTY_KEY);
-			
-			if (nonRemoteEncoding != null) {
-				return nonRemoteEncoding;
-			}
-			else {
-				
-				if (!fromRemote) {
-					return null;
-				}
-				else {
-					String remoteEncoding = encPropertySet.getPropertyValue(ENCODING_REMOTE_PROPERTY_KEY);
-					return remoteEncoding;
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IHost#setDefaultEncoding(java.lang.String, boolean)
-	 */
-	public void setDefaultEncoding(String encoding, boolean fromRemote) {
-		boolean commit = false;
-		IPropertySet encPropertySet = getPropertySet(ENCODING_PROPERTY_SET);
-		
-		if (encPropertySet == null) {
-			encPropertySet = createPropertySet(ENCODING_PROPERTY_SET);
-		}
-		
-		if (encPropertySet != null) {
-			String savedNonRemoteEncoding = encPropertySet.getPropertyValue(ENCODING_NON_REMOTE_PROPERTY_KEY);
-			String savedRemoteEncoding = encPropertySet.getPropertyValue(ENCODING_REMOTE_PROPERTY_KEY);
-			
-			if (encoding != null) {
-				
-				if (!fromRemote && !encoding.equals(savedNonRemoteEncoding)) {
-					encPropertySet.addProperty(ENCODING_NON_REMOTE_PROPERTY_KEY, encoding);
-					commit = true;
-				}
-				else if (fromRemote && !encoding.equals(savedRemoteEncoding)) {
-					encPropertySet.addProperty(ENCODING_REMOTE_PROPERTY_KEY, encoding);
-					commit = true;
-				}
-			}
-			else {
-				
-				if (!fromRemote && savedNonRemoteEncoding != null) {
-					encPropertySet.removeProperty(ENCODING_NON_REMOTE_PROPERTY_KEY);
-					commit = true;
-				}
-				else if (fromRemote && savedRemoteEncoding != null) {
-					encPropertySet.removeProperty(ENCODING_REMOTE_PROPERTY_KEY);
-					commit = true;
-				}
-			}
-		}
-		// Only commit if the encoding has changed
-		if (commit) {
-			commit();
-		}
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java
deleted file mode 100644
index 63e57119d..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType 
- * Martin Oberhuber (Wind River) - [206742] Make SystemHostPool thread-safe
- * David Dykstal (IBM) - [197036] cleaned javddoc for getConnectorServices()
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-
-/**
- * Interface for Host (SystemConnection) objects.
- *  
- * An IHost holds information identifying a remote system. It also logically contains
- * ISubSystem objects, although this containment is achievable programmatically versus via 
- * object oriented containment.
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IHost extends IAdaptable, IRSEModelObject {
-	
-	/**
-	 * Return the system profile that owns this connection
-	 * @return the profile which contains this host
-	 */
-	public ISystemProfile getSystemProfile();
-
-	/**
-	 * Return the name of the system profile that owns this connection
-	 * FIXME Check how this is different from getSystemProfile().getName()
-	 */
-	public String getSystemProfileName();
-
-	/**
-	 * Set the parent connection pool this is owned by.
-	 * Connection pools are internal management objects, one per profile.
-	 */
-	public void setHostPool(ISystemHostPool pool);
-
-	/**
-	 * Set the parent connection pool this is owned by.
-	 * Connection pools are internal management objects, one per profile.
-	 */
-	public ISystemHostPool getHostPool();
-
-	/**
-	 * Return the subsystem instances under this connection.
-	 * Just a shortcut to {@link org.eclipse.rse.core.model.ISystemRegistry#getSubSystems(IHost)} 
-	 */
-	public ISubSystem[] getSubSystems();
-
-	/**
-	 * Return the local default user Id without resolving up the food chain.
-	 * @see #getDefaultUserId()
-	 */
-	public String getLocalDefaultUserId();
-
-	/**
-	 * Clear the local default user Id so next query will return the value from
-	 * the preference store.
-	 * <p>
-	 * Same as calling setDefaultUserId(null)
-	 * @see #setDefaultUserId(String)
-	 */
-	public void clearLocalDefaultUserId();
-
-	/**
-	 * Notification method called when this connection is being deleted.
-	 * Allows doing pre-death cleanup in overriders.
-	 * <p>
-	 * What we need to do is delete our entry in the preference store for our default userId.
-	 */
-	public void deletingHost();
-
-	/**
-	 * Notification method called when this connection's profile is being renamed.
-	 * Allows doing pre-death cleanup in overriders.
-	 * <p>
-	 * Implementations must not fork off other threads in the implementation of this method,
-	 * since the old and new profiles will be locked during the rename operation so deadlock
-	 * could occur when another thread tries to access theprofile during the time of rename
-	 * ongoing.
-	 * </p><p>
-	 * What we need to do is rename our entry in the preference store for our default userId.
-	 * </p>
-	 */
-	public void renamingSystemProfile(String oldName, String newName);
-
-	/**
-	 * Query whether the default userId is to be uppercased.
-	 * @return <code>true</code> if the user id is to be uppercased.
-	 */
-	public boolean getForceUserIdToUpperCase();
-
-	/**
-	 * Compare two userIds taking case sensitivity into account.
-	 * @param userId1 first id to compare
-	 * @param userId2 second id to compare
-	 */
-	public boolean compareUserIds(String userId1, String userId2);
-
-	/**
-	 * Get the system type.
-	 * @return The value of the SystemType attribute
-	 */
-	public IRSESystemType getSystemType();
-
-	/**
-	 * Set the system type.
-	 * @param value The new value of the SystemType attribute
-	 */
-	public void setSystemType(IRSESystemType value);
-
-	/**
-	 * Get the unique user-visible connection name.
-	 * This is a key that is unique per connection pool.
-	 * @return The value of the AliasName attribute
-	 */
-	public String getAliasName();
-
-	/**
-	 * Set the unique user-visible connection name.
-	 * This needs to be a key that is unique per connection pool.
-	 * @param value The new value of the AliasName attribute
-	 */
-	public void setAliasName(String value);
-
-	/**
-	 * Get the host name or IP address.
-	 * @return The value of the HostName attribute
-	 */
-	public String getHostName();
-
-	/**
-	 * Set the host name or IP address.
-	 * @param value The new value of the HostName attribute
-	 */
-	public void setHostName(String value);
-
-	/**
-	 * Return the description of this host.
-	 * @return The value of the Description attribute
-	 */
-	public String getDescription();
-
-	/**
-	 * Set the description of this host.
-	 * @param value The new value of the Description attribute
-	 */
-	public void setDescription(String value);
-
-	/**
-	 * Return the default user Id for this host.
-	 * 
-	 * Note that we don't store it directly in an attribute, as we don't want 
-	 * the team to share it. The actual user Id is stored in the preference 
-	 * store keyed by this connection's unique name (profile.connName) instead,
-	 * and that key is stored in this attribute.
-	 * <p>
-	 * Further, it is possible that there is no default user id. If so, this 
-	 * method will go to the preference store and will try to get the default user
-	 * Id per this connection's system type.
-	 * <p>
-	 * This is all transparent to the caller though.
-	 * <p>
-	 * @return The value of the DefaultUserId attribute
-	 */
-	public String getDefaultUserId();
-
-	/**
-	 * Intercept of setDefaultUserId so we can force it to uppercase.
-	 * Also, we do not store the user Id per se in the attribute, but rather
-	 * we store it in the preference with a key name unique to this connection.
-	 * We store that key name in this attribute. However, this is all transparent to
-	 * the caller.
-	 * @param value The new value of the DefaultUserId attribute
-	 */
-	public void setDefaultUserId(String value);
-
-	/**
-	 * Check if this host is promptable.
-	 * @return The value of the Promptable attribute
-	 */
-	boolean isPromptable();
-	
-	/**
-	 * Returns the default encoding of the host.
-	 * <p>
-	 * If fromRemote is <code>false</code>, returns an encoding preference
-	 * specified locally without querying the remote system (for example, 
-	 * an encoding set by a user).
-	 * If fromRemote is <code>true</code>, it first checks to see if there is
-	 * a local "overriding" encoding set by the client without querying the
-	 * remote system, and if such a "local" encoding preference does not exist,
-	 * returns the encoding that was set by the client by querying a remote system.
-	 * </p>
-	 * @param fromRemote <code>false</code> to get the encoding that was
-	 *    obtained by the client by not querying the remote system,
-	 *     <code>true</code> to also check the encoding, if needed, that was
-	 *     set by the client after querying a remote system.
-	 * @return the default encoding of the host, or <code>null</code> if
-	 *     no encoding was set.
-	 * @see #setDefaultEncoding(String, boolean)
-	 */
-	public String getDefaultEncoding(boolean fromRemote);
-	
-	/**
-	 * Set the default encoding of the host.
-	 * <p>
-	 * This method can only be called when no subsystem is connected.
-	 * The client has to obtain the encoding either by querying the
-	 * remote system, or by some other means (for example, set by a user).
-	 * </p>
-	 * @param encoding the encoding of the host, or <code>null</code>
-	 *     to erase the current encoding.
-	 * @param fromRemote <code>true</code> if the encoding is set by the
-	 *     client after querying the remote system, or <code>false</code> 
-	 *     otherwise (e.g. setting a local user preference).
-	 * @see #getDefaultEncoding(boolean)
-	 */
-	public void setDefaultEncoding(String encoding, boolean fromRemote);
-
-	/**
-	 * Set the promptable attribute.
-	 * @param value The new value of the Promptable attribute
-	 */
-	void setPromptable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Offline</b></em>' attribute.
-	 * <p>
-	 * Query if this connection is offline or not. 
-	 * If so, there is no live connection. Subsystems
-	 * decide how much to enable while offline.
-	 * It is up to each subsystem to honor this flag.
-	 * </p>
-	 * @return the value of the '<em>Offline</em>' attribute.
-	 * @see #setOffline(boolean)
-	 */
-	boolean isOffline();
-
-	/**
-	 * Specify if this connection is offline or not.
-	 * It is up to each subsystem to honor this flag.
-	 *  
-	 * @param value the new value of the '<em>Offline</em>' attribute.
-	 * @see #isOffline()
-	 */
-	void setOffline(boolean value);
-
-	/**
-	 * Returns all the connector services currently configured for this host
-	 * @return the connector services
-	 */
-	IConnectorService[] getConnectorServices();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ILabeledObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ILabeledObject.java
deleted file mode 100644
index 2b8f86ad3..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ILabeledObject.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * David Dykstal (IBM) - initial API and implementation
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * This interface provides a means of extending RSE model objects and property sets
- * with labels that can be used for display purposes.
- * The persistence characteristics of labels are left to the implementing 
- * objects.
- */
-public interface ILabeledObject {
-
-	/**
-	 * @return the display label for the object. If this has not 
-	 * previously been set, this can return the name of object or
-	 * some other generated or constant label. It may return null
-	 * if no label can be determined.
-	 */
-	public String getLabel();
-	
-	/**
-	 * @param label A display label for this object.
-	 */
-	public void setLabel(String label);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java
deleted file mode 100644
index e60e52472..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IProperty.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - added javadoc
- * David Dykstal (IBM) - [150939] added read-only attribute
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * Properties are contained in property sets ({@link IPropertySet}) and may be
- * associated with objects that implement {@link IPropertySetContainer}. These
- * would typically be model objects. Properties also have a type (see
- * {@link IPropertyType}).
- *
- * @see IRSEModelObject
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients. Use
- *           {@link Property} directly.
- */
-public interface IProperty {
-
-	/**
-	 * @return the name of the property.
-	 */
-	public String getKey();
-
-	/**
-	 * Sets the displayable label of the property.
-	 * @param label the label for this property.
-	 */
-	public void setLabel(String label);
-
-	/**
-	 * @return the displayable label of this property
-	 */
-	public String getLabel();
-
-	/**
-	 * Sets the value of this property.
-	 * May raise a runtime exception if the new value of the property is
-	 * not compatible with its type.
-	 * @param value the new value for this property.
-	 */
-	public void setValue(String value);
-
-	/**
-	 * @return the value of this property
-	 */
-	public String getValue();
-
-	/**
-	 * Sets the type of this property. May raise an runtime exception if the
-	 * value of the property is not compatible with the new type.
-	 *
-	 * @param type the property type
-	 */
-	public void setType(IPropertyType type);
-
-	/**
-	 * @return the type of this property
-	 */
-	public IPropertyType getType();
-
-	/**
-	 * Sets the "enabled" presentation attribute of this property.
-	 * This is an attribute that can be used to drive the presentation of this
-	 * property and does not otherwise affect how this property can be used.
-	 * Properties are enabled by default.
-	 * @param flag true if the property is to be enabled.
-	 */
-	public void setEnabled(boolean flag);
-
-	/**
-	 * Retrieves the "enabled" presentation attribute of this property.
-	 * This is an attribute that can be used to drive the presentation of this
-	 * property and does not otherwise affect how this property can be used.
-	 * @return true if the property is enabled.
-	 */
-	public boolean isEnabled();
-
-	/**
-	 * Sets the "read-only" presentation attribute of this property.
-	 * This is an attribute that can be used to drive the presentation of this
-	 * property and does not otherwise affect how this property can be used.
-	 * Properties are read-write by default.
-	 * @param flag true if the property is to be read-only.
-	 */
-	public void setReadOnly(boolean flag);
-
-	/**
-	 * Retrieves the "read-only" presentation attribute of this property.
-	 * This is an attribute that can be used to drive the presentation of this
-	 * property and does not otherwise affect how this property can be used.
-	 * @return true if the property is read-only.
-	 */
-	public boolean isReadOnly();
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java
deleted file mode 100644
index e5b04adda..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySet.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - Added Javadoc.
- * David McKnight   (IBM)        - [217715] [api] RSE property sets should support nested property sets
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.util.Map;
-
-/**
- * A Property Set stores key/value pairs, where the keys are Strings and the
- * values are an {@link IProperty}, of a type declared by an
- * {@link IPropertyType}.
- *
- * The Property Set is identified by a name. By default, the type of each
- * property is of type String, and in fact each value can be retrieved in String
- * representation.
- *
- * The key <code>"description"</code> is reserved for internal use, to store the
- * description of the Property set.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients. Use
- *           {@link PropertySet} directly.
- */
-public interface IPropertySet extends IPropertySetContainer {
-	/**
-	 * The key used to store the description of the Property Set.
-	 * This is no longer used and should not be referenced except for
-	 * compatibility reasons.
-	 */
-	public static final String DESCRIPTION_KEY = "description"; //$NON-NLS-1$
-
-	/**
-	 * Return the name of this Property Set.
-	 * @return String name of the Property Set.
-	 */
-	public String getName();
-
-	/**
-	 * Return the description of this Property Set.
-	 *
-	 * Note that in order to set the description, you need to call
-	 * <code>addProperty(IPropertySet.DESCRIPTION_KEY, "Description");</code>
-	 *
-	 * @return Description of the Property Set,
-	 * 		or <code>null</code> in case no description has been set.
-	 */
-	public String getDescription();
-
-	/**
-	 * Sets the description property of the property set.
-	 * Fully equivalent to
-	 * <code>addProperty(IPropertySet.DESCRIPTION_KEY, description);</code>
-	 * @param description the string describing this property set.
-	 */
-	public void setDescription(String description);
-
-	/**
-	 * Return the {@link IProperty} associated with the given key.
-	 *
-	 * If the key is not in the set, <code>null</code> is returned.
-	 *
-	 * @param key String key for Property
-	 * @return requested Property,
-	 * 		or <code>null</code> if the key is not found in the set.
-	 */
-	public IProperty getProperty(String key);
-
-	/**
-	 * Return the String representation of a Property.
-	 *
-	 * Provided that the key is found in the set, this is a shortcut
-	 * for getProperty(key).getValue(). If the key is not in the set,
-	 * <code>null</code> is returned.
-	 *
-	 * @param key String key for Property
-	 * @return String value of requested Property,
-	 * 		or <code>null</code> if the key is not found in the set.
-	 */
-	public String getPropertyValue(String key);
-
-	/**
-	 * Return the list of Property Keys in this Set.
-	 *
-	 * Provided that the Set has a description, the
-	 * @link{DESCRIPTION_KEY} key will also be in the list.
-	 * The interface defines no particular ordering for the
-	 * keys.
-	 *
-	 * @return String array of Property keys.
-	 */
-	public String[] getPropertyKeys();
-
-	/**
-	 * Return the type of the property identified by the given key.
-	 *
-	 * @param key String key for Property
-	 * @return Type of requested Property,
-	 * 		or <code>null</code> if the key is not found in the set.
-	 */
-	public IPropertyType getPropertyType(String key);
-
-	/**
-	 * Set the name of this Property Set.
-	 * @param name the name to set. Must not be <code>null</code>
-	 */
-	public void setName(String name);
-
-	/**
-	 * Set all the Properties of this set.
-	 *
-	 * @param map a Map of String to {@link IProperty} associations.
-	 */
-	public void setProperties(Map map);
-
-	/**
-	 * Add a Property with String value to the set.
-	 *
-	 * In case a Property already exist for the given key, it will be overwritten
-	 * by the new value, note that this will <b>not</b> change the Property's type,
-	 * so if the key identifies an integer Property but you set it to String value
-	 * "foo" the resulting Property Set will be inconsistent.
-	 *
-	 * If the Property does not yet exist in the set, a new key will be added and
-	 * the new Property will be of type "String".
-	 *
-	 * @param key Key to add
-	 * @param value Value to add
-	 * @return The added Property
-	 */
-	public IProperty addProperty(String key, String value);
-
-	/**
-	 * Add a typed Property to the set.
-	 *
-	 * In case a Property already exists for the given key, it will be
-	 * removed and replaced by the new one.
-	 *
-	 * @param key Key to add
-	 * @param value Value to add
-	 * @param type Type of the Property to add
-	 * @return The added Property
-	 */
-	public IProperty addProperty(String key, String value, IPropertyType type);
-
-	/**
-	 * Remove a Property from the set.
-	 *
-	 * @param key The key to remove
-	 * @return <code>true</code> if the Property has been removed,
-	 *      or <code>false</code> if the key has not been part of the set.
-	 */
-	public boolean removeProperty(String key);
-
-	/**
-	 * Sets the container of this property set. Used to notify the container of
-	 * a change in a property.
-	 *
-	 * @param container the property set container
-	 */
-	public void setContainer(IPropertySetContainer container);
-
-	/**
-	 * @return the container of this property set or null if there is no container.
-	 */
-	public IPropertySetContainer getContainer();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java
deleted file mode 100644
index 6b1e2e0c4..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Johann Draschwandtner (Wind River) - [227509][apidoc] Add note how to persist property sets
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * A property set container is capable of containing property sets. This interface allows for the
- * addition, retrieval, and deletion of property sets from the container. A property set may have only
- * one container.
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IPropertySetContainer {
-
-	/**
-	 * Retrieves an array all property sets known to this container. It will return an empty array if this
-	 * container has property sets. The order of these property sets is not dictated by the interface.
-	 * @return an array of property sets.
-	 */
-	public IPropertySet[] getPropertySets();
-
-	/**
-	 * Retrieves a particular property set by its name.
-	 * @param name the name of the property set.
-	 * @return the named property set or null if one by that name does not exist.
-	 */
-	public IPropertySet getPropertySet(String name);
-
-	/**
-	 * Creates a new property set of a particular name in this container.
-	 *
-	 * If one already exists by this name, it is replaced with a new empty
-	 * property set.
-	 *
-	 * In order to have the property set persisted, the implementing class
-	 * should also implement {@link IRSEPersistableContainer}. The
-	 * {@link IRSEPersistableContainer#commit()} method must then be used to
-	 * commit any changes into persistent storage.
-	 *
-	 * @param name the name of the property set.
-	 * @return The property set.
-	 */
-	public IPropertySet createPropertySet(String name);
-
-	/**
-	 * Creates a new property set of a particular name and description in this
-	 * container. If one already exists by this name it is replaced with a new
-	 * empty property set.
-	 * 
-	 * In order to have the property set persisted, the implementing class
-	 * should also implement {@link IRSEPersistableContainer}. The
-	 * {@link IRSEPersistableContainer#commit()} method must then be used to
-	 * commit any changes into persistent storage.
-	 * 
-	 * @param name the name of the property set.
-	 * @param description the description (usually already localized) for this
-	 *            property set.
-	 * @return the newly created property set.
-	 */
-	public IPropertySet createPropertySet(String name, String description);
-
-	/**
-	 * Adds an existing property set to this container. If the property set already has a container
-	 * it is removed from that container and added to this one. If this container already
-	 * has a property set by this name, this one replaces it.
-	 * @param set the property set to be added.
-	 * @return true if the property set was added.
-	 */
-	public boolean addPropertySet(IPropertySet set);
-
-	/**
-	 * Adds a number of existing property sets to this container.
-	 * @param sets the sets to be added
-	 * @return true if all property sets were added.
-	 * @see #addPropertySet(IPropertySet)
-	 */
-	public boolean addPropertySets(IPropertySet[] sets);
-
-	/**
-	 * Removes a particular property set from this container.
-	 * @param name the name of the property set to be removed
-	 * @return true if the property set was removed;
-	 * false if a property set was not removed, usually if it does not exist in the container.
-	 */
-	public boolean removePropertySet(String name);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java
deleted file mode 100644
index 7946ab8c3..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertyType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - added javadoc
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * Property types are used to type instances of {@link IProperty}.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients. Use
- *           {@link PropertyType} directly.
- */
-public interface IPropertyType {
-
-	public static final int TYPE_STRING = 0;
-	public static final int TYPE_INTEGER = 1;
-	public static final int TYPE_ENUM = 2;
-	public static final int TYPE_BOOLEAN = 3;
-
-	/**
-	 * @return true if the property is of TYPE_STRING
-	 */
-	public boolean isString();
-
-	/**
-	 * @return true if the property is of TYPE_INTEGER
-	 */
-	public boolean isInteger();
-
-	/**
-	 * @return true if the property is of TYPE_ENUM
-	 */
-	public boolean isEnum();
-
-	/**
-	 * @return true if the property is of TYPE_BOOLEAN
-	 */
-	public boolean isBoolean();
-
-	/**
-	 * @return the integer value of the property type
-	 */
-	public int getType();
-
-	/**
-	 * @return the array of values that comprise the enumeration
-	 */
-	public String[] getEnumValues();
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSECallback.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSECallback.java
deleted file mode 100644
index 4af32dc4f..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSECallback.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- ********************************************************************************/
-package org.eclipse.rse.core.model;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Implement this class to create callbacks.
- */
-public interface IRSECallback {
-
-	public void done(IStatus status, Object result);
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java
deleted file mode 100644
index ce0e1b2c6..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-
-/**
- * IRSEModelObject is the root type of all objects in the RSE model.
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- * The standard implementations are included in the framework. 
- */
-public interface IRSEModelObject extends IPropertySetContainer, IRSEPersistableContainer {
-
-	String getName();
-
-	String getDescription();
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java
deleted file mode 100644
index c091337bf..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - adding new persistence support
- * David Dykstal (IBM) - 142806: refactoring persistence framework
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * This is the interface for all objects that contain persistent data.
- * The objects themselves may not have a persistent form, but can lie in the
- * persistence hierarchy and be reconstructed when the persistent form is restored.
- * An example of this is the SytemFilterPoolManager, which is itself not persisted, but
- * has this interface since it can be reconstructed from its ordering and exists
- * in the parent chain from SystemFilterPool to SystemProfile.
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework. 
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEPersistableContainer {
-	
-	/**
-	 * A constant indicating the presence of no children for a given container.
-	 * This can be used when implementing {@link #getPersistableChildren()}.
-	 * The value is an empty array.
-	 */
-	public static final IRSEPersistableContainer[] NO_CHILDREN = new IRSEPersistableContainer[0];
-
-	/**
-	 * Request a persistence manager to persist this object.
-	 * @return true if the object was persisted.
-	 */
-	public boolean commit();
-
-	/**
-	 * An object was restored if it originated from a persistent form.
-	 * @return true if the object was created from its persistent form,
-	 * false if the object has never been persisted.
-	 */
-	public boolean wasRestored();
-
-	/**
-	 * Sets the restored state of the object. Only persistence managers 
-	 * should do this. Persistable objects should be initially created with 
-	 * this as false and the persistence manager set this to true.
-	 * This attribute is "sticky" in the face of most property changes.
-	 * It should be set false if the object is renamed or re-parented.
-	 * @param flag true if the object was restored.
-	 */
-	public void setWasRestored(boolean flag);
-		
-	/**
-	 * An object is dirty if a change has been made to it that requires
-	 * it to be persisted.
-	 * @return true if the object is dirty
-	 */
-	public boolean isDirty();
-
-	/**
-	 * <p>An object is dirty if a change has been made to it that requires
-	 * it to be persisted. Objects should usually mark themselves dirty
-	 * when a persistable change is made. However, there may be a need
-	 * to mark related objects dirty as well.
-	 * <p>Persistable changes are:
-	 * <ul>
-	 * <li>Any modification of a persistable attribute</li>
-	 * <li>A rename</li>
-	 * <li>A deletion of a child object</li>
-	 * <li>A reordering of the list of child objects</li>
-	 * <li>The addition of a child object</li>
-	 * </ul>
-	 * <p>A rename may also cause a parent to be marked dirty if the 
-	 * parent refers to the child by name.
-	 * <p>Setting this value to false should be done only in the persistence
-	 * manager after the object has been written to the DOM.
-	 * <p>Marking an object as dirty must cause it and all of its ancestors
-	 * in the persistence hierarchy to be marked as tainted.
-	 * @param flag true if the object must be persisted.
-	 */
-	public void setDirty(boolean flag);
-
-	/**
-	 * An object is tainted if it contains an object that is dirty 
-	 * somewhere in its containment hierarchy.
-	 * @return true if the object is tainted.
-	 */
-	public boolean isTainted();
-	
-	/**
-	 * Sets the tainted attribute for this object. This should set to 
-	 * true only by child objects when they have been marked dirty or tainted.
-	 * Setting this to true will cause all parent objects in the containment
-	 * hierarchy to be marked tainted.
-	 * It should be set to false only by a persistence manager when the
-	 * object has been committed.
-	 * @param flag the tainted state of the object.
-	 */
-	public void setTainted(boolean flag);
-	
-	/**
-	 * Retrieve the parent of this object in the persistence containment hierarchy.
-	 * This is related to, but not necessarily the same as, the model hierarchy.
-	 * @return the parent persistent object. This is null if there is no parent.
-	 */
-	public IRSEPersistableContainer getPersistableParent();
-	
-	/**
-	 * Retrieves the children of this object in the persistence containment hierarchy.
-	 * This is related to, but not necessarily the same as, the model hierarchy.
-	 * @return the array of persistent children in the order they are to be stored in the 
-	 * persistent form. This is an empty array if there are no children.
-	 * See {@link #NO_CHILDREN}.
-	 */
-	public IRSEPersistableContainer[] getPersistableChildren();
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurationCategories.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurationCategories.java
deleted file mode 100644
index 7bbcbbf2d..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurationCategories.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * Constants for predefined subsystem factory categories. Use these in calls to
- * {@link org.eclipse.rse.core.model.ISystemRegistry#getHostsBySubSystemConfigurationCategory(String)}
- * . This is a constant interface. The individual items should be referenced
- * directly.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISubSystemConfigurationCategories {
-	/**
-	 * Job subsystems
-	 */
-	public static final String SUBSYSTEM_CATEGORY_JOBS = "jobs"; //$NON-NLS-1$
-	/**
-	 * File subsystems
-	 */
-	public static final String SUBSYSTEM_CATEGORY_FILES = "files"; //$NON-NLS-1$
-	/**
-	 * Command subsystems
-	 */
-	public static final String SUBSYSTEM_CATEGORY_CMDS = "commands"; //$NON-NLS-1$
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurator.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurator.java
deleted file mode 100644
index 799be5356..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISubSystemConfigurator.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [168976][api] move ISystemNewConnectionWizardPage from core to UI
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-
-/**
- * An interface used to drive properties into a subsystem during host creation.
- *
- * This is an internal interface for use in the framework. Potential clients
- * should extend one of the implementations or implement one of the extensions.
- *
- * @since org.eclipse.rse.core 3.0
- */
-public interface ISubSystemConfigurator {
-
-	/**
-	 * Return the subsystem configuration associated with these properties.
-	 */
-	public ISubSystemConfiguration getSubSystemConfiguration();
-
-	/**
-	 * Apply the values herein to a subsystem.
-	 * @param ss the subystem to be affected.
-	 * @return true if the values were applied.
-	 */
-	public boolean applyValues(ISubSystem ss);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java
deleted file mode 100644
index 20aaa54d1..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * ISystemContainer is an interface implemented by objects that can contain remote resources.
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * These implementations can be extended by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemContainer {
-
-	/**
-	 * Returns whether the object has contents of a particular type.
-	 * @param contentsType type of contents 
-	 * @return <code>true</code> if the object has contents, <code>false</code> otherwise.
-	 */
-	public boolean hasContents(ISystemContentsType contentsType);
-
-	/**
-	 * Returns all the contents of the object (combining results of all filters 
-	 * @param contentsType type of contents
-	 * @return an array of contents.
-	 */
-	public Object[] getContents(ISystemContentsType contentsType);
-
-	/**
-	 * Indicates whether the cached object is stale
-	 * @return whether the container is stale
-	 */
-	public boolean isStale();
-
-	/**
-	 * Marks the object as stale or not
-	 * @param isStale whether the object is to be marked stale or not
-	 */
-	public void markStale(boolean isStale);
-
-	/**
-	 * Marks the object as stale or not
-	 * @param isStale whether the object is to be marked stale or not
-	 * @param clearCache indicates whether or not to clear the cache
-	 */
-	public void markStale(boolean isStale, boolean clearCache);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java
deleted file mode 100644
index a178418ef..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * Common interface for representing different contents types of artifacts that
- * can be stored in an IRemoteContainer.
- * 
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemContentsType {
-	/*
-	 * Indicates the type of this contents
-	 */
-	public String getType();
-
-	/*
-	 * Indicates whether or not the contents
-	 * can be flushed or not when a container becomes
-	 * stale.
-	 */
-	public boolean isPersistent();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java
deleted file mode 100644
index 104cba69e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * Martin Oberhuber (Wind River) - [210534] Remove ISystemHostPool.getHostList() and setName()
- * David Dykstal (IBM) - [210537] removed exception signalling from this interface, no longer needed
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.IRSEUserIdConstants;
-
-/**
- * An ordered list of connections ({@link IHost} objects), owned by an
- * {@link ISystemProfile}.
- * <p>
- * Implementations of this interface are expected to be thread-safe in the sense
- * that integrity of the host list is maintained even if multiple threads call
- * multiple methods in this interface concurrently.
- * </p>
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemHostPool extends IRSEPersistableContainer {
-
-	/**
-	 * Return the system profile that owns this connection pool.
-	 * @return the system profile that owns this connection pool.
-	 */
-	public ISystemProfile getSystemProfile();
-
-	/**
-	 * Return the name of this host pool.
-	 * @return The value of the Name attribute.
-	 */
-	String getName();
-
-	/**
-	 * Rename this connection pool.
-	 * @param newName the new name for this connection pool.
-	 */
-	public void renameHostPool(String newName);
-
-	/**
-	 * Return array of connections in this pool.
-	 * 
-	 * The returned array is a copy of the internal connection list. Modifications by
-	 * clients will not affect the internal list of connections, but modifications to
-	 * the array elements will affect the actual IHost objects maintained in the list.
-	 * 
-	 * @return array of connections in this pool.
-	 */
-	public IHost[] getHosts();
-
-	/**
-	 * Create a connection object, given only the minimal information.
-	 * <p>
-	 * THE RESULTING CONNECTION OBJECT IS ADDED TO THE LIST OF EXISTING CONNECTIONS FOR YOU.
-	 * @param systemType system type matching one of the system types
-	 *     defined via the systemTypes extension point.
-	 * @param aliasName unique connection name.
-	 * @param hostName IP name or address of the host.
-	 * @return IHost object, or null if it failed to create
-	 *   because the aliasName is not unique. All other errors throw an exception.
-	 */
-	public IHost createHost(IRSESystemType systemType, String aliasName, String hostName);
-
-	/**
-	 * Create a connection object, given all the possible attributes except default userId.
-	 * <p>
-	 * THE RESULTING CONNECTION OBJECT IS ADDED TO THE LIST OF EXISTING CONNECTIONS FOR YOU.
-	 * @param systemType system type matching one of the system types
-	 *     defined via the systemTypes extension point.
-	 * @param aliasName unique connection name.
-	 * @param hostName IP name or address of the host.
-	 * @param description optional description of the connection. Can be null.
-	 * @return IHost object, or <code>null</code> if it failed to create
-	 *   because the aliasName is not unique. All other errors throw an exception.
-	 */
-	public IHost createHost(IRSESystemType systemType, String aliasName, String hostName, String description);
-
-	/**
-	 * Create a connection object, given all the possible attributes.
-	 * <p>
-	 * The new connection is added to the list and saved to disk.
-	 * @param systemType system type matching one of the system types
-	 *     defined via the systemTypes extension point.
-	 * @param aliasName unique connection name.
-	 * @param hostName IP name or address of the host.
-	 * @param description optional description of the connection. Can be null.
-	 * @param defaultUserId userId to use as the default for the subsystems.
-	 * @param defaultUserIdLocation where to set the given default user Id. See IRSEUserIdConstants for values.
-	 * @return IHost object, or <code>null</code> if it failed to create
-	 *   because the aliasName is not unique.
-	 * @see IRSEUserIdConstants
-	 */
-	public IHost createHost(IRSESystemType systemType, String aliasName, String hostName, String description, String defaultUserId, int defaultUserIdLocation);
-
-	/**
-	 * Update an existing connection given the new information.
-	 * This method:
-	 * <ul>
-	 *  <li>calls the setXXX methods on the given connection object, updating the information in it.
-	 *  <li>saves the connection to disk (renaming its folder if needed)
-	 * </ul>
-	 * <p>
-	 * @param conn IHost to be updated
-	 * @param systemType system type matching one of the system types
-	 *     defined via the systemType extension point.
-	 * @param aliasName unique connection name.
-	 * @param hostName IP name or address of the host.
-	 * @param description optional description of the connection. Can be null.
-	 * @param defaultUserId userId to use as the default for the subsystems.
-	 * @param defaultUserIdLocation where to set the given default user Id from IRSEUserIdConstants.
-	 * @see IRSEUserIdConstants
-	 */
-	public void updateHost(IHost conn, IRSESystemType systemType, String aliasName, String hostName, String description, String defaultUserId, int defaultUserIdLocation);
-
-	/**
-	 * Return a connection object, given its alias name.
-	 * 
-	 * Can be used to test if an alias name is already used (non-null return).
-	 * 
-	 * @param aliasName unique aliasName (case insensitive) to search on.
-	 * @return IHost object with unique aliasName, or null if
-	 *  no connection object with this name exists.
-	 */
-	public IHost getHost(String aliasName);
-
-	/**
-	 * Return the connection at the given zero-based offset.
-	 * @param pos zero-based offset of requested connection in the connection list.
-	 * @return IHost object requested.
-	 */
-	public IHost getHost(int pos);
-
-	/**
-	 * Add a new connection to the list.
-	 * <p>
-	 * This method will not ensure that the added connection's alias name is
-	 * different (case-insensitive) than all other existing alias names.
-	 * Clients are responsible for maintaining this invariant.
-	 * </p>
-	 * @param conn Connection to add. Must not be <code>null</code>.
-	 * @return <code>true</code> if the new connection was added successfully, false otherwise.
-	 */
-	public boolean addHost(IHost conn);
-
-	/**
-	 * Removes a given connection from the list and deletes it from disk.
-	 * <p>
-	 * This will:
-	 * <ul>
-	 *    <li>Delete the connection in memory
-	 *    <li>Delete the underlying folder
-	 * </ul>
-	 * <p>
-	 * @param conn IHost object to remove
-	 */
-	public void deleteHost(IHost conn);
-
-	/**
-	 * Renames a given connection in the list.
-	 * This will:
-	 * <ul>
-	 *    <li>Rename the profile in memory
-	 *    <li>Rename the underlying folder
-	 *    <li>Update the user preferences if this profile is currently active.
-	 * </ul>
-	 * @param conn IHost object to rename
-	 * @param newName The new alias name to give that connection.
-	 *     The alias name is not checked for uniqueness. Clients are responsible
-	 *     themselves for ensuring that no two connections with the same alias
-	 *     name (compared case insensitive) are created.
-	 */
-	public void renameHost(IHost conn, String newName);
-
-	/**
-	 * Return the zero-based position of a connection object within this host pool.
-	 * @param conn connection to find in this host pool.
-	 * @return the zero-based position of the requested connection in this host pool,
-	 *     or -1 if the connection was not found.
-	 */
-	public int getHostPosition(IHost conn);
-
-	/**
-	 * Return the number of connections within this pool.
-	 * @return the number of IHost objects within this pool.
-	 */
-	public int getHostCount();
-
-	/**
-	 * Duplicates a given connection in this list within this list or another list.
-	 * @param targetPool The ISystemHostPool to hold the copied connection. Can equal this pool,
-	 *     as long as alias name is unique.
-	 * @param conn IHost object (within our pool) to clone.
-	 * @param aliasName New, unique, alias name to give this connection. Clone will fail
-	 *     (returning <code>null</code> as result) if this is not unique.
-	 * @return the cloned host, or <code>null</code> if the new alias name was not unique.
-	 */
-	public IHost cloneHost(ISystemHostPool targetPool, IHost conn, String aliasName);
-
-	/**
-	 * Move existing connections a given number of positions in the same pool.
-	 * If the delta is negative, they are all moved up (left) by the given amount. If
-	 * positive, they are all moved down (right) by the given amount.<p>
-	 * <ul>
-	 * <li>After the move, the pool containing the moved connection is saved to disk.
-	 * <li>The connection's alias name must be unique in pool.
-	 * </ul>
-	 * <b>TODO PROBLEM: CAN'T RE-ORDER FOLDERS SO CAN WE SUPPORT THIS ACTION?</b>
-	 * @param conns an Array of hosts to move, can be empty but must not be null.
-	 * @param delta the amount by which to move the hosts within this pool
-	 */
-	public void moveHosts(IHost conns[], int delta);
-
-	/**
-	 * Order connections by alias name, in the order given by the names parameter.
-	 * 
-	 * Called after restore to order by user preferences. Alias names are case-insensitive.
-	 * Existing connections in the internal connection list that do not match any
-	 * alias name in the given name list, will be deleted from this host pool!
-	 * 
-	 * @param names list of connection alias names in expected order.
-	 */
-	public void orderHosts(String[] names);
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java
deleted file mode 100644
index 40bcbefde..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemMessageObject.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * This interface represents a message we wish to display as child node in the
- * tree view.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients. The
- *           standard implementations are included in the framework.
- */
-public interface ISystemMessageObject {
-	/**
-	 * 0. An error occurred.
-	 */
-	public static final int MSGTYPE_ERROR = 0;
-	/**
-	 * 1. User cancelled
-	 */
-	public static final int MSGTYPE_CANCEL = 1;
-	/**
-	 * 3. Informational text
-	 */
-	public static final int MSGTYPE_INFO = 2;
-	/**
-	 * 4. Empty list. Eg "Nothing meets subset criteria"
-	 */
-	public static final int MSGTYPE_EMPTY = 3;
-	/**
-	 * 5. Object created successfully.
-	 */
-	public static final int MSGTYPE_OBJECTCREATED = 4;
-
-	/**
-	 * Return the message text shown for the label.
-	 * The translated text is pre-determined from the message type.
-	 */
-	public String getMessage();
-
-	/**
-	 * Return the type of message:
-	 * <ul>
-	 *  <li>{@link #MSGTYPE_ERROR}
-	 *  <li>{@link #MSGTYPE_CANCEL}
-	 *  <li>{@link #MSGTYPE_INFO}
-	 *  <li>{@link #MSGTYPE_EMPTY}
-	 *  <li>{@link #MSGTYPE_OBJECTCREATED}
-	 * </ul>
-	 */
-	public int getType();
-
-	/**
-	 * Return the parent object in the tree. That is, what was expanded to produce this message
-	 */
-	public Object getParent();
-
-	/**
-	 * isTransient determines if the message should be removed from the
-	 * tree when the parent item in the tree is collapsed.
-	 *
-	 * @return true if the item should be removed, false if it should not
-	 */
-	public boolean isTransient();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java
deleted file mode 100644
index d1ba5bed8..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*********************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * A modifiable container allows its contents to be set directly.
- * 
- * @noimplement This interface is not intended to be implemented by clients. The
- *              standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- *
- * @since org.eclipse.rse.core 3.0
- */
-public interface ISystemModifiableContainer extends ISystemContainer {
-
-	/**
-	 * Cache contents of a certain type.
-	 * @param type the contents type.
-	 * @param cachedContents the contents to cache.
-	 */
-	public void setContents(ISystemContentsType type, Object[] cachedContents);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java
deleted file mode 100644
index 3d18fa539..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfile.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - 142806: refactoring persistence framework
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * David Dykstal (IBM) - [197036] removed createHost() shortcut (should use ISystemRegistry),
- *    cleaned javadoc for getFilterPools()
- * David Dykstal (IBM) - [202630] getDefaultPrivateProfile() and ensureDefaultPrivateProfile() are inconsistent
- * David Dykstal (IBM) - [200735][Persistence] Delete a profile that contains a connection and restart, profile is back without connections
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.persistence.IRSEPersistenceProvider;
-
-/**
- * A system profile holds definitions for hosts (connections), filter pools,
- * filters, and filter strings. It is the unit of persistence for those
- * definitions. Individual hosts and filter pool definitions always reside in a
- * profile and the profile itself is the entity that is saved and restored.
- * <p>
- * Profiles may be active or inactive. An active profile contributes its
- * definitions to RSE. When made inactive, it those definition are no longer
- * available for use.
- * <p>
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients. The
- *           standard implementations are included in the framework.
- */
-public interface ISystemProfile extends IRSEModelObject {
-
-	/**
-	 * Set the in-memory pointer back to the parent system profile manager
-	 */
-	public void setProfileManager(ISystemProfileManager mgr);
-
-	/**
-	 * Get the in-memory pointer back to the parent system profile manager
-	 */
-	public ISystemProfileManager getProfileManager();
-
-	/**
-	 * @return The value of the Name attribute
-	 */
-	String getName();
-
-	/**
-	 * Sets the name of the profile.
-	 * Profile names must not contain three consecutive underscores "___", since these are used
-	 * to separate a profile name from a filter pool name in a filter pool reference.
-	 * @param value The new value of the Name attribute
-	 * @throws IllegalArgumentException if the name contains three consecutive underscore characters.
-	 */
-	void setName(String value);
-
-	/**
-	 * @return The value of the DefaultPrivate attribute
-	 * Is this profile created automatically, and is it the profile
-	 * that is unique for this developer?
-	 */
-	boolean isDefaultPrivate();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @param value The new value of the DefaultPrivate attribute
-	 */
-	void setDefaultPrivate(boolean value);
-
-	/**
-	 * Return all connections for this profile
-	 */
-	public IHost[] getHosts();
-
-	/**
-	 * @return all existing filter pools for this profile.
-	 */
-	public ISystemFilterPool[] getFilterPools();
-
-	/**
-	 * Return all filter pools for this profile, scoped by a given subsystem factory
-	 */
-	public ISystemFilterPool[] getFilterPools(ISubSystemConfiguration ssf);
-
-	/**
-	 * Return true if this profile is currently active.
-	 * An active profile is one that whose connections and filter pools are available
-	 * for use by RSE. A profile may be loaded but be inactive.
-	 * The active state of a profile is remembered from session to session.
-	 */
-	public boolean isActive();
-
-	/**
-	 * Activates or deactivates a profile. If the profile is already in the
-	 * requested state, this will do nothing. The default private system profile
-	 * cannot be deactivated and such a request will be ignored.
-	 * @param flag true to activate the profile, false to deactivate it.
-	 * @see ISystemProfile#isActive()
-	 */
-	public void setActive(boolean flag);
-
-	/**
-	 * Suspend this profile.
-	 * Suspended profiles ignore commit requests.
-	 * Profiles are created in a non-suspended state.
-	 * Profiles should be suspended while deleting their contents prior to their own deletion.
-	 * Note that being non-suspended is a different condition than being active.
-	 * A suspended profile may be resumed.
-	 * @since 3.0
-	 * @see #resume()
-	 */
-	public void suspend();
-
-	/**
-	 * Resume this profile from a suspended state.
-	 * The profile will now honor commit requests.
-	 * @since 3.0
-	 * @see #suspend()
-	 */
-	public void resume();
-
-	/**
-	 * @return true if the profile is in a suspended state
-	 * @since 3.0
-	 * @see #suspend()
-	 * @see #resume()
-	 */
-	public boolean isSuspended();
-
-	/**
-	 * Each profile is persisted by a persistence provider. This returns the instance of the
-	 * persistence provider used for this profile. New profiles will use the default persistence
-	 * provider unless one is set by some other means.
-	 * @return The persistence provider used for saving and restoring this profile.
-	 */
-	public IRSEPersistenceProvider getPersistenceProvider();
-
-	/**
-	 * Sets the persistence provider for the use of this profile. If this is not called then
-	 * this profile will be persisted by the default persistence provider. This will typically
-	 * be set by either a persistence persistence provider when restoring a profile or by a migration
-	 * utility when converting profiles from one form to another.
-	 * @param provider the persistence provider to use when saving this profile.
-	 */
-	public void setPersistenceProvider(IRSEPersistenceProvider provider);
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java
deleted file mode 100644
index cc0551f6c..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemProfileManager.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [197036] added commitSystemProfile operation to interface
- * David Dykstal (IBM) - [202630] getDefaultPrivateProfile() and ensureDefaultPrivateProfile() are inconsistent
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Manages a list of SystemProfile objects. System profiles should be created,
- * deleted, restored, activated, and deactivated though this interface if event
- * processing is not desired. If events are necessary then the system registry
- * should be used.
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients. The
- *           standard implementations are included in the framework.
- */
-public interface ISystemProfileManager {
-
-	/**
-	 * Create a new profile with the given name, and add to the list.
-	 * The name must be unique within the existing list.
-	 * <p>
-	 * @param name What to name this profile
-	 * @param makeActive true if this profile is to be added to the active profile list.
-	 * @return new profile, or null if name not unique.
-	 */
-	public ISystemProfile createSystemProfile(String name, boolean makeActive);
-
-	/**
-	 * Toggle an existing profile's state between active and inactive.
-	 * The default private profile cannot be deactivated and such a request will be ignored.
-	 * @param profile the profile to (in)activate
-	 * @param makeActive the state to make this profile
-	 */
-	public void makeSystemProfileActive(ISystemProfile profile, boolean makeActive);
-
-	/**
-	 * @return an array of all existing profiles. This is guaranteed to contain the
-	 * default private profile.
-	 */
-	public ISystemProfile[] getSystemProfiles();
-
-	/**
-	 * @return the number of profiles known to this manager.
-	 */
-	public int getSize();
-
-	/**
-	 * @return an array of all existing profile names.
-	 */
-	public String[] getSystemProfileNames();
-
-	/**
-	 * Get a profile given its name.
-	 * @param name the name of the profile
-	 * @return the profile
-	 */
-	public ISystemProfile getSystemProfile(String name);
-
-	/**
-	 * @return the profiles identified via preferences as the active profiles...
-	 */
-	public ISystemProfile[] getActiveSystemProfiles();
-
-	/**
-	 * @return the profile names currently selected by the user as his "active" profiles
-	 */
-	public String[] getActiveSystemProfileNames();
-
-	/**
-	 * @return the default private profile created at first touch.
-	 * Will return null if it has been renamed.
-	 */
-	public ISystemProfile getDefaultPrivateSystemProfile();
-
-	/**
-	 * @return the default team profile created at first touch.
-	 * Will return null if it has been renamed.
-	 */
-	public ISystemProfile getDefaultTeamSystemProfile();
-
-	/**
-	 * Rename the given profile.
-	 * @param profile the profile to rename
-	 * @param newName the new profile name
-	 */
-	public void renameSystemProfile(ISystemProfile profile, String newName);
-
-	/**
-	 * Delete the given profile. The default private profile cannot be deleted and such a request will be ignored.
-	 * @param profile the name of the profile to delete.
-	 * @param persist true if the deletion is meant to be persisted as well, false if the deletion is just in the
-	 * model.
-	 */
-	public void deleteSystemProfile(ISystemProfile profile, boolean persist);
-
-	/**
-	 * Clone the given profile
-	 * @param profile the profile to clone
-	 * @param newName the name of the new profile
-	 * @return the new profile
-	 */
-	public ISystemProfile cloneSystemProfile(ISystemProfile profile, String newName);
-
-	/**
-	 * Commit a system profile
-	 *
-	 * @param profile the profile to commit
-	 * @return a status object indicating the result of the commit
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public IStatus commitSystemProfile(ISystemProfile profile);
-
-	/**
-	 * Get an indication of whether a profile is active or not.
-	 * @param profileName the name of the profile to test
-	 * @return true if the given profile is active
-	 * @see ISystemProfile#isActive()
-	 */
-	public boolean isSystemProfileActive(String profileName);
-
-	/**
-	 * Adds a system profile to this profile manager.
-	 * @param profile The system profile to add.
-	 */
-	public void addSystemProfile(ISystemProfile profile);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java
deleted file mode 100644
index ae8996fea..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java
+++ /dev/null
@@ -1,1009 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
- * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
- * Martin Oberhuber (Wind River) - [189123] Prepare ISystemRegistry for move into non-UI
- * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
- * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core
- * David McKnight   (IBM)        - [207100] adding ISystemRegistry.isRegisteredSystemRemoteChangeListener
- * David Dykstal (IBM) - [197036] adding new createHost and getSubSystemConfigurationsBySYstemType which
- *                                are able to delay the creation of subsystems.
- * David Dykstal (IBM) - [217556] remove service subsystem types
- * Martin Oberhuber (Wind River) - [215820] Move SystemRegistry implementation to Core
- * David Dykstal (IBM) - [202630] getDefaultPrivateProfile() and ensureDefaultPrivateProfile() are inconsistent
- * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
- * David Dykstal (IBM) - [168976][api] move ISystemNewConnectionWizardPage from core to UI
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools
- * David Dykstal (IBM) - [236516] Bug in user code causes failure in RSE initialization
- * Martin Oberhuber (Wind River) - [261486][api][cleanup] Mark @noimplement interfaces as @noextend
- * Martin Oberhuber (Wind River) - [245154][api] add getSubSystemConfigurationProxiesBySystemType()
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.events.ISystemModelChangeEvent;
-import org.eclipse.rse.core.events.ISystemModelChangeListener;
-import org.eclipse.rse.core.events.ISystemPreferenceChangeEvent;
-import org.eclipse.rse.core.events.ISystemPreferenceChangeListener;
-import org.eclipse.rse.core.events.ISystemRemoteChangeEvent;
-import org.eclipse.rse.core.events.ISystemRemoteChangeListener;
-import org.eclipse.rse.core.events.ISystemResourceChangeEvent;
-import org.eclipse.rse.core.events.ISystemResourceChangeListener;
-import org.eclipse.rse.core.filters.ISystemFilterStartHere;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy;
-import org.eclipse.rse.internal.core.RSECoreRegistry;
-
-/**
- * Registry or front door for all remote system connections. There is a
- * singleton of the class implementation of this interface. To get it, call the
- * {@link org.eclipse.rse.core.RSECorePlugin#getTheSystemRegistry()}.
- * <p>
- * The idea here is that connections are grouped by system profile. At any time,
- * there is a user-specified number of profiles "active" and connections from
- * each active profile are worked with.
- * </p>
- *
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients. The
- *           standard implementations are included in the framework.
- */
-public interface ISystemRegistry extends ISchedulingRule, IAdaptable, ISystemViewInputProvider {
-
-	/**
-	 * Get the SystemFilterStartHere singleton instance.
-	 * @return the SystemFilterStartHere singleton instance.
-	 */
-	public ISystemFilterStartHere getSystemFilterStartHere();
-
-	// ----------------------------
-	// SUBSYSTEM FACTORY METHODS...
-	// ----------------------------
-
-	/**
-	 * Public method to retrieve list of subsystem configuration proxies
-	 * registered by extension points.
-	 *
-	 * @return all subsystem configuration proxies.
-	 */
-	public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxies();
-
-	/**
-	 * Return all subsystem configuration proxies matching a subsystem
-	 * configuration category.
-	 *
-	 * @param configurationCategory a subsystem configuration category.
-	 * @return all subsystem configuration proxies matching the given category,
-	 *         or an empty array if none matches.
-	 * @see ISubSystemConfigurationCategories
-	 */
-	public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxiesByCategory(String configurationCategory);
-
-	/**
-	 * Return all subsystem configuration proxies that are registered against
-	 * the given system type.
-	 *
-	 * @param systemType system type to filter
-	 * @return all subsystem configuration proxies matching the given system
-	 *         type, or an empty array if none matches.
-	 * @since 3.1
-	 */
-	public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxiesBySystemType(IRSESystemType systemType);
-
-	/**
-	 * Return all subsystem factories.
-	 *
-	 * Be careful when you call this, as it activates all subsystem
-	 * configurations.
-	 *
-	 * @deprecated use {@link #getSubSystemConfigurationProxies()} and filter
-	 *             the list of needed subsystem configurations in order to
-	 *             activate only those that are really needed.
-	 */
-	public ISubSystemConfiguration[] getSubSystemConfigurations();
-
-	/**
-	 * Return the subsystem configuration, given its plugin.xml-declared id.
-	 */
-	public ISubSystemConfiguration getSubSystemConfiguration(String id);
-
-	/**
-	 * Return all subsystem configurations which support the given system type.
-	 * If the type is null, returns all subsystem configurations. Fully
-	 * equivalent to getSubSystemConfigurationsBySystemType(systemType,
-	 * filterDuplicates, <code>true</code>) which is preferred since we do not
-	 * want to load subsystem configurations unless necessary.
-	 *
-	 * @param systemType system type to filter
-	 * @param filterDuplicates if true and the subsystem configuration uses
-	 *            services then return only one subsystem configuration that
-	 *            supports this service. Which configuration is returned is
-	 *            undefined.
-	 * @return an array of subsystem configurations meeting the criteria
-	 *
-	 * @deprecated Use
-	 *             {@link #getSubSystemConfigurationsBySystemType(IRSESystemType,boolean,boolean)}
-	 *             instead in order to avoid instantiating subsystem
-	 *             configurations if possible.
-	 */
-	public ISubSystemConfiguration[] getSubSystemConfigurationsBySystemType(IRSESystemType systemType, boolean filterDuplicates);
-
-	/**
-	 * Return all subsystem configurations which support the given system type.
-	 * If the type is null, returns all subsystem configurations.
-	 *
-	 * @param systemType system type to filter
-	 * @param filterDuplicates if true and the subsystem configuration uses
-	 *            services then return only one subsystem configuration that
-	 *            supports this service. Which configuration is returned is
-	 *            undefined.
-	 * @param activate if true activate the respective configurations if not
-	 *            already active, if false return only those that are already
-	 *            active.
-	 * @return an array of subsystem configurations meeting the criteria
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public ISubSystemConfiguration[] getSubSystemConfigurationsBySystemType(IRSESystemType systemType, boolean filterDuplicates, boolean activate);
-
-	// ----------------------------------
-	// SYSTEMVIEWINPUTPROVIDER METHODS...
-	// ----------------------------------
-
-	/**
-	 * This method is called by the connection adapter when the user expands
-	 * a connection. This method must return the child objects to show for that
-	 * connection.
-	 * @param selectedConnection the connection undergoing expansion
-	 * @return the list of objects under the connection
-	 */
-	public Object[] getConnectionChildren(IHost selectedConnection);
-
-	/**
-	 * This method is called by the connection adapter when deciding to show a plus-sign
-	 * or not beside a connection.
-	 * @param selectedConnection the connection being shown in the viewer
-	 * @return true if this connection has children to be shown.
-	 */
-	public boolean hasConnectionChildren(IHost selectedConnection);
-
-	// ----------------------------
-	// PROFILE METHODS...
-	// ----------------------------
-	/**
-	 * Return singleton profile manager
-	 */
-	public ISystemProfileManager getSystemProfileManager();
-
-	/**
-	 * Return the profiles currently selected by the user as his "active" profiles
-	 * @see ISystemProfileManager#getActiveSystemProfiles()
-	 */
-	public ISystemProfile[] getActiveSystemProfiles();
-
-	/**
-	 * Get a SystemProfile given its name
-	 */
-	public ISystemProfile getSystemProfile(String profileName);
-
-	/**
-	 * Create a SystemProfile given its name and whether or not to make it active
-	 * Note that there are some naming restrictions on profile names.
-	 * @see ISystemProfile#setName(String)
-	 */
-	public ISystemProfile createSystemProfile(String profileName, boolean makeActive) throws Exception;
-
-	/**
-	 * Copy a SystemProfile. All connections connection data is copied.
-	 * Note that there are some naming restrictions on profile names.
-	 * @see ISystemProfile#setName(String)
-	 * @param profile Source profile to copy
-	 * @param newName Unique name to give copied profile
-	 * @param makeActive whether to make the copied profile active or not
-	 * @param monitor Progress monitor to reflect each step of the operation
-	 * @return new SystemProfile object
-	 */
-	public ISystemProfile copySystemProfile(ISystemProfile profile, String newName, boolean makeActive, IProgressMonitor monitor) throws Exception;
-
-	/**
-	 * Rename a SystemProfile. Rename is propagated to all subsystem factories so
-	 * they can rename their filter pool managers and whatever else is required.
-	 * Note that there are some naming restrictions on profile names.
-	 * @see ISystemProfile#setName(String)
-	 */
-	public void renameSystemProfile(ISystemProfile profile, String newName) throws Exception;
-
-	/**
-	 * Delete a SystemProfile. Prior to physically deleting the profile, we delete all
-	 * the connections it has, all the subsystems they have.
-	 * The default private profile cannot be deleted and such a request will be ignored.
-	 * <p>
-	 * As well, all the filter pools for this profile are deleted, and subsequently any
-	 * cross references from subsystems in connections in other profiles are removed.
-	 * <p>
-	 * A delete event is fired for every connection deleted.
-	 */
-	public void deleteSystemProfile(ISystemProfile profile) throws Exception;
-
-	/**
-	 * Make or unmake the given profile active.
-	 * The default private profile cannot be deactivated and such
-	 * a request will be ignored.
-	 */
-	public void setSystemProfileActive(ISystemProfile profile, boolean makeActive);
-
-	/**
-	 * Return the list of connector services currently configured for the given host
-	 * @param host the host
-	 * @return the list of connector services
-	 */
-	public IConnectorService[] getConnectorServices(IHost host);
-
-	// ----------------------------
-	// SUBSYSTEM METHODS...
-	// ----------------------------
-
-	/**
-	 * Return list of subsystem objects for a given host.
-	 * @param host the host for which to return the subsystems that are currently known.
-	 * @return an array of subsystem objects known to this host.
-	 */
-	public ISubSystem[] getSubSystems(IHost host);
-
-	/**
-	 * Return list of subsystem objects for a given connection.
-	 * @param host the host for which to return the subsystems that are known.
-	 * @param force if true, force the creation of subsystems for which the system type of this host is configured.
-	 * Use this parameter with care since it can cause extensive initialization.
-	 * @return the list of subsystems known to this host, possibly after the creation of subsystems.
-	 * @deprecated Use {@link #getSubSystems(IHost)} instead, the "force" parameter is now ignored.
-	 */
-	public ISubSystem[] getSubSystems(IHost host, boolean force);
-
-	/**
-	 * Get those subsystems that are registered against a given connection,
-	 * which are an instance of the given interface class.
-	 * </p>
-	 * @param host the connection to check
-	 * @param subsystemInterface the interface class to filter against
-	 * @return list of matching subsystems
-	 */
-	public ISubSystem[] getSubsystems(IHost host, Class subsystemInterface);
-
-	/**
-	 * Get those subsystems that are registered against a given connection,
-	 * which are service subsystems with the given serviceType.
-	 * </p>
-	 * @param host the host to check
-	 * @param serviceType the class of service to ask for
-	 * @return list of matching subsystems
-	 */
-	public ISubSystem[] getServiceSubSystems(IHost host, Class serviceType);
-
-	/**
-	 * Resolve a subsystem from it's absolute name
-	 * The absolute name of a subsystem
-	 * is denoted by <I>profileName</I>.<I>connectionName</I>:<I>subsystemConfigurationId</I>
-	 * @param absoluteSubSystemName the name of the subsystem
-	 * @return the subsystem or null if the profile, connection, or subsystem configuration cannot be found.
-	 */
-	public ISubSystem getSubSystem(String absoluteSubSystemName);
-
-	/**
-	 * Return the absolute name for the specified subsystem
-	 * @param subsystem the subsystem to query
-	 * @return the absolute name of the subsystem
-	 */
-	public String getAbsoluteNameForSubSystem(ISubSystem subsystem);
-
-	/**
-	 * Return the absolute name for the specified host (connection)
-	 * @param host the host (aka connection) object to query
-	 * @return the absolute name of the host
-	 */
-	public String getAbsoluteNameForConnection(IHost host);
-
-	/**
-	 * Get a list of subsystem objects for given connection, owned by a subsystem factory
-	 * that is of the given category. Array will never be null but may be length zero.
-	 * <p>
-	 * This looks for a match on the "category" of the subsystem factory's xml declaration
-	 *  in its plugin.xml file.
-	 *
-	 * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
-	 * @deprecated use {@link #getSubSystemConfigurationProxiesByCategory(String)}
-	 *    and instantiate only those subsystem configurations from the proxy
-	 *    that are really needed. Then, use {@link ISubSystemConfiguration#getSubSystems(boolean)}
-	 *    with a parameter true.
-	 */
-	public ISubSystem[] getSubSystemsBySubSystemConfigurationCategory(String factoryCategory, IHost host);
-
-	/**
-	 * Delete a subsystem object. This code finds the factory that owns it and
-	 *  delegates the request to that factory.
-	 */
-	public boolean deleteSubSystem(ISubSystem subsystem);
-
-	// ----------------------------
-	// CONNECTION METHODS...
-	// ----------------------------
-	/**
-	 * Return the first connection to the local host we can find.
-	 *
-	 * While we always create a default one in the user's profile, it is possible that
-	 * this profile is not active or the connection was deleted. However, since any
-	 * connection to the local host will usually do, we just search all active profiles
-	 * until we find one, and return it. <br>
-	 * If no connection to the local host can be found, this will return <code>null</code>.
-	 * If one is needed, it can be created easily by calling
-	 * {@link #createLocalHost(ISystemProfile, String, String)}.
-	 */
-	public IHost getLocalHost();
-
-	/**
-	 * Return all connections in all active profiles.
-	 */
-	public IHost[] getHosts();
-
-	/**
-	 * Return all connections in a given profile.
-	 */
-	public IHost[] getHostsByProfile(ISystemProfile profile);
-
-	/**
-	 * Return all connections for which there exists one or more
-	 * subsystems owned by a given subsystem configuration.
-	 * @see #getSubSystemConfiguration(String)
-	 */
-	public IHost[] getHostsBySubSystemConfiguration(ISubSystemConfiguration config);
-
-	/**
-	 * Return all connections for which there exists one or more
-	 * subsystems owned by any a given subsystem configuration
-	 * that is of the given category.
-	 * <p>
-	 * This looks for a match on the "category" of the subsystem
-	 * configuration's xml declaration in its plugin.xml file.
-	 * Thus, it is efficient as it need not bring to life a
-	 * subsystem configuration just to test its parent class type.
-	 *
-	 * @see org.eclipse.rse.core.model.ISubSystemConfigurationCategories
-	 */
-	public IHost[] getHostsBySubSystemConfigurationCategory(String factoryCategory);
-
-	/**
-	 * Returns all connections for all active profiles, for the given system type.
-	 * If the specified system type is null, an empty array is returned.
-	 * In order to get an IRSESystemType, use
-	 * <code>RSECorePlugin.getTheCoreRegistry().{@link RSECoreRegistry#getSystemTypeById(String) getSystemTypeById(String)}</code>
-	 *
-	 * @param systemType The system type instance.
-	 * @return The list of connections or an empty array.
-	 */
-	public IHost[] getHostsBySystemType(IRSESystemType systemType);
-
-	/**
-	 * Return all connections for all active profiles, for the given system types.
-	 *
-	 * In order to get an IRSESystemType, use
-	 * <code>RSECorePlugin.getTheCoreRegistry().{@link RSECoreRegistry#getSystemTypeById(String) getSystemTypeById(String)}</code>
-	 */
-	public IHost[] getHostsBySystemTypes(IRSESystemType[] systemTypes);
-
-	/**
-	 * Return a SystemConnection object given a system profile containing it,
-	 *   and a connection name uniquely identifying it.
-	 */
-	public IHost getHost(ISystemProfile profile, String connectionName);
-
-	/**
-	 * Return the zero-based position of a SystemConnection object within
-	 * its profile.
-	 */
-	public int getHostPosition(IHost conn);
-
-	/**
-	 * Return the number of SystemConnection objects within the given profile.
-	 */
-	public int getHostCount(ISystemProfile profile);
-
-	/**
-	 * Return the number of SystemConnection objects within the given
-	 * connection's owning profile.
-	 */
-	public int getHostCountWithinProfile(IHost conn);
-
-	/**
-	 * Return the number of SystemConnection objects within all active
-	 * profiles.
-	 */
-	public int getHostCount();
-
-	/**
-	 * Return a vector of previously-used connection names in the given profile.
-	 * @return Vector of String objects.
-	 */
-	public Vector getHostAliasNames(ISystemProfile profile);
-
-	/**
-	 * Return a vector of previously-used connection names in all active profiles.
-	 */
-	public Vector getHostAliasNamesForAllActiveProfiles();
-
-	/**
-	 * Return array of previously specified host names for a given system type.
-	 * After careful consideration, it is decided that if the system type is null,
-	 * then no host names should be returned. Previously all for all types were returned.
-	 */
-	public String[] getHostNames(IRSESystemType systemType);
-
-	/**
-	 * Convenience method to create a local connection, as it often that one is needed
-	 *  for access to the local file system.
-	 * @param profile - the profile to create this connection in. If null is passed, we first
-	 *   try to find the default private profile and use it, else we take the first active profile.
-	 * @param name - the name to give this profile. Must be unique and non-null.
-	 * @param userId - the user ID to use as the default for the subsystems. Can be null.
-	 */
-	public IHost createLocalHost(ISystemProfile profile, String name, String userId);
-
-	/**
-	 * Create a host object, sometimes called a "connection",
-	 * given the containing profile and given all the possible attributes.
-	 * The profile is then scheduled to be persisted.
-	 * <p>
-	 * This method:
-	 * <ul>
-	 * <li>creates and saves a new connection within the given profile
-	 * <li>calls all subsystem factories to give them a chance to create a subsystem instance
-	 * <li>fires an ISystemResourceChangeEvent event of type EVENT_ADD to all registered listeners
-	 * </ul>
-	 * <p>
-	 * @param profileName Name of the system profile the connection is to be added to.
-	 * @param systemType system type matching one of the system types
-	 *     defined via the systemTypes extension point.
-	 * @param connectionName unique connection name.
-	 * @param hostName ip name of host.
-	 * @param description optional description of the connection. Can be null.
-	 * @param defaultUserId userId to use as the default for the subsystems.
-	 * @param defaultUserIdLocation one of the constants in {@link org.eclipse.rse.core.IRSEUserIdConstants}
-	 * that tells us where to store the user Id
-	 * @param configurators these are the configurators supplied by the subsystem configurations that pertain to the specified system type. Else null.
-	 * @return SystemConnection object, or null if it failed to create. This is typically
-	 * because the connectionName is not unique. Call getLastException() if necessary.
-	 * @since 3.0
-	 */
-	public IHost createHost(String profileName, IRSESystemType systemType, String connectionName, String hostName, String description, String defaultUserId, int defaultUserIdLocation,
-			ISubSystemConfigurator[] configurators) throws Exception;
-
-	/**
-	 * Create a connection object. This is a simplified version
-	 * <p>
-	 * THE RESULTING CONNECTION OBJECT IS ADDED TO THE LIST OF EXISTING CONNECTIONS FOR YOU, IN
-	 *  THE PROFILE YOU SPECIFY. THE PROFILE IS ALSO SAVED TO DISK.
-	 * <p>
-	 * This method:
-	 * <ul>
-	 *  <li>creates and saves a new connection within the given profile
-	 *  <li>calls all subsystem factories to give them a chance to create a subsystem instance
-	 *  <li>fires an ISystemResourceChangeEvent event of type EVENT_ADD to all registered listeners
-	 * </ul>
-	 * <p>
-	 * @param profileName Name of the system profile the connection is to be added to.
-	 * @param systemType system type matching one of the system types
-	 *     defined via the systemTypes extension point.
-	 * @param connectionName unique connection name.
-	 * @param hostName ip name of host.
-	 * @param description optional description of the connection. Can be null.
-	 * @return SystemConnection object, or null if it failed to create. This is typically
-	 *   because the connectionName is not unique. Call getLastException() if necessary.
-	 */
-	public IHost createHost(String profileName, IRSESystemType systemType, String connectionName, String hostName, String description) throws Exception;
-
-	/**
-	 * Create a connection object. This is a very simplified version that defaults to the user's
-	 *  private profile, or the first active profile if there is no private profile.
-	 * <p>
-	 * THE RESULTING CONNECTION OBJECT IS ADDED TO THE LIST OF EXISTING CONNECTIONS FOR YOU, IN
-	 *  THE DEFAULT PRIVATE PROFILE, WHICH IS SAVED TO DISK.
-	 * <p>
-	 * This method:
-	 * <ul>
-	 *  <li>creates and saves a new connection within the given profile
-	 *  <li>calls all subsystem factories to give them a chance to create a subsystem instance
-	 *  <li>fires an ISystemResourceChangeEvent event of type EVENT_ADD to all registered listeners
-	 * </ul>
-	 * <p>
-	 * @param systemType system type matching one of the system types
-	 *     defined via the systemTypes extension point.
-	 * @param connectionName unique connection name.
-	 * @param hostAddress ip name of host.
-	 * @param description optional description of the connection. Can be null.
-	 * @return SystemConnection object, or null if it failed to create. This is typically
-	 *   because the connectionName is not unique. Call getLastException() if necessary.
-	 */
-	public IHost createHost(IRSESystemType systemType, String connectionName, String hostAddress, String description) throws Exception;
-
-	/**
-	 * Create a host object. The resulting host object is added to the list of
-	 * existing host objects in the specified profile.
-	 * <ul>
-	 * <li>creates and saves a new host within the given profile
-	 * <li>optionally creates subsystem instances
-	 * <li>fires an ISystemResourceChangeEvent event of type EVENT_ADD to all
-	 * registered listeners
-	 * </ul>
-	 * <p>
-	 *
-	 * @param profileName Name of the system profile to which the host is to be
-	 *            added.
-	 * @param systemType system type of the new host.
-	 * @param hostName unique host name within the profile.
-	 * @param hostAddress ip name of host.
-	 * @param description optional description of the connection. May be null.
-	 * @param createSubSystems <code>true</code> to create subsystems for the
-	 *            host, <code>false</code> otherwise.
-	 * @return IHost object, or null if it failed to create. This is typically
-	 *         because the hostName is not unique. Call getLastException() if
-	 *         necessary.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public IHost createHost(String profileName, IRSESystemType systemType, String hostName, String hostAddress, String description, boolean createSubSystems) throws Exception;
-
-	/**
-	 * Update an existing host given the new information.
-	 * This method:
-	 * <ul>
-	 *  <li>calls the setXXX methods on the given host object, updating the information in it.
-	 *  <li>save the host's host pool to disk
-	 *  <li>fires an ISystemResourceChangeEvent event of type EVENT_CHANGE to all registered listeners
-	 *  <li>if the system type or host name is changed, calls disconnect on each associated subsystem.
-	 *       We must do this because a host name changes fundamentally affects the connection,
-	 *       rendering any information currently displayed under
-	 *       that host obsolete.
-	 * </ul>
-	 * <p>
-	 * @param host the host to be updated
-	 * @param systemType system type matching one of the system types
-	 *     defined via the systemTypes extension point.
-	 * @param connectionName unique connection name.
-	 * @param hostName ip name of host.
-	 * @param description optional description of the host. Can be null.
-	 * @param defaultUserId userId to use as the default for the subsystems under this host.
-	 * @param defaultUserIdLocation one of the constants in {@link org.eclipse.rse.core.IRSEUserIdConstants}
-	 *   that tells us where to set the user Id
-	 */
-	public void updateHost(IHost host, IRSESystemType systemType, String connectionName,
-			String hostName, String description,
-			String defaultUserId, int defaultUserIdLocation);
-
-	/**
-	 * Creates subsystems for a given host and subsystem configurations.
-	 * If a subsystem cannot be created then null is returned in its corresponding place in the returned array.
-	 * @param host the host.
-	 * @param configurations the subsystem configurations.
-	 * @return the array of subsystems corresponding to the array of given configurations.
-	 * @since 2.0
-	 */
-	public ISubSystem[] createSubSystems(IHost host, ISubSystemConfiguration[] configurations);
-
-	/**
-	 * Update the workoffline mode for a connection.
-	 *
-	 * @param conn SystemConnection to change
-	 * @param offline true if connection should be set offline, false if it should be set online
-	 */
-	public void setHostOffline(IHost conn, boolean offline);
-
-	/**
-	 * Delete an existing connection.
-	 * <p>
-	 * Lots to do here:
-	 * <ul>
-	 *   <li>Delete all subsystem objects for this connection, including their file's on disk.
-	 *   <li>Delete the connection from memory.
-	 *   <li>Delete the connection's folder from disk.
-	 * </ul>
-	 * Assumption: firing the delete event is done elsewhere. Specifically, the doDelete method of SystemView.
-	 */
-	public void deleteHost(IHost conn);
-
-	/**
-	 * Renames an existing connection.
-	 * <p>
-	 * Lots to do here:
-	 * <ul>
-	 *   <li>Reset the conn name for all subsystem objects for this connection
-	 *   <li>Rename the connection in memory.
-	 *   <li>Rename the connection's folder on disk.
-	 * </ul>
-	 * Assumption: firing the rename event is done elsewhere. Specifically, the doRename method of SystemView.
-	 */
-	public void renameHost(IHost conn, String newName) throws Exception;
-
-	/**
-	 * Move existing connections a given number of positions in the same profile.
-	 * If the delta is negative, they are all moved up by the given amount. If
-	 * positive, they are all moved down by the given amount.<p>
-	 * <ul>
-	 * <li>After the move, the pool containing the moved connection is saved to disk.
-	 * <li>The connection's name must be unique in pool.
-	 * <li>Fires a single ISystemResourceChangeEvent event of type EVENT_MOVE, if the pool is the private pool.
-	 * </ul>
-	 * @param conns Array of SystemConnections to move.
-	 * @param delta new zero-based position for the connection
-	 */
-	public void moveHosts(String profileName, IHost conns[], int delta);
-
-	/**
-	 * Copy a SystemConnection. All subsystems are copied, and all connection data is copied.
-	 * @param conn The connection to copy
-	 * @param targetProfile What profile to copy into
-	 * @param newName Unique name to give copied profile
-	 * @param monitor Progress monitor to reflect each step of the operation
-	 * @return new SystemConnection object
-	 */
-	public IHost copyHost(IHost conn, ISystemProfile targetProfile, String newName, IProgressMonitor monitor) throws Exception;
-
-	/**
-	 * Move a SystemConnection to another profile.
-	 * All subsystems are moved, and all connection data is moved.
-	 * This is actually accomplished by doing a copy operation first,
-	 * and if successful deleting the original.
-	 * @param conn The connection to move
-	 * @param targetProfile What profile to move into
-	 * @param newName Unique name to give copied profile. Typically this is the same as the original name, but
-	 *                will be different on name collisions
-	 * @param monitor Progress monitor to reflect each step of the operation
-	 * @return new SystemConnection object
-	 */
-	public IHost moveHost(IHost conn, ISystemProfile targetProfile, String newName, IProgressMonitor monitor) throws Exception;
-
-	/**
-	 * Return true if any subsystem supports connecting.
-	 * @param conn the connection.
-	 * @return <code>true</code> if any subsystem supports connecting, <code>false</code> otherwise.
-	 */
-	public boolean isAnySubSystemSupportsConnect(IHost conn);
-
-	/**
-	 * Return true if any of the subsystems for the given connection are
-	 * currently connected.
-	 */
-	public boolean isAnySubSystemConnected(IHost conn);
-
-	/**
-	 * Return true if all of the subsystems for the given connection are
-	 * currently connected.
-	 */
-	public boolean areAllSubSystemsConnected(IHost conn);
-
-	/**
-	 * Disconnect all subsystems for the given connection, if they are
-	 * currently connected.
-	 */
-	public void disconnectAllSubSystems(IHost conn);
-
-	/**
-	 * Inform the world when the connection status changes for a subsystem
-	 * within a connection.
-	 * Update properties for the subsystem and its connection.
-	 */
-	public void connectedStatusChange(ISubSystem subsystem, boolean connected, boolean wasConnected);
-
-	/**
-	 * Inform the world when the connection status changes for a subsystem
-	 * within a connection.
-	 * Update properties for the subsystem and its connection.
-	 */
-	public void connectedStatusChange(ISubSystem subsystem, boolean connected, boolean wasConnected, boolean collapseTree);
-
-	// ----------------------------
-	// RESOURCE EVENT METHODS...
-	// ----------------------------
-
-	/**
-	 * Register your interest in being told when a system resource such as a connection is changed.
-	 */
-	public void addSystemResourceChangeListener(ISystemResourceChangeListener l);
-
-	/**
-	 * De-Register your interest in being told when a system resource such as a connection is changed.
-	 */
-	public void removeSystemResourceChangeListener(ISystemResourceChangeListener l);
-
-	/**
-	 * Query if the ISystemResourceChangeListener is already listening for SystemResourceChange events
-	 */
-	public boolean isRegisteredSystemResourceChangeListener(ISystemResourceChangeListener l);
-
-	/**
-	 * Notify all listeners of a change to a system resource such as a connection.
-	 * You would not normally call this as the methods in this class call it when appropriate.
-	 */
-	public void fireEvent(ISystemResourceChangeEvent event);
-
-	/**
-	 * Notify a specific listener of a change to a system resource such as a connection.
-	 */
-	public void fireEvent(ISystemResourceChangeListener l, ISystemResourceChangeEvent event);
-
-	// ----------------------------
-	// MODEL RESOURCE EVENT METHODS...
-	// ----------------------------
-
-	/**
-	 * Register your interest in being told when an RSE model resource is changed.
-	 * These are model events, not GUI-optimized events.
-	 */
-	public void addSystemModelChangeListener(ISystemModelChangeListener l);
-
-	/**
-	 * De-Register your interest in being told when an RSE model resource is changed.
-	 */
-	public void removeSystemModelChangeListener(ISystemModelChangeListener l);
-
-	/**
-	 * Notify all listeners of a change to a system model resource such as a connection.
-	 * You would not normally call this as the methods in this class call it when appropriate.
-	 */
-	public void fireEvent(ISystemModelChangeEvent event);
-
-	/**
-	 * Notify all listeners of a change to a system model resource such as a connection.
-	 * This one takes the information needed and creates the event for you.
-	 */
-	public void fireModelChangeEvent(int eventType, int resourceType, Object resource, String oldName);
-
-	/**
-	 * Notify a specific listener of a change to a system model resource such as a connection.
-	 */
-	public void fireEvent(ISystemModelChangeListener l, ISystemModelChangeEvent event);
-
-	// --------------------------------
-	// REMOTE RESOURCE EVENT METHODS...
-	// --------------------------------
-
-	/**
-	 * Register your interest in being told when a remote resource is changed.
-	 * These are model events, not GUI-optimized events.
-	 */
-	public void addSystemRemoteChangeListener(ISystemRemoteChangeListener l);
-
-	/**
-	 * Unregister your interest in being told when a remote resource is changed.
-	 */
-	public void removeSystemRemoteChangeListener(ISystemRemoteChangeListener l);
-
-
-	/**
-	 * Query if the ISystemRemoteChangeListener is already listening for
-	 * SystemRemoteChange events.
-	 *
-	 * @param l the listener instance to check
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public boolean isRegisteredSystemRemoteChangeListener(ISystemRemoteChangeListener l);
-
-	/**
-	 * Notify all listeners of a change to a remote resource such as a file.
-	 * You would not normally call this as the methods in this class call it when appropriate.
-	 */
-	public void fireEvent(ISystemRemoteChangeEvent event);
-
-	/**
-	 * Notify all listeners of a change to a remote resource such as a file.
-	 * This one takes the information needed and creates the event for you.
-	 *
-	 * @param eventType - one of the constants from
-	 *            {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents}
-	 * @param resource - the remote resource object, or absolute name of the
-	 *            resource as would be given by calling getAbsoluteName on its
-	 *            remote adapter
-	 * @param resourceParent - the remote resource's parent object, or absolute
-	 *            name, if that is known. If it is non-null, this will aid in
-	 *            refreshing occurrences of that parent.
-	 * @param subsystem - the subsystem which contains this remote resource.
-	 *            This allows the search for impacts to be limited to subsystems
-	 *            of the same parent factory, and to connections with the same
-	 *            hostname as the subsystem's connection.
-	 * @param oldNames - on a rename, copy or move operation, these are the
-	 *            absolute names of the resources prior to the operation
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public void fireRemoteResourceChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames);
-
-	/**
-	 * Notify all listeners of a change to a remote resource such as a file.
-	 * This one takes the information needed and creates the event for you.
-	 *
-	 * @param eventType - one of the constants from
-	 *            {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents}
-	 * @param resource - the remote resource object, or absolute name of the
-	 *            resource as would be given by calling getAbsoluteName on its
-	 *            remote adapter
-	 * @param resourceParent - the remote resource's parent object, or absolute
-	 *            name, if that is known. If it is non-null, this will aid in
-	 *            refreshing occurrences of that parent.
-	 * @param subsystem - the subsystem which contains this remote resource.
-	 *            This allows the search for impacts to be limited to subsystems
-	 *            of the same parent factory, and to connections with the same
-	 *            hostname as the subsystem's connection.
-	 * @param oldNames - on a rename, copy or move operation, these are the
-	 *            absolute names of the resources prior to the operation
-	 * @param originatingViewer - optional. If set, this gives the viewer a clue
-	 *            that it should select the affected resource after refreshing
-	 *            its parent. This saves sending a separate event to reveal and
-	 *            select the new created resource on a create event, for
-	 *            example.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public void fireRemoteResourceChangeEvent(int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames, Object originatingViewer);
-
-	/**
-	 * Notify all listeners of a change to a remote resource such as a file.
-	 * This one takes the information needed and creates the event for you.
-	 *
-	 * @param operation - the operation for which this event was fired
-	 * @param eventType - one of the constants from
-	 *            {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents}
-	 * @param resource - the remote resource object, or absolute name of the
-	 *            resource as would be given by calling getAbsoluteName on its
-	 *            remote adapter
-	 * @param resourceParent - the remote resource's parent object, or absolute
-	 *            name, if that is known. If it is non-null, this will aid in
-	 *            refreshing occurrences of that parent.
-	 * @param subsystem - the subsystem which contains this remote resource.
-	 *            This allows the search for impacts to be limited to subsystems
-	 *            of the same parent factory, and to connections with the same
-	 *            hostname as the subsystem's connection.
-	 * @param oldNames - on a rename, copy or move operation, these are the
-	 *            absolute names of the resources prior to the operation
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public void fireRemoteResourceChangeEvent(String operation, int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames);
-
-	/**
-	 * Notify all listeners of a change to a remote resource such as a file.
-	 * This one takes the information needed and creates the event for you.
-	 *
-	 * @param operation - the operation for which this event was fired
-	 * @param eventType - one of the constants from
-	 *            {@link org.eclipse.rse.core.events.ISystemRemoteChangeEvents}
-	 * @param resource - the remote resource object, or absolute name of the
-	 *            resource as would be given by calling getAbsoluteName on its
-	 *            remote adapter
-	 * @param resourceParent - the remote resource's parent object, or absolute
-	 *            name, if that is known. If it is non-null, this will aid in
-	 *            refreshing occurrences of that parent.
-	 * @param subsystem - the subsystem which contains this remote resource.
-	 *            This allows the search for impacts to be limited to subsystems
-	 *            of the same parent factory, and to connections with the same
-	 *            hostname as the subsystem's connection.
-	 * @param oldNames - on a rename, copy or move operation, these are the
-	 *            absolute names of the resources prior to the operation
-	 * @param originatingViewer - optional. If set, this gives the viewer a clue
-	 *            that it should select the affected resource after refreshing
-	 *            its parent. This saves sending a separate event to reveal and
-	 *            select the new created resource on a create event, for
-	 *            example.
-	 * @since org.eclipse.rse.core 3.0
-	 */
-	public void fireRemoteResourceChangeEvent(String operation, int eventType, Object resource, Object resourceParent, ISubSystem subsystem, String[] oldNames, Object originatingViewer);
-
-	/**
-	 * Notify a specific listener of a change to a remote resource such as a file.
-	 */
-	public void fireEvent(ISystemRemoteChangeListener l, ISystemRemoteChangeEvent event);
-
-	// ----------------------------
-	// PREFERENCE EVENT METHODS...
-	// ----------------------------
-
-	/**
-	 * Register your interest in being told when a system preference changes
-	 */
-	public void addSystemPreferenceChangeListener(ISystemPreferenceChangeListener l);
-
-	/**
-	 * Unregister your interest in being told when a system preference changes
-	 */
-	public void removeSystemPreferenceChangeListener(ISystemPreferenceChangeListener l);
-
-	/**
-	 * Notify all listeners of a change to a system preference
-	 * You would not normally call this as the methods in this class call it when appropriate.
-	 */
-	public void fireEvent(ISystemPreferenceChangeEvent event);
-
-	/**
-	 * Notify a specific listener of a change to a system preference
-	 */
-	public void fireEvent(ISystemPreferenceChangeListener l, ISystemPreferenceChangeEvent event);
-
-	// ----------------------------
-	// MISCELLANEOUS METHODS...
-	// ----------------------------
-
-	/**
-	 * Returns filter references associated with this resource under the subsystem
-	 */
-	public List findFilterReferencesFor(Object resource, ISubSystem subsystem);
-
-	/**
-	 * Returns filter references associated with this resource under the subsystem
-	 */
-	public List findFilterReferencesFor(Object resource, ISubSystem subsystem, boolean onlyCached);
-
-	/**
-	 * Marks all filters for this subsystem as stale to prevent caching
-	 *
-	 * @param subsystem the subsystem to work on
-	 */
-	public void invalidateFiltersFor(ISubSystem subsystem);
-
-	/**
-	 * Marks all filters for this subsystem that contain resourceParent as stale
-	 * to prevent caching
-	 *
-	 * @param resourceParent a remote resource object
-	 * @param subsystem the subsystem to work on
-	 */
-	public void invalidateFiltersFor(Object resourceParent, ISubSystem subsystem);
-
-	/**
-	 * Return last exception object caught in any method, or null if no exception.
-	 * This has the side effect of clearing the last exception.
-	 */
-	public Exception getLastException();
-
-	// ----------------------------
-	// SAVE / RESTORE METHODS...
-	// ----------------------------
-
-	/**
-	 * Save everything!
-	 */
-	public boolean save();
-
-	/**
-	 * Save specific connection pool
-	 * @return true if saved ok, false if error encountered. If false, call getLastException().
-	 */
-	public boolean saveHostPool(ISystemHostPool pool);
-
-	/**
-	 * Save specific connection
-	 * @return true if saved ok, false if error encountered. If false, call getLastException().
-	 */
-	public boolean saveHost(IHost conn);
-
-	/**
-	 * Restore all connections within active profiles
-	 * @return true if restored ok, false if error encountered. If false, call getLastException().
-	 */
-	public boolean restore();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java
deleted file mode 100644
index 759e86dae..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.util.List;
-
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-
-
-/**
- * This interface is refers to a collection of any type of resources.  The resources
- * may be remote RSE resources, or local workspace resources. 
- * @noimplement This interface is not intended to be implemented by clients.
- * Extend {@link AbstractSystemResourceSet} instead.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface ISystemResourceSet {
-	
-	/**
-	 * Returns the number of resources in the set
-	 * @return the number of resources in the set
-	 */
-	public int size();
-
-	/**
-	 * Returns the resource in the set with the specified absoluteName
-	 * @param absoluteName the path of the resource to return
-	 * @return the resource
-	 */
-	public Object get(String absoluteName);
-
-	/**
-	 * Returns the path of a specified resource.  This is the same path
-	 * that is used be the get(absoluteName) method to retrieve the object
-	 * @param obj the resource to return the path for
-	 * @return the path of the resource
-	 */
-	public String pathFor(Object obj);
-
-	/**
-	 * Returns the resource at the specified index
-	 * @param index the index of the resource to return
-	 * @return the resource
-	 */
-	public Object get(int index);
-
-	/**
-	 * Returns the set of resources as a List
-	 * @return the set of resources as a List
-	 */
-	public List getResourceSet();
-
-	/**
-	 * Returns a message if a problem occurs when using this resource set
-	 * @return the message
-	 */
-	public SystemMessage getMessage();
-
-	/**
-	 * Indicates whether a message was set corresponding to this resource set
-	 * during an operation against it.
-	 * @return true if there is a message
-	 */
-	public boolean hasMessage();
-
-	/**
-	 * Indicates whether the set of resources has a size in bytes greater than zero
-	 * @return true if there are more than 0 bytes in this set
-	 */
-	public boolean hasByteSize();
-
-	/**
-	 * Returns the total number of bytes in this collection of resources
-	 * @return the number of bytes
-	 */
-	public long byteSize();
-
-	/**
-	 * Sets the total number of bytes in this collection of resources
-	 * @param byteSize the number of bytes
-	 */
-	public void setByteSize(long byteSize);
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java
deleted file mode 100644
index 5a54e8761..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemViewInputProvider.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [186773] split SystemRegistryUI from SystemRegistry implementation
- * Martin Oberhuber (Wind River) - [190271] Move ISystemViewInputProvider to Core from org.eclipse.rse.ui.view
- * Martin Oberhuber (Wind River) - [218524][api] Remove deprecated ISystemViewInputProvider#getShell()
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Abstraction for any object that wishes to be a roots-provider for the SystemView tree viewer.
- */
-public interface ISystemViewInputProvider extends IAdaptable {
-	
-	/**
-	 * Return the child objects to constitute the root elements in the system view tree.
-	 * @return Array of root root elements for the system view tree
-	 */
-	public Object[] getSystemViewRoots();
-
-	/**
-	 * Test if {@link #getSystemViewRoots()} will return a non-empty list
-	 * @return <code>true</code> if root elements are available, or <code>false</code> otherwise.
-	 */
-	public boolean hasSystemViewRoots();
-
-	/**
-	 * @return true if we are listing connections or not, so we know whether we are interested in 
-	 * connection-add events
-	 */
-	public boolean showingConnections();
-
-	/**
-	 * This method is called by the connection adapter when the user expands
-	 * a connection. This method must return the child objects to show for that
-	 * connection.
-	 * @param selectedConnection the connection undergoing expansion
-	 * @return the list of objects under the connection
-	 */
-	public Object[] getConnectionChildren(IHost selectedConnection);
-
-	/**
-	 * This method is called by the connection adapter when deciding to show a plus-sign
-	 * or not beside a connection.
-	 * @param selectedConnection the connection being shown in the viewer 
-	 * @return true if this connection has children to be shown.
-	 */
-	public boolean hasConnectionChildren(IHost selectedConnection);
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapterType);
-
-	/**
-	 * Set the viewer in case it is needed for anything.
-	 * The label and content provider will call this.
-	 * @param viewer the {@link org.eclipse.jface.viewers.Viewer viewer}
-	 *     that uses this provider
-	 */
-	public void setViewer(Object viewer);
-
-	/**
-	 * Return the viewer we are currently associated with
-	 * @return the {@link org.eclipse.jface.viewers.Viewer viewer}
-	 *     we are currently associated with
-	 * @deprecated use other methods for getting the active viewer.
-	 */
-	public Object getViewer();
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Property.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Property.java
deleted file mode 100644
index 7235149aa..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/Property.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - added javadoc
- * David Dykstal (IBM) - [150939] added read-only attribute
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.util.Observable;
-
-/**
- * A Property is used in PropertySets and may be persisted as a result of persisting the 
- * containing set. Each property has a type, a label, a key and a value.
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class Property extends Observable implements IProperty {
-	
-	private String _name;
-	private String _label;
-	private String _value;
-	private IPropertyType _type;
-	private boolean _isEnabled = true;
-	private boolean _isReadOnly = false;
-
-	public Property(IProperty property) {
-		_name = property.getKey();
-		_label = property.getLabel();
-		_value = property.getValue();
-		_type = property.getType();
-		_isEnabled = property.isEnabled();
-		touch();
-	}
-
-	public Property(String name, String value, IPropertyType type, boolean isEnabled) {
-		_name = name;
-		_value = value;
-		_type = type;
-		_isEnabled = isEnabled;
-		touch();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#getKey()
-	 */
-	public String getKey() {
-		return _name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#setLabel(java.lang.String)
-	 */
-	public void setLabel(String label) {
-		if (!stringsAreEqual(_label, label)) {
-			_label = label;
-			touch();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#getLabel()
-	 */
-	public String getLabel() {
-		if (_label == null) {
-			return _name;
-		}
-		return _label;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#setValue(java.lang.String)
-	 */
-	public void setValue(String value) {
-		if (!stringsAreEqual(_value, value)) {
-			_value = value;
-			touch();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#getValue()
-	 */
-	public String getValue() {
-		return _value;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#setType(org.eclipse.rse.core.model.IPropertyType)
-	 */
-	public void setType(IPropertyType type) {
-		if (_type != type) {
-			_type = type;
-			touch();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#getType()
-	 */
-	public IPropertyType getType() {
-		return _type;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#setEnabled(boolean)
-	 */
-	public void setEnabled(boolean flag) {
-		if (_isEnabled != flag) {
-			_isEnabled = flag;
-			touch();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#isEnabled()
-	 */
-	public boolean isEnabled() {
-		return _isEnabled;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#setReadOnly(boolean)
-	 */
-	public void setReadOnly(boolean flag) {
-		if (_isReadOnly != flag) {
-			_isReadOnly = flag;
-			touch();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IProperty#isReadOnly()
-	 */
-	public boolean isReadOnly() {
-		return _isReadOnly;
-	}
-	
-	private boolean stringsAreEqual(String s1, String s2) {
-		if (s1 == s2) return true;
-		if (s1 == null) return false;
-		return s1.equals(s2);
-	}
-	
-	private void touch() {
-		setChanged();
-		notifyObservers();
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyList.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyList.java
deleted file mode 100644
index dcd2ef482..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyList.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- *******************************************************************************/
-package org.eclipse.rse.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A property list is an ordered property set.
- * As items are added and removed their arrival order is maintained.
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class PropertyList extends PropertySet {
-	
-	private List _keys = new ArrayList(10);
-	
-	public PropertyList(String name) {
-		super(name);
-	}
-	
-	public IProperty addProperty(String key, IProperty property) {
-		_keys.remove(key);
-		_keys.add(key);
-		return super.addProperty(key, property);
-	}
-	
-	public IProperty addProperty(String key, String value) {
-		_keys.remove(key);
-		_keys.add(key);
-		return super.addProperty(key, value);
-	}
-	
-	public IProperty addProperty(String key, String value, IPropertyType type) {
-		_keys.remove(key);
-		_keys.add(key);
-		return super.addProperty(key, value, type);
-	}
-	
-	public String[] getPropertyKeys() {
-		return (String[]) _keys.toArray(new String[_keys.size()]);
-	}
-	
-	public boolean removeProperty(String key) {
-		_keys.remove(key);
-		return super.removeProperty(key);
-	}
-	
-	public void setProperties(Map map) {
-		_keys.clear();
-		_keys.addAll(map.keySet());
-		super.setProperties(map);
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java
deleted file mode 100644
index 7a8903be9..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySet.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - Added Javadoc.
- * David McKnight   (IBM)        - [217715] [api] RSE property sets should support nested property sets
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David McKnight   (IBM)        - [334837] Ordering of Library list entries incorrect after migration
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Observable;
-import java.util.Observer;
-import java.util.Set;
-
-/**
- * A LinkedHashmap based implementation of the {@link IPropertySet} interface.
- * 
- * Not thread-safe since the underlying {@link java.util.HashMap} is 
- * not thread-safe.
- * @noextend This class is not intended to be subclassed by clients.
- * The standard extensions are included in the framework.
- */
-public class PropertySet extends RSEModelObject implements IPropertySet, IRSEModelObject, ILabeledObject, Observer {
-	
-	private String _name;
-	private String _label = null;
-	private String _description = null;
-	private Map _properties;
-	private IPropertySetContainer _container = null;
-
-	protected static IPropertyType _defaultType = PropertyType.getStringPropertyType();
-
-	/**
-	 * Construct a new PropertySet based on an existing one (i.e. clone it).
-	 * @param propertySet existing Property Set to clone
-	 */
-	public PropertySet(IPropertySet propertySet) {
-		_name = propertySet.getName();
-		_description = propertySet.getDescription();
-		_properties = new LinkedHashMap();
-		if (propertySet instanceof ILabeledObject) {
-			ILabeledObject p = (ILabeledObject) propertySet;
-			_label = p.getLabel();
-		}
-
-		String[] keys = propertySet.getPropertyKeys();
-		for (int i = 0; i < keys.length; i++) {
-			String key = keys[i];
-			IProperty property = propertySet.getProperty(key);
-			addProperty(key, new Property(property));
-		}
-		setDirty(true);
-	}
-
-	/**
-	 * Construct a new empty PropertySet.
-	 * @param name of the new PropertySet
-	 */
-	public PropertySet(String name) {
-		_name = name;
-		_properties = new LinkedHashMap();
-		setDirty(true);
-	}
-
-	public String getName() {
-		return _name;
-	}
-	
-	public String getLabel() {
-		if (_label != null) return _label;
-		return _name;
-	}
-	
-	public void setLabel(String label) {
-		_label = label;
-		setDirty(true);
-	}
-
-	public String getDescription() {
-		return _description;
-	}
-	
-	public void setDescription(String description) {
-		_description = description;
-		setDirty(true);
-	}
-
-	public String[] getPropertyKeys() {
-		Set set = _properties.keySet();
-		return (String[]) set.toArray(new String[set.size()]);
-	}
-
-	public void setName(String name) {
-		_name = name;
-		setDirty(true);
-	}
-
-	public void setProperties(Map map) {
-		_properties = new LinkedHashMap(map.size());
-		for (Iterator z = map.keySet().iterator(); z.hasNext();) {
-			String key = (String) z.next();
-			Object value = map.get(key);
-			if (value instanceof IProperty) {
-				addProperty(key, (IProperty)value);
-			} else if (value instanceof String) {
-				addProperty(key, (String)value);
-			}
-		}
-	}
-
-	/**
-	 * Add a typed Property to the set.
-	 * 
-	 * In case a Property already exists for the given key, it will be overwritten.
-	 * 
-	 * @param key Key to add
-	 * @param property The Property to add
-	 * @return The added Property
-	 */
-	public IProperty addProperty(String key, IProperty property) {
-		_properties.put(key, property);
-		setDirty(true);
-		return property;
-	}
-
-	public IProperty addProperty(String key, String value) {
-		IProperty property = getProperty(key);
-		if (property != null) {
-			//FIXME should throw a NumberFormatException or similar,
-			//if the value does not fit the type of the existing property.
-			property.setValue(value);
-		} else {
-			property = addProperty(key, value, _defaultType);
-		}
-		return property;
-	}
-
-	public IProperty addProperty(String key, String value, IPropertyType type) {
-		IProperty property = new Property(key, value, type, true);
-		return addProperty(key, property);
-	}
-
-	public boolean removeProperty(String key) {
-		Object value = _properties.remove(key);
-		if (value == null) return false;
-		setDirty(true);
-		return true;
-	}
-
-	public IProperty getProperty(String key) {
-		return (IProperty) _properties.get(key);
-	}
-
-	public String getPropertyValue(String key) {
-		IProperty property = getProperty(key);
-		if (property != null) {
-			return property.getValue();
-		}
-		return null;
-	}
-
-	public IPropertyType getPropertyType(String key) {
-		IProperty property = getProperty(key);
-		if (property != null) {
-			return property.getType();
-		}
-		return null;
-	}
-	
-	public boolean commit() {
-		return getPersistableParent().commit();
-	}
-	
-	public IRSEPersistableContainer[] getPersistableChildren() {
-		return IRSEPersistableContainer.NO_CHILDREN;
-	}
-	
-	public IRSEPersistableContainer getPersistableParent() {
-		IRSEPersistableContainer result = null;
-		if (_container instanceof IRSEPersistableContainer) {
-			result = (IRSEPersistableContainer) _container;
-		}
-		return result;
-	}
-	
-	public void setContainer(IPropertySetContainer container) {
-		_container = container;
-	}
-	
-	public IPropertySetContainer getContainer() {
-		return _container;
-	}
-	
-	public void update(Observable o, Object arg) {
-		setDirty(true);
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java
deleted file mode 100644
index 476cd224c..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertySetContainer.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - 142806: refactoring persistence framework
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David McKnight   (IBM)        - [334837] Ordering of Library list entries incorrect after migration
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A PropertySetContainer is capable of holding multiple named property sets.
- * @noextend This class is not intended to be subclassed by clients.
- * The standard extensions are included in the framework.
- */
-public abstract class PropertySetContainer extends RSEPersistableObject implements IPropertySetContainer {
-	private Map _propertySets;
-
-	public PropertySetContainer() {
-		_propertySets = new LinkedHashMap();
-	}
-
-	public IPropertySet[] getPropertySets() {
-		List sets = new ArrayList();
-		Iterator iter = _propertySets.values().iterator();
-		while (iter.hasNext()) {
-			sets.add(iter.next());
-		}
-		return (IPropertySet[]) sets.toArray(new IPropertySet[sets.size()]);
-	}
-
-	public IPropertySet getPropertySet(String name) {
-		return (IPropertySet) _propertySets.get(name);
-	}
-
-	public IPropertySet createPropertySet(String name, String description) {
-		IPropertySet newSet = new PropertySet(name);
-		newSet.setDescription(description);
-		newSet.setContainer(this);
-		_propertySets.put(name, newSet);
-		return newSet;
-	}
-
-	public IPropertySet createPropertySet(String name) {
-		IPropertySet newSet = new PropertySet(name);
-		newSet.setContainer(this);
-		_propertySets.put(name, newSet);
-		return newSet;
-	}
-
-	public boolean addPropertySet(IPropertySet set) {
-		IPropertySetContainer old = set.getContainer();
-		if (old != null) {
-			old.removePropertySet(set.getName());
-		}
-		set.setContainer(this);
-		_propertySets.put(set.getName(), set);
-		return true;
-	}
-
-	public boolean addPropertySets(IPropertySet[] sets) {
-		for (int i = 0; i < sets.length; i++) {
-			addPropertySet(sets[i]);
-		}
-		return true;
-	}
-
-	public boolean removePropertySet(String name) {
-		return _propertySets.remove(name) != null;
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyType.java
deleted file mode 100644
index d0dbaf508..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/PropertyType.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - added javadoc, minor changes
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * The standard implementation of {@link IPropertyType}. Use the static factory
- * methods to return instances.
- * 
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class PropertyType implements IPropertyType {
-
-	private int _type = 0;
-	private String[] _enumValues;
-
-	private static final String ENUMERATION_STR = "enumeration:"; //$NON-NLS-1$
-
-	private static IPropertyType _booleanPropertyType = new PropertyType(TYPE_BOOLEAN);
-	private static IPropertyType _integerPropertyType = new PropertyType(TYPE_INTEGER);
-	private static IPropertyType _stringPropertyType = new PropertyType(TYPE_STRING);
-
-	private PropertyType(int type) {
-		_type = type;
-	}
-
-	/**
-	 * Returns an instance of boolean property type.
-	 * @return IPropertyType
-	 */
-	public static IPropertyType getBooleanPropertyType() {
-		return _booleanPropertyType;
-	}
-
-	/**
-	 * Returns an instance of integer property type.
-	 * @return IPropertyType
-	 */
-	public static IPropertyType getIntegerPropertyType() {
-		return _integerPropertyType;
-	}
-
-	/**
-	 * Returns an instance of string property type.
-	 * @return IPropertyType
-	 */
-	public static IPropertyType getStringPropertyType() {
-		return _stringPropertyType;
-	}
-
-	/**
-	 * Returns an instance of enum property type.
-	 * @param values String[] array of allowed enumerator values.
-	 * @return IPropertyType
-	 */
-	public static IPropertyType getEnumPropertyType(String[] values) {
-		PropertyType type = new PropertyType(TYPE_ENUM);
-		type._enumValues = values;
-		return type;
-	}
-
-	/**
-	 * Returns an instance of property type based on the String specification.
-	 * This is the reverse of PropertyType.toString().
-	 * @return IPropertyType instance based on String specification.
-	 */
-	public static IPropertyType fromString(String typeStr) {
-		if (typeStr.equals(String.class.toString())) {
-			return getStringPropertyType();
-		} else if (typeStr.equals(Integer.class.toString())) {
-			return getIntegerPropertyType();
-		} else if (typeStr.startsWith(ENUMERATION_STR)) {
-			String subString = typeStr.substring(ENUMERATION_STR.length());
-			String[] enumValues = subString.split(","); //$NON-NLS-1$
-			return getEnumPropertyType(enumValues);
-		} else if (typeStr.equals(Boolean.class.toString())) {
-			return getBooleanPropertyType();
-		} else {
-			return getStringPropertyType();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IPropertyType#getType()
-	 */
-	public int getType() {
-		return _type;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IPropertyType#isString()
-	 */
-	public boolean isString() {
-		return _type == TYPE_STRING;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IPropertyType#isInteger()
-	 */
-	public boolean isInteger() {
-		return _type == TYPE_INTEGER;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IPropertyType#isEnum()
-	 */
-	public boolean isEnum() {
-		return _type == TYPE_ENUM;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IPropertyType#isBoolean()
-	 */
-	public boolean isBoolean() {
-		return _type == TYPE_BOOLEAN;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IPropertyType#getEnumValues()
-	 */
-	public String[] getEnumValues() {
-		return _enumValues;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		if (isString()) {
-			return String.class.getName();
-		} else if (isInteger()) {
-			return Integer.class.getName();
-		} else if (isEnum()) {
-			StringBuffer buf = new StringBuffer();
-			buf.append(ENUMERATION_STR);
-			String[] enumValues = getEnumValues();
-			for (int i = 0; i < enumValues.length; i++) {
-				buf.append(enumValues[i]);
-				if (i + 1 < enumValues.length) {
-					buf.append(","); //$NON-NLS-1$
-				}
-			}
-			return buf.toString();
-		} else if (isBoolean()) {
-			return Boolean.class.getName();
-		}
-		return super.toString();
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java
deleted file mode 100644
index e18e998ae..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelObject.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - 142806: refactoring persistence framework
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import org.eclipse.rse.internal.core.RSECoreMessages;
-
-/**
- * Provides common support for local RSE model objects.
- * Extenders inherit property set support.
- */
-public abstract class RSEModelObject extends PropertySetContainer implements IRSEModelObject {
-
-	public String getDescription() {
-		return RSECoreMessages.RESID_MODELOBJECTS_MODELOBJECT_DESCRIPTION;
-	}
-	
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelOperation.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelOperation.java
deleted file mode 100644
index 8734c6284..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEModelOperation.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * David Dykstal (IBM) - initial API and implementation
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.logging.Logger;
-import org.eclipse.rse.persistence.IRSEPersistenceManager;
-
-/**
- * Provides a transaction boundary for RSE model operations. All operations that 
- * modify model objects should be done within an RSEModelOperation. These operations
- * may be nested. Changes made to the model will be persisted when the outermost 
- * operation of a particular thread is exited.
- * <p>
- * The usage idiom is to create an anonymous subclass of this class just prior to 
- * use, overriding the {@link #execute()} method, and then invoke the {@link #run()} method.
- * <pre>
- * RSEModelOperation m = new RSEModelOperation() {
- *     public void execute() {
- *         ... do work here ...
- *     }
- * };
- * m.run();
- * </pre>
- * <p>
- * under development - provisional
- * @since RSE 2.0
- */
-public abstract class RSEModelOperation {
-
-	private static Map threads = new HashMap();
-
-	/**
-	 * Checks the current thread to see if there is a model transaction in progress.
-	 * Should be used inside model objects prior to a change to a persistent property.
-	 */
-	public static void check() {
-		if (getDepth() == 0) {
-			Logger logger = RSECorePlugin.getDefault().getLogger();
-			logger.logInfo("not inside transaction"); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @return the depth of the nesting for transactions in the current thread
-	 */
-	private static int getDepth() {
-		Thread myThread = Thread.currentThread();
-		if (threads.get(myThread) == null) {
-			threads.put(myThread, new Integer(0));
-		}
-		int depth = ((Integer) threads.get(myThread)).intValue();
-		return depth;
-	}
-
-	/**
-	 * Begins a transaction. 
-	 */
-	private static void beginTransaction() {
-	}
-
-	/**
-	 * Ends a transaction. Schedules all changed profiles for save.
-	 */
-	private static void endTransaction() {
-		IRSEPersistenceManager persistenceManager = RSECorePlugin.getThePersistenceManager();
-		persistenceManager.commitProfiles(5000);
-	}
-
-	/**
-	 * Enters a new nested level of operation.
-	 */
-	private static void enterLevel() {
-		int depth = getDepth();
-		try {
-			if (depth == 0) {
-				beginTransaction();
-			}
-		} finally {
-			Thread myThread = Thread.currentThread();
-			threads.put(myThread, new Integer(depth + 1));
-		}
-	}
-
-	/**
-	 * Leaves the current nesting level. If leaving the outermost nesting level then 
-	 * ends the transaction.
-	 */
-	private static void leaveLevel() {
-		int depth = getDepth();
-		try {
-			if (depth == 1) {
-				endTransaction();
-			}
-		} finally {
-			Thread myThread = Thread.currentThread();
-			threads.put(myThread, new Integer(depth - 1));
-		}
-	}
-
-	/**
-	 * Create a new operation scoped to the current thread.
-	 */
-	public RSEModelOperation() {
-	}
-
-	/**
-	 * Perform the work of this operation. This is where the work of modifying several model
-	 * properties or objects can be done.
-	 */
-	public abstract void execute();
-
-	/**
-	 * Runs this operation. This will cause the {@link #execute()} method to be invoked inside
-	 * a transaction boundary.
-	 */
-	public void run() {
-		enterLevel();
-		try {
-			execute();
-		} finally {
-			leaveLevel();
-		}
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEPersistableObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEPersistableObject.java
deleted file mode 100644
index fbe0004bc..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/RSEPersistableObject.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- *******************************************************************************/
-package org.eclipse.rse.core.model;
-
-/**
- * An object that keeps track of its persistable state: 
- * whether it is dirty or not and whether or not
- * any of its progeny are marked dirty.
- * @noextend This class is not intended to be subclassed by clients.
- * The standard extensions are included in the framework.
- */
-public abstract class RSEPersistableObject implements IRSEPersistableContainer {
-
-	private boolean _isDirty = false;
-	private boolean _wasRestored = false;
-	private boolean _isTainted = false;
-
-	public RSEPersistableObject() {
-		super();
-	}
-
-	public final boolean isDirty() {
-		return _isDirty;
-	}
-
-	public final void setDirty(boolean flag) {
-		_isDirty = flag;
-		setTainted(flag);
-	}
-
-	public final boolean wasRestored() {
-		return _wasRestored;
-	}
-
-	public final void setWasRestored(boolean flag) {
-		_wasRestored = flag;
-	}
-
-	public final boolean isTainted() {
-		return _isTainted;
-	}
-
-	public final void setTainted(boolean flag) {
-		boolean taintParent = flag && !_isTainted;
-		_isTainted = flag;
-		if (taintParent) {
-			IRSEPersistableContainer parent = getPersistableParent();
-			if (parent != null) {
-				parent.setTainted(true);
-			}
-		}
-	}
-
-	/**
-	 * Does a null-aware string comparison. Two strings that are
-	 * <code>null</code> will compare equal. Otherwise the result is 
-	 * the same as s1.equals(s2), if s1 is not null.
-	 * @param s1 The first string to compare
-	 * @param s2 the second string
-	 * @return true if the strings are equal or both null.
-	 */
-	protected boolean compareStrings(String s1, String s2) {
-		if (s1 == s2) return true;
-		if (s1 == null) return false;
-		return s1.equals(s2);
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java
deleted file mode 100644
index 83c6c92c5..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemChildrenContentsType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * Represents contents that are children of a container.
- * This is a singleton class representing a contents type.
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class SystemChildrenContentsType implements ISystemContentsType {
-	public static String CONTENTS_TYPE_CHILDREN = "contents_children"; //$NON-NLS-1$
-	public static SystemChildrenContentsType _instance = new SystemChildrenContentsType();
-
-	public static SystemChildrenContentsType getInstance() {
-		return _instance;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.model.IRemoteContentsType#getType()
-	 */
-	public String getType() {
-		return CONTENTS_TYPE_CHILDREN;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.model.IRemoteContentsType#isPersistent()
-	 */
-	public boolean isPersistent() {
-		return false;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemEscapeCharHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemEscapeCharHelper.java
deleted file mode 100644
index 358a27b27..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemEscapeCharHelper.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2011 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- * David McKnight   (IBM)        - [276194] cannot open file with '...' in pathname
- * David McKnight   (IBM)        - [332275] "#" in local file name is changed to "#035" after copy
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * This is a utility class used in the construction of file names.
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class SystemEscapeCharHelper {
-
-	private static char ESCAPE_CHAR = '#';
-	
-	private char changedChars[];
-	private int escapeStringLength;
-
-	/**
-	 * Constructor.
-	 * @param chars array of chars to be escaped.
-	 */
-	public SystemEscapeCharHelper (char[] chars)
-	{
-		changedChars = new char[chars.length+1];
-
-		for (int i = 0; i < chars.length; i++)
-		{
-			changedChars[i]=chars[i];
-		}
-
-		// add the escape character itself so that it itself can be escaped
-		changedChars[chars.length]=ESCAPE_CHAR;
-
-		escapeStringLength = 4;
-
-	}
-
-	public String getStringForFileName(String name)
-	{
-		// first do a validation before escaping
-		IStatus status = ResourcesPlugin.getWorkspace().validatePath(name,IResource.FILE);
-		if (status.getCode() == IStatus.OK){ // if it's valid, don't bother escaping
-			return name;
-		}
-			 
-		String fileName = name;
-
-		int i = 0;
-
-		while (i < fileName.length())
-		{			
-			char currentChar = fileName.charAt(i);
-			for (int j = 0; j < changedChars.length; j++)
-			{				
-				if (currentChar == changedChars[j])
-				{
-					if ((fileName.length()-1) >= i)
-					{
-						fileName = fileName.substring(0, i) + escapeString(changedChars[j]) + fileName.substring(i+1);
-					}
-					else
-					{
-						fileName = fileName.substring(0, i) + escapeString(changedChars[j]);
-					}
-					i = i + escapeStringLength-1;
-				}
-				else if (currentChar == '.'){ // special case for bug 276194
-					if (fileName.length() > i + 1){
-						char nextChar = fileName.charAt(i + 1);
-						if (nextChar == '.' || nextChar == File.separatorChar){
-							fileName = fileName.substring(0, i) + escapeString(currentChar) + fileName.substring(i+1);
-						}
-					}
-				}
-			}
-         i++;
-		}
-
-		return fileName;
-
-	}
-
-	public String getStringFromFileName(String fileName)
-	{
-		String name = fileName;
-
-		int i = 0;
-		while (i < name.length())
-		{
-			if (name.charAt(i) == ESCAPE_CHAR)
-			{
-				if ((name.length()-2) >= i)
-				{
-					name = name.substring(0, i) + originalString(name.substring(i+1, i+escapeStringLength)) + name.substring(i+escapeStringLength);
-				}
-				else
-				{
-					name = name.substring(0, i) + originalString(name.substring(i+1));
-				}
-			}
-			i++;
-		}
-
-		return name;
-	}
-
-	private String escapeString(char c)
-	{
-	/*	for (int i = 0; i < changedChars.length; i++)
-		{
-			if (changedChars[i]== c)
-			{
-				return ""+ESCAPE_CHAR+i;
-			}
-		}
-		return ""+c;
-	*/
-
-      int intValue = c;
-      String returnStr=""+ESCAPE_CHAR; //$NON-NLS-1$
-
-      if (intValue < 10)
-         returnStr = returnStr+"00"; //$NON-NLS-1$
-      else if (intValue < 100)
-         returnStr = returnStr+"0"; //$NON-NLS-1$
-
-     return returnStr + intValue;
-
-	}
-
-	private String originalString(String s)
-	{
-	 //	return ""+changedChars[Integer.parseInt(s)];
-
-      char c = (char)Integer.parseInt(s);
-
-      return ""+c; //$NON-NLS-1$
-	}
-
-
-
-/* TEST HARNESS */
-/* public static void main(String[] args)
-   {
-    try {
-      char [] charArray = new char[1];
-
-      charArray[0]='\'';
-      SystemEscapeCharHelper helper = new 
-SystemEscapeCharHelper(charArray);
-
-      System.out.println(">>>>>start>>>>>");
-
-
-      String[] strings = {"'hello_world'", "'", "'abc'", "bca", "ca'_'b"};
-      for (int i = 0; i < strings.length; i++)
-      {
-      String escaped = helper.getStringForFileName(strings[i]);
-
-      System.out.println("escaped:"+escaped+":");
-
-      String unescaped = helper.getStringFromFileName(escaped);
-
-      System.out.println("unescaped:"+unescaped+":");
-      System.out.println("***");
-      }
-      System.out.println("*****end*****");
-
-
-   } catch  (Exception e){
-      System.out.println(""+e.toString());
-
-//      try{
-//      System.in.read();
-//      }catch(Exception ex)
-//      {
-//            }
-
-   }
-//      try{
-//         System.in.read();
-//      }catch(Exception e)
-//      {}
-}*/
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java
deleted file mode 100644
index 85b4a19e2..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemFilterStringContentsType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-/**
- * Represents contents that are children of a container.
- * This is a singleton class representing a contents type.
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class SystemFilterStringContentsType implements ISystemContentsType {
-	public static String CONTENTS_TYPE_CHILDREN_PARENTS = "contents_children_parents"; //$NON-NLS-1$
-	public static SystemFilterStringContentsType _instance = new SystemFilterStringContentsType();
-
-	public static SystemFilterStringContentsType getInstance() {
-		return _instance;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.model.IRemoteContentsType#getType()
-	 */
-	public String getType() {
-		return CONTENTS_TYPE_CHILDREN_PARENTS;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.model.IRemoteContentsType#isPersistent()
-	 */
-	public boolean isPersistent() {
-		return false;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java
deleted file mode 100644
index 4afa5f329..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemMessageObject.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-
-/**
- * This class captures a message we wish to display as child node in the tree view.
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class SystemMessageObject implements ISystemMessageObject, IAdaptable, Comparable {
-
-	SystemMessage systemMessage;
-	protected String message;
-	protected int type;
-	protected Object parent;
-
-	/**
-	 * Constructor when using SystemMessage
-	 * @param msgObj The system message from which to retrieve text to show in the tree viewer
-	 * @param type The message severity, dictating the icon. 
-	 * @param parent The parent node of this within the tree view
-	 * @see org.eclipse.rse.core.model.ISystemMessageObject
-	 */
-	public SystemMessageObject(SystemMessage msgObj, int type, Object parent) {
-		this.systemMessage = msgObj;
-		this.message = msgObj.getLevelOneText();
-		this.type = type;
-		this.parent = parent;
-	}
-
-	/**
-	 * Get the message to display in the tree viewer
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-	/**
-	 * Message type. 
-	 * @see org.eclipse.rse.core.model.ISystemMessageObject
-	 */
-	public int getType() {
-		return type;
-	}
-
-	/**
-	 * Get the parent object (within tree view)
-	 */
-	public Object getParent() {
-		return parent;
-	}
-
-	/**
-	 * This is the method required by the IAdaptable interface.
-	 * Given an adapter class type, return an object castable to the type, or
-	 *  null if this is not possible.
-	 */
-	public Object getAdapter(Class adapterType) {
-		return Platform.getAdapterManager().getAdapter(this, adapterType);
-	}
-
-	/**
-	 * @see ISystemMessageObject#isTransient()
-	 */
-	public boolean isTransient() {
-		return true;
-	}
-
-	/**
-	 * Return the SystemMessage for this SystemMessageObject.
-	 */
-	public SystemMessage getSystemMessage() {
-		return systemMessage;
-	}
-
-	/**
-	 * @see java.lang.Comparable#compareTo(java.lang.Object)
-	 */
-	public int compareTo(Object o) {
-		ISystemMessageObject other = (ISystemMessageObject) o;
-		return getMessage().compareTo(other.getMessage());
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemRemoteResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemRemoteResourceSet.java
deleted file mode 100644
index 38d6e243c..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemRemoteResourceSet.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter;
-
-
-/**
- * An ISystemResourceSet containing remote resources.
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class SystemRemoteResourceSet extends AbstractSystemResourceSet
-{
-	private ISubSystem  				_subSystem;
-	private ISystemDragDropAdapter 	_adapter;
-          
-	public SystemRemoteResourceSet(ISubSystem subSystem)
-	{
-		super();
-		_subSystem = subSystem;
-	}
-	
-	public SystemRemoteResourceSet(ISubSystem subSystem, ISystemDragDropAdapter adapter)
-	{
-		super();
-		_subSystem = subSystem;
-		_adapter = adapter;
-	}
-	
-	public SystemRemoteResourceSet(ISubSystem subSystem, ISystemDragDropAdapter adapter, Object[] objects)
-	{
-		super(objects);
-		_subSystem = subSystem;
-		_adapter = adapter;
-	}
-	
-	public SystemRemoteResourceSet(ISubSystem subSystem, ISystemDragDropAdapter adapter, List objects)
-	{
-		super(objects);
-		_subSystem = subSystem;
-		_adapter = adapter;
-	}
-	
-	public SystemRemoteResourceSet(ISubSystem subSystem, Object[] objects)
-	{
-		super(objects);
-		_subSystem = subSystem;
-	}
-	
-	public SystemRemoteResourceSet(ISubSystem subSystem, List objects)
-	{
-		super(objects);
-		_subSystem = subSystem;
-	}
-	
-	public ISystemDragDropAdapter getAdapter()
-	{
-		return _adapter;
-	}
-	
-	public ISubSystem getSubSystem()
-	{
-		return _subSystem;
-	}
-	
-	public String pathFor(Object resource)
-	{
-		if (_adapter == null)
-		{
-			_adapter = (ISystemDragDropAdapter)((IAdaptable)resource).getAdapter(ISystemDragDropAdapter.class);
-		}
-			
-		return _adapter.getAbsoluteName(resource);
-	}
-	
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemSignonInformation.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemSignonInformation.java
deleted file mode 100644
index 86b6e5d1f..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemSignonInformation.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
- * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType 
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.subsystems.ICredentials;
-
-/**
- * This class encapsulates the signon information required for a remote system.  This class 
- * must be secure and never disclose the password for the remote system in its unencrypted form.
- * However the encrypted form of the password is not considered secret information and can be
- * accessed by anyone.
- */
-public final class SystemSignonInformation implements ICredentials {
-
-	private IRSESystemType _systemType;
-	private String _hostname;
-	private String _userId;
-	private String _password;
-
-	/**
-	 * Default no-arg constructor
-	 */
-	public SystemSignonInformation() {
-	}
-
-	/**
-	 * Constructor for SystemSignonInformation.
-	 */
-	public SystemSignonInformation(String hostname, String userid, IRSESystemType systemType) {
-		_hostname = hostname;//RSEUIPlugin.getQualifiedHostName(hostname).toUpperCase();
-		_userId = userid;
-		_systemType = systemType;
-	}
-
-	/**
-	 * Constructor for SystemSignonInformation.
-	 */
-	public SystemSignonInformation(String hostname, String userid, String password, IRSESystemType systemType) {
-		_hostname = hostname;//RSEUIPlugin.getQualifiedHostName(hostname).toUpperCase();
-		_userId = userid;
-		_password = password;
-		_systemType = systemType;
-	}
-
-	/**
-	 * Returns the hostname of the remote system
-	 * @return String 
-	 */
-	public String getHostname() {
-		return _hostname;
-	}
-
-	/**
-	 * Returns the systemType of the remote system.
-	 * @return the systemType object.
-	 */
-	public IRSESystemType getSystemType() {
-		return _systemType;
-	}
-
-	/**
-	 * Returns the userid for the remote system
-	 * @return the user ID.
-	 */
-	public String getUserId() {
-		return _userId;
-	}
-
-	/**
-	 * Return the password for the remote system
-	 */
-	public String getPassword() {
-		return _password;
-	}
-
-	/**
-	 * Sets the password for the remote system
-	 */
-	public void setPassword(String string) {
-		_password = string;
-	}
-
-	/**
-	 * Sets the hostname.
-	 * @param hostname The hostname to set
-	 */
-	public void setHostname(String hostname) {
-		_hostname = hostname;//RSEUIPlugin.getQualifiedHostName(hostname).toUpperCase();
-	}
-
-	/**
-	 * Sets the systemType.
-	 * @param systemType The systemType to set
-	 */
-	public void setSystemType(IRSESystemType systemType) {
-		_systemType = systemType;
-	}
-
-	/**
-	 * Sets the userid.
-	 * @param userId The userid to set
-	 */
-	public void setUserId(String userId) {
-		_userId = userId;
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemStartHere.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemStartHere.java
deleted file mode 100644
index 87833284a..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemStartHere.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() 
- * Martin Oberhuber (Wind River) - [175680] Deprecate obsolete ISystemRegistry methods
- * Martin Oberhuber (Wind River) - [cleanup] Avoid using SystemStartHere in production code
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- ********************************************************************************/
-
-package org.eclipse.rse.core.model;
-import org.eclipse.rse.core.IRSECoreRegistry;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
-
-
-/**
- * A utility class, composed of static methods, that can be used to begin RSE processing.
- * @noextend This class is not intended to be subclassed by clients.
- * @noinstantiate This class is not intended to be instantiated by clients.
- */
-public class SystemStartHere 
-{
-   /**
-    * STEP 1. Get system registry singleton
-    * <p>
-    * SAME AS: <code>RSECorePlugin.getSystemRegistry</code>
-    */
-   public static ISystemRegistry getSystemRegistry()
-   {
-   	   return RSECorePlugin.getTheSystemRegistry();
-   }
-   
-   /**
-    * STEP 2a. Get connections for all system types
-    * <p>
-    * SAME AS: <code>getSystemRegistry().getConnections()</code>
-    * @see #getConnectionsBySystemType(String)
-    */
-   public static IHost[] getConnections()
-   {
-   	   return getSystemRegistry().getHosts();
-   }
-
-   /**
-    * STEP 2b. Get all connections for the given system type.
-    * <p>
-    * SAME AS: <code>getSystemRegistry().getHostsBySystemType(systemType)</code>
-    * @param systemTypeId One of the system types IDs defined via system type extension point:
-    * <ul>
-    *  <li>"org.eclipse.rse.systemtype.iseries" ({@link IRSESystemType#SYSTEMTYPE_ISERIES_ID})
-    *  <li>"org.eclipse.rse.systemtype.windows" ({@link IRSESystemType#SYSTEMTYPE_WINDOWS_ID})
-    *  <li>"org.eclipse.rse.systemtype.zseries" ({@link IRSESystemType#SYSTEMTYPE_ZSERIES_ID})
-    *  <li>"org.eclipse.rse.systemtype.unix" ({@link IRSESystemType#SYSTEMTYPE_UNIX_ID})
-    *  <li>"org.eclipse.rse.systemtype.linux" ({@link IRSESystemType#SYSTEMTYPE_LINUX_ID})
-    *  <li>"org.eclipse.rse.systemtype.aix" ({@link IRSESystemType#SYSTEMTYPE_AIX_ID})
-    *  <li>"org.eclipse.rse.systemtype.local" ({@link IRSESystemType#SYSTEMTYPE_LOCAL_ID})
-    *  <li>"org.eclipse.rse.systemtype.ftp" ({@link IRSESystemType#SYSTEMTYPE_FTP_ONLY_ID})
-    *  <li>"org.eclipse.rse.systemtype.ssh" ({@link IRSESystemType#SYSTEMTYPE_SSH_ONLY_ID})
-    *  <li>"org.eclipse.rse.systemtype.telnet" ({@link IRSESystemType#SYSTEMTYPE_TELNET_ONLY_ID})
-    * </ul>
-    * @see org.eclipse.rse.core.IRSESystemType
-    * @see IRSECoreRegistry#getSystemTypeById(String)
-    * @see org.eclipse.rse.core.model.ISystemRegistry#getHostsBySystemType(IRSESystemType)
-    * 
-    */
-   public static IHost[] getConnectionsBySystemType(String systemTypeId)
-   {
-	   IRSESystemType systemType = RSECorePlugin.getTheCoreRegistry().getSystemTypeById(systemTypeId);
-	   return getSystemRegistry().getHostsBySystemType(systemType);
-   }
-
-   /**
-    * STEP 2c. Get all connections for your subsystem configuration
-    * <p>
-    * SAME AS: <code>getSystemRegistry().getConnectionsBySubSystemConfiguration(subsystemConfiguration)</code>
-    * @param subsystemConfiguration A subsystem configuration object. 
-    * @see org.eclipse.rse.core.model.ISystemRegistry#getHostsBySubSystemConfiguration(ISubSystemConfiguration)
-    * @see #getConnectionsBySubSystemConfiguration(String)
-    */
-   public static IHost[] getConnectionsBySubSystemConfiguration(ISubSystemConfiguration subsystemConfiguration)
-   {
-   	   return getSystemRegistry().getHostsBySubSystemConfiguration(subsystemConfiguration);
-   }
-   /**
-    * STEP 2d. Get all connections for your subsystem configuration, identified by subsystemConfigurationId.
-    * <p>
-    * SAME AS: <code>getSystemRegistry().getConnectionsBySubSystemConfiguration(getSubSystemConfiguration(subsystemConfigurationId))</code>
-    * @param subsystemConfigurationId The id of the subsystem configuration as given in its plugin.xml id attribute for the subsystemConfigurations extension point
-    * @see #getSubSystemConfiguration(String)
-    * @see #getConnectionsBySubSystemConfiguration(ISubSystemConfiguration)
-    */
-   public static IHost[] getConnectionsBySubSystemConfiguration(String subsystemConfigurationId)
-   {
-   	   return getSystemRegistry().getHostsBySubSystemConfiguration(getSubSystemConfiguration(subsystemConfigurationId));
-   }
-
-   /**
-    * STEP 3a. Get all subsystems for all connections for your subsystem configuration, identified by subsystemConfigurationId.
-    * <p>
-    * SAME AS: <code>getSystemRegistry().getSubSystems(subsystemConfigurationId)</code>
-    * @param subsystemConfigurationId The subsystem configuration id as given in its plugin.xml id attribute for the subsystemConfigurations extension point
-    * @see ISystemRegistry#getSubSystemConfiguration(String)
-    * @see ISubSystemConfiguration#getSubSystems(boolean)
-    * @see ISubSystemConfiguration#getId()
-    */
-   public static ISubSystem[] getSubSystems(String subsystemConfigurationId)
-   {
-	   ISystemRegistry sr = getSystemRegistry();
-	   ISubSystemConfiguration config = sr.getSubSystemConfiguration(subsystemConfigurationId);
-	   if (config == null)
-			return (new ISubSystem[0]);
-   	   return config.getSubSystems(true);
-   }
-   /**
-    * STEP 3b. Get all subsystems for the given connection for your subsystem configuration, identified by subsystemConfigurationId.
-    * <p>
-    * SAME AS: <code>getSystemRegistry().getSubSystems(subsystemConfigurationId, connection)</code>
-    * @param subsystemConfigurationId The subsystem configuration id as given in its plugin.xml id attribute for the subsystemConfigurations extension point
-    * @param connection The connection object you wish to get the subsystems for. Typically there is only one subsystem per object.
-    * @see ISystemRegistry#getSubSystemConfiguration(String)
-    * @see ISubSystemConfiguration#getSubSystems(IHost, boolean)
-    */
-   public static ISubSystem[] getSubSystems(String subsystemConfigurationId, IHost connection)
-   {
-	   ISystemRegistry sr = getSystemRegistry();
-	   ISubSystemConfiguration config = sr.getSubSystemConfiguration(subsystemConfigurationId);
-	   if (config == null)
-			return (new ISubSystem[0]);
-	   return config.getSubSystems(connection, true);
-   }
-   /**
-    * STEP 3c. Same as {@link #getSubSystems(String,IHost)} by used when you know
-    *  the subsystem configuration only supports a single subsystem per connection.
-    * @param subsystemConfigurationId The subsystem configuration id as given in its plugin.xml id attribute for the subsystemConfigurations extension point
-    * @param connection The connection object you wish to get the subsystems for. Typically there is only one subsystem per object.
-    * @see #getSubSystems(String, IHost)
-    * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getId()
-    */
-   public static ISubSystem getSubSystem(String subsystemConfigurationId, IHost connection)
-   {
-   	   ISubSystem[] subsystems = getSubSystems(subsystemConfigurationId, connection);
-   	   if ((subsystems == null) || (subsystems.length==0))
-   	     return null;
-   	   else
-   	     return subsystems[0];
-   }
-
-
-
-    // ----------------------------
-    // MISCELLANEOUS:
-    // ----------------------------           
-   /**
-    * Miscellaneous Helper - return the subsystem configuration object for the given subsystemConfigurationId.
-    * <p>
-    * SAME AS: <code>getSystemRegistry().getSubSystemConfiguration(subsystemConfigurationId)</code>
-    * @param subsystemConfigurationId The id of the subsystem configuration as given in its plugin.xml id attribute for the subsystemConfigurations extension point
-    */
-   public static ISubSystemConfiguration getSubSystemConfiguration(String subsystemConfigurationId)
-   {
-   	   return getSystemRegistry().getSubSystemConfiguration(subsystemConfigurationId);
-   }
-    
-   /**
-	* Miscellaneous Helper - Return the singleton profile manager.
-    * SAME AS: <code>getSystemRegistry().getSystemProfileManager()</code>
-	*/
-   public static ISystemProfileManager getSystemProfileManager()
-   {
-	   return RSECorePlugin.getTheSystemProfileManager();
-   }
-
-    /**
-     * Return all active profiles.
-     * <p>
-     * A team might have many profiles, at least one per developer. 
-     * However, typically only one or two are activated at a time, and
-     *  we only return connections for those which are active.
-    * <p>
-    * SAME AS: <code>getSystemRegistry().getActiveSystemProfiles()</code>
-     */
-    public static ISystemProfile[] getActiveSystemProfiles()
-    {
-    	return getSystemRegistry().getActiveSystemProfiles();
-    }
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java
deleted file mode 100644
index dc4b0338e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/SystemWorkspaceResourceSet.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
- *******************************************************************************/
-
-package org.eclipse.rse.core.model;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * An ISystemResourceSet containing workspace resources.
- * @noextend This class is not intended to be subclassed by clients.
- */
-public class SystemWorkspaceResourceSet extends AbstractSystemResourceSet {
-
-	public SystemWorkspaceResourceSet() {
-		super();
-	}
-
-	public SystemWorkspaceResourceSet(List resources) {
-		super(resources);
-	}
-
-	public SystemWorkspaceResourceSet(IResource[] resources) {
-		super(resources);
-	}
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java
deleted file mode 100644
index abde983ce..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-
-/**
- * A class for managing a list of shadow objects that reference master objects.
- * <p>
- * Sometimes we have a master list of objects, and we let the user select
- * a subset of that list and we wish to persist that users selections. To
- * accomplish this, in your Rose model, follow these steps:
- * <ol>
- *   <li>Include the references package from the SystemReferences .cat file
- *   <li>Ensure the class for the master objects subclass SystemPersistableReferencedObject,
- *        or implement IRSEPersistableReferencedObject.
- *        <b>YOU MUST OVERRIDE getReferenceName() IN SYSTEMPERSISTABLEREFERENCEDOBJECT!</b>
- *   <li>Create a class subclassing SystemPersistableReferencingObject to hold a reference
- *        to the master object. This will hold a transient pointer, and a persistable
- *        name, of the master object. The name must be sufficient to be able to re-create
- *        the pointer upon restoration from disk. When you set the pointer via the
- *        setReferencedObject method, it will automatically extract the name of that
- *        object (by calling its getReferenceName method) and store it in the mof-modelled
- *        attribute of the SystemPersistableReferencingObject class.
- *   <li>Create a class subclassing this class (SystemPersistableReferenceManager)
- *        to manage the list of referencing objects. Each time you instantiate a reference
- *        object, add it to the referencingObjects list managed by this class.
- *        <b>YOU MUST OVERRIDE resolveReferencesAfterRestore() IN SYSTEMPERSISTABLEREFERENCEMANAGERIMPL!</b>
- * </ol>
- * <p>
- * Once you have an instantiated and populated instance of this class, you can either 
- * choose to save it to disk in its own file (save/restore methods are supplied for this)
- * or you can simply choose to store it as part of your own class via your own save
- * and restore methods. If using MOF, and the containment of the manager class is modelled in
- * your own containing class, this will happen automatically when you use mof to save
- * your containing class instance.
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEBasePersistableReferenceManager {
-
-	/**
-	 * Return an array of the referencing objects currently being managed.
-	 * @return array of the referencing objects currently in this list.
-	 */
-	public IRSEBasePersistableReferencingObject[] getReferencingObjects();
-
-	/**
-	 * Set in one shot the list of referencing objects. Replaces current list.
-	 * @param objects An array of referencing objects which is to become the new list.
-	 * @param deReference true to first de-reference all objects in the existing list.
-	 */
-	public void setReferencingObjects(IRSEBasePersistableReferencingObject[] objects, boolean deReference);
-
-	/**
-	 * Add a referencing object to the managed list.
-	 * @return new count of referenced objects being managed.
-	 */
-	public int addReferencingObject(IRSEBasePersistableReferencingObject object);
-
-	/**
-	 * Remove a referencing object from the managed list.
-	 * <p>Does NOT call removeReference on the master referenced object.
-	 * @return new count of referenced objects being managed.
-	 */
-	public int removeReferencingObject(IRSEBasePersistableReferencingObject object);
-
-	/**
-	 * Remove and dereferences a referencing object from the managed list.
-	 * <p>DOES call removeReference on the master referenced object.
-	 * @return new count of referenced objects being managed.
-	 */
-	public int removeAndDeReferenceReferencingObject(IRSEBasePersistableReferencingObject object);
-
-	/**
-	 * Remove all objects from the list.
-	 * <p>Does NOT call removeReference on the master referenced objects.
-	 */
-	public void removeAllReferencingObjects();
-
-	/**
-	 * Remove and dereference all objects from the list.
-	 * <p>DOES call removeReference on the master referenced objects.
-	 */
-	public void removeAndDeReferenceAllReferencingObjects();
-
-	/**
-	 * Return how many referencing objects are currently in the list.
-	 * @return current count of referenced objects being managed.
-	 */
-	public int getReferencingObjectCount();
-
-	/**
-	 * Return the zero-based position of the given referencing object within the list.
-	 * Does a memory address comparison (==) to find the object.
-	 * @param object The referencing object to find position of.
-	 * @return zero-based position within the list. If not found, returns -1
-	 */
-	public int getReferencingObjectPosition(IRSEBasePersistableReferencingObject object);
-
-	/**
-	 * Move the given referencing object to a new zero-based position in the list.
-	 * @param newPosition New zero-based position
-	 * @param object The referencing object to move
-	 */
-	public void moveReferencingObjectPosition(int newPosition, IRSEBasePersistableReferencingObject object);
-
-	/**
-	 * Return true if the given referencable object is indeed referenced by a referencing object
-	 * in the current list. This is done by comparing the reference names of each, not the
-	 * in-memory pointers.
-	 * @param object The referencable object to which to search for a referencing object within this list
-	 * @return true if found in list, false otherwise.
-	 */
-	public boolean isReferenced(IRSEBasePersistableReferencedObject object);
-
-	/**
-	 * Search list of referencing objects to see if one of them references the given referencable object.
-	 * This is done by comparing the reference names of each, not the in-memory pointers.
-	 * @param object The referencable object to which to search for a referencing object within this list
-	 * @return the referencing object within this list which references the given referencable object, or
-	 * null if no reference found.
-	 */
-	public IRSEBasePersistableReferencingObject getReferencedObject(IRSEBasePersistableReferencedObject object);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ReferencingObjectList references
-	 */
-	java.util.List getReferencingObjectList();
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java
deleted file mode 100644
index 7be0394a9..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- ********************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-/**
- * Referenced objects are objects that have shadow objects (referencing objects)
- * of them. Typically, references are created to enable a UI which does not
- * allow the same real object to appear multiple times. In these cases, a unique
- * reference object is created for each unique instance of the real object.
- * <p>
- * The parent interface IRSEReferencedObject captures the simple set of methods
- * an object that supports such a real object implement.
- * <p>
- * This interface specializes that for the case of real objects that support
- * references that must be persisted. Typically, we build the references in
- * memory at runtime to satisfy the UI. However, occasionally we build the list
- * of references for a more permanent reason, such as when we let a user choose
- * a subset from a master list.
- * <p>
- * When we persist such a reference, we can't persist the memory reference to
- * the master object. Instead, we persist the unique name of that object, and
- * upon restoring from disk we then resolve that into a runtime reference to a
- * real memory object.
- * <p>
- * This interface supplies the method to allow a referencing object to query
- * that unique name or key from this real object.
- *
- * @noimplement This interface is not intended to be implemented by clients. The
- *              standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEBasePersistableReferencedObject extends IRSEBaseReferencedObject {
-
-	/**
-	 * @return the unique name or key of this master object to record in the referencing object.
-	 */
-	public String getReferenceName();
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java
deleted file mode 100644
index 8fc44d737..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-/**
- * Referencing objects are shadows of real objects. Typically, shadows are
- * created to enable a GUI which does not allow the same real object to appear
- * multiple times. In these cases, a unique shadow object is created for each
- * unique instance of the real object.
- * <p>
- * The parent interface ISystemReferencingObject captures the simple set of
- * methods such a shadow must implement.
- * <p>
- * This interface specializes that for the case of references that must be
- * persisted. Typically, we build the references in memory at runtime just to
- * satisfy the GUI. However, occasionally we build the list of references for a
- * more permanent reason, such as when we let a user choose a subset from a
- * master list.
- * <p>
- * When we persist such a reference, we can't persist the memory reference to
- * the master object. Instead, we persist the unique name or key of that object,
- * and upon restoring from disk we then resolve that into a runtime reference to
- * a real memory object.
- * <p>
- * This interface captures the methods to set and query that name or key.
- *
- * @noimplement This interface is not intended to be implemented by clients. The
- *              standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEBasePersistableReferencingObject extends IRSEBaseReferencingObject {
-	/**
-	 * Set the object to which we reference. This is an overload of the parent
-	 * interface method of the same name. This one takes an object of which we
-	 * can query its unique name for the purpose of saving that to disk.
-	 */
-	public void setReferencedObject(IRSEBasePersistableReferencedObject obj);
-
-	/**
-	 * Query the unique name or key of the object we are referencing.
-	 */
-	public String getReferencedObjectName();
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java
deleted file mode 100644
index 3a1a5f928..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - Cleanup Javadoc.
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- ********************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-/**
- * Interface that any master object that is referenced must implement.
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEBaseReferencedObject {
-	/**
-	 * Add a reference, increment reference count, return new count
-	 * @param ref the referencing object from which this object will now be referenced.
-	 * @return new count of how many referencing objects reference this object.
-	 */
-	public int addReference(IRSEBaseReferencingObject ref);
-
-	/**
-	 * Remove a reference, decrement reference count, return new count
-	 * @param ref the referencing object from which this object is no longer referenced.
-	 * @return new count of how many referencing objects reference this object.
-	 */
-	public int removeReference(IRSEBaseReferencingObject ref);
-
-	/**
-	 * Return a count of how many referencing objects reference this object.
-	 * @return a count of how many referencing objects reference this object.
-	 */
-	public int getReferenceCount();
-
-	/**
-	 * Clear the list of referenced objects.
-	 */
-	public void removeAllReferences();
-
-	/**
-	 * @return a list of all referencing objects of this object
-	 */
-	public IRSEBaseReferencingObject[] getReferencingObjects();
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java
deleted file mode 100644
index 96c09825e..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-/**
- * Referencing objects are shadows of real objects. Typically, shadows are created
- * to enable a GUI which does not allow the same real object to appear multiple times.
- * In these cases, a unique shadow object is created for each unique instance of the
- * real object.
- * <p>
- * This interface captures the simple set of methods such a shadow must implement.
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEBaseReferencingObject {
-	/**
-	 * Set the object to which we reference
-	 * @param obj the object to reference
-	 */
-	public void setReferencedObject(IRSEBaseReferencedObject obj);
-
-	/**
-	 * @return the object which we reference
-	 */
-	public IRSEBaseReferencedObject getReferencedObject();
-
-	/**
-	 * Fastpath to getReferencedObject().removeReference(this).
-	 * @return new reference count of master object
-	 */
-	public int removeReference();
-
-	/**
-	 * @param broken true if this reference is currently broken/unresolved
-	 */
-	public void setReferenceBroken(boolean broken);
-
-	/**
-	 * @return true if this reference is currently broken/unresolved
-	 */
-	public boolean isReferenceBroken();
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java
deleted file mode 100644
index 34095c511..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- ********************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-/**
- * This is an object that can have shadow (reference) objects, which simply
- * point to this object, and a copy of this object's unique name or key (for storing on disk).
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-
-public interface IRSEPersistableReferencedObject extends IRSEReferencedObject, IRSEBasePersistableReferencedObject {
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java
deleted file mode 100644
index bf16bc08c..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-/**
- * A simple class that implements IRSEPersistableReferencingObject.
- * This is an object that is a shadow (reference) of a real master object
- * (IRSEPersistableReferencedObject). 
- * <p>
- * Objects of this class contain a pointer (in memory) to the master object, 
- * and a copy of this object's unique name or key (for storing on disk).
- * <p>
- * Only the name is saved to disk, and after restoring from disk, that name
- * is used to set the actual object reference.
- * <p>
- * The intention is that in your Rose model, your class extends this class.
- * Do this for any shadow/reference class which you want to persist. Use
- * a subclass of SystemPersistableReferenceManager to manage a list of these,
- * and manage the saving/restoring of that list.
- * <p>
- * <b>YOU MUST OVERRIDE resolveReferencesAfterRestore IN YOUR REFERENCE MANAGER SUBCLASS</b>
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEPersistableReferencingObject extends IRSEReferencingObject, IRSEBasePersistableReferencingObject {
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ReferencedObjectName attribute
-	 */
-	String getReferencedObjectName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ReferencedObjectName attribute
-	 */
-	void setReferencedObjectName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ParentReferenceManager reference
-	 */
-	IRSEBasePersistableReferenceManager getParentReferenceManager();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the ParentReferenceManager reference
-	 */
-	void setParentReferenceManager(IRSEBasePersistableReferenceManager value);
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java
deleted file mode 100644
index 25a990706..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- ********************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-/**
- * An interface to encapsulate the operations required of an object which
- * supports references to it by other objects (IRSEReferencingObject).
- * This type of class needs to support maintaining an in-memory list of
- * all who reference it so that list can be following on delete and
- * rename operations.
- * <p>
- * These references are not persistent. Persistent references are managed
- * by the subtype IRSEPersistableReferencedObject.
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEReferencedObject extends IRSEBaseReferencedObject {
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java
deleted file mode 100644
index 81f4a1545..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
- *******************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-/**
- * A class to encapsulate the operations required of an object which
- * is merely a reference to another object, something we call a shadow.
- * Such shadows are needed to support a GUI which displays the same
- * object in multiple places. To enable that, it is necessary not to
- * use the same physical object in each UI representation as the UI
- * will only know how to update/refresh the first one it finds.
- * <p>
- * These references are not persistent. Persistent references are managed
- * by the subclass SystemPersistableReferencingObject.
- * @noimplement This interface is not intended to be implemented by clients.
- * The standard implementations are included in the framework.
- * @noextend This interface is not intended to be extended by clients.
- */
-public interface IRSEReferencingObject extends IRSEBaseReferencingObject {
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObject.java
deleted file mode 100644
index 221c5aa89..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObject.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- ********************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-import org.eclipse.rse.core.model.RSEModelObject;
-
-/**
- * A class to encapsulate the operations required of an object which supports
- * references to it by other objects ({@link SystemReferencingObject}). This
- * type of class needs to support maintaining an in-memory list of all who
- * reference it so that list can be following on delete and rename operations.
- * 
- * @noextend This class is not intended to be subclassed by clients. The
- *           standard extensions are included in the framework.
- *
- * @since org.eclipse.rse.core 3.0
- */
-public abstract class SystemReferencedObject extends RSEModelObject implements IRSEReferencedObject {
-
-	protected SystemReferencedObjectHelper helper = null;
-
-	/**
-	 * Default constructor. Typically called by EMF factory method.
-	 */
-	protected SystemReferencedObject() {
-		helper = new SystemReferencedObjectHelper();
-	}
-
-	/**
-	 * Add a reference, increment reference count, return new count
-	 * @param ref the referencing object
-	 * @return new count of how many referencing objects reference this object.
-	 */
-	public int addReference(IRSEBaseReferencingObject ref) {
-		return helper.addReference(ref);
-	}
-
-	/**
-	 * Remove a reference, decrement reference count, return new count
-	 * @param ref the referencing object
-	 * @return new count of how many referencing objects reference this object.
-	 */
-	public int removeReference(IRSEBaseReferencingObject ref) {
-		return helper.removeReference(ref);
-	}
-
-	/**
-	 * @return a count of how many referencing objects reference this object.
-	 */
-	public int getReferenceCount() {
-		return helper.getReferenceCount();
-	}
-
-	/**
-	 * Clear the list of referenced objects.
-	 */
-	public void removeAllReferences() {
-		helper.removeAllReferences();
-	}
-
-	/**
-	 * @return a list of all referencing objects of this object
-	 */
-	public IRSEBaseReferencingObject[] getReferencingObjects() {
-		return helper.getReferencingObjects();
-	}
-
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObjectHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObjectHelper.java
deleted file mode 100644
index 56dd67d8a..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencedObjectHelper.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- *******************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-import java.util.Vector;
-
-/**
- * The class should be used by subclasses of {@link SystemReferencedObject} by
- * instantiating it and delegating to it.
- * 
- * @noextend This class is not intended to be subclassed by clients. The
- *           standard extensions are included in the framework.
- * @since org.eclipse.rse.core 3.0
- */
-public class SystemReferencedObjectHelper {
-
-	private Vector referencingObjects = new Vector();
-
-	/**
-	 * @see IRSEBaseReferencedObject#addReference(IRSEBaseReferencingObject)
-	 */
-	public int addReference(IRSEBaseReferencingObject ref) {
-		referencingObjects.addElement(ref);
-		return referencingObjects.size();
-	}
-
-	/**
-	 * @see IRSEBaseReferencedObject#removeReference(IRSEBaseReferencingObject)
-	 */
-	public int removeReference(IRSEBaseReferencingObject ref) {
-		referencingObjects.removeElement(ref);
-		return referencingObjects.size();
-	}
-
-	/**
-	 * @see IRSEBaseReferencedObject#getReferenceCount()
-	 */
-	public int getReferenceCount() {
-		return referencingObjects.size();
-	}
-
-	/**
-	 * Clear the list of referenced objects.
-	 */
-	public void removeAllReferences() {
-		IRSEBaseReferencingObject[] references = getReferencingObjects();
-		for (int i = 0; i < references.length; i++) {
-			IRSEBaseReferencingObject reference = references[i];
-			removeReference(reference);
-		}
-	}
-
-	/**
-	 * @see IRSEBaseReferencedObject#getReferencingObjects()
-	 */
-	public IRSEBaseReferencingObject[] getReferencingObjects() {
-		IRSEBaseReferencingObject[] references = new IRSEBaseReferencingObject[referencingObjects.size()];
-		referencingObjects.toArray(references);
-		return references;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObject.java
deleted file mode 100644
index 151bf811b..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObject.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
- * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- ********************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-import org.eclipse.rse.core.model.RSEModelObject;
-import org.eclipse.rse.internal.core.RSECoreMessages;
-
-/**
- * A class to encapsulate the operations required of an object which is merely a
- * reference to another object, something we call a shadow. Such shadows are
- * needed to support a UI which displays the same object in multiple places. To
- * enable that, it is necessary not to use the same physical object in each UI
- * representation as the UI will only know how to update/refresh the first one
- * it finds.
- * 
- * @noextend This class is not intended to be subclassed by clients. The
- *           standard extensions are included in the framework.
- * @since org.eclipse.rse.core 3.0
- */
-public abstract class SystemReferencingObject extends RSEModelObject implements IRSEReferencingObject {
-	private SystemReferencingObjectHelper helper = null;
-	protected boolean referenceBroken = false;
-
-	/**
-	 * Default constructor.
-	 */
-	protected SystemReferencingObject() {
-		super();
-		helper = new SystemReferencingObjectHelper(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#setReferencedObject(org.eclipse.rse.core.references.IRSEBaseReferencedObject)
-	 */
-	public void setReferencedObject(IRSEBaseReferencedObject obj) {
-		helper.setReferencedObject(obj);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#getReferencedObject()
-	 */
-	public IRSEBaseReferencedObject getReferencedObject() {
-		return helper.getReferencedObject();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.rse.core.references.IRSEBaseReferencingObject#removeReference()
-	 */
-	public int removeReference() {
-		return helper.removeReference();
-	}
-
-	/**
-	 * Set to true if this reference is currently broken/unresolved
-	 */
-	public void setReferenceBroken(boolean broken) {
-		referenceBroken = broken;
-	}
-
-	/**
-	 * Return true if this reference is currently broken/unresolved
-	 */
-	public boolean isReferenceBroken() {
-		return referenceBroken;
-	}
-
-	public String getDescription() {
-		return RSECoreMessages.RESID_MODELOBJECTS_REFERENCINGOBJECT_DESCRIPTION;
-	}
-
-	protected final SystemReferencingObjectHelper getHelper() {
-		return helper;
-	}
-}
-\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObjectHelper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObjectHelper.java
deleted file mode 100644
index c93afd870..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/SystemReferencingObjectHelper.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
- * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
- *******************************************************************************/
-
-package org.eclipse.rse.core.references;
-
-
-/**
- * The class should be used by subclasses of {@link SystemReferencingObject} by
- * instantiating it and delegating to it.
- * 
- * @noextend This class is not intended to be subclassed by clients. The
- *           standard extensions are included in the framework.
- * @noinstantiate This class is not intended to be instantiated by clients. The
- *                standard instances are created by the framework.
- * @since org.eclipse.rse.core 3.0
- */
-public class SystemReferencingObjectHelper {
-
-	private IRSEBaseReferencedObject masterObject = null;
-	private IRSEBaseReferencingObject caller = null;
-
-	/**
-	 * Default constructor.
-	 * @param caller the reference that this object is helping.
-	 */
-	public SystemReferencingObjectHelper(IRSEBaseReferencingObject caller) {
-		super();
-		this.caller = caller;
-	}
-
-	/**
-	 * Constructor that saves effort of calling setReferencedObject.
-	 * @param caller the reference that this object is helping.
-	 * @param obj the object to which this reference will point.
-	 */
-	public SystemReferencingObjectHelper(IRSEBaseReferencingObject caller, IRSEBaseReferencedObject obj) {
-		this(caller);
-		setReferencedObject(obj);
-	}
-
-	/**
-	 * Set the object to which this reference will point.
-	 * Stores the reference in memory, replacing whatever was there.
-	 * Also calls obj.addReference(caller);
-	 * @param obj the object to which this reference will point.
-	 */
-	public void setReferencedObject(IRSEBaseReferencedObject obj) {
-		this.masterObject = obj;
-		if (obj != null) obj.addReference(caller);
-	}
-
-	/**
-	 * Get the object which is referenced. May be null if the reference is not set or has not been resolved.
-	 * @return the referenced object.
-	 */
-	public IRSEBaseReferencedObject getReferencedObject() {
-		return masterObject;
-	}
-
-	/**
-	 * Removes this reference from the referenced object and clears this reference.
-	 * Also, nulls out our memory reference.
-	 * @return new reference count of master object
-	 */
-	public int removeReference() {
-		int newCount = 0;
-		IRSEBaseReferencedObject masterObject = getReferencedObject();
-		if (masterObject != null) newCount = masterObject.removeReference(caller);
-		masterObject = null;
-		return newCount;
-	}
-
-}
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
deleted file mode 100644
index d63943649..000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
+++ /dev/null
@@ -1,642 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2002, 2010 IBM Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir,
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson,
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- *
- * Contributors:
- * David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
- * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
- * David Dykstal (IBM) - 142806: refactoring persistence framework
- * Martin Oberhuber (Wind River) - [185750] Remove IConnectorService.getHostType()
- * David Dykstal (IBM) - [189483] fix spelling in initialize/uninitialize method signatures
- * David Dykstal (IBM) - [210474] Deny save password function missing
- * David McKnight (IBM) - [249222] [api] Access to communication listeners in AbstractConnectorService
- * David McKnight   (IBM)        - [272882] [api] Handle exceptions in IService.initService()
- * David Dykstal (IBM) - [321766] safely serialize connect and disconnect operations
- ********************************************************************************/
-package org.eclipse.rse.core.subsystems;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.RSECorePlugin;
-import org.eclipse.rse.core.RSEPreferencesManager;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.IRSEPersistableContainer;
-import org.eclipse.rse.core.model.RSEModelObject;
-import org.eclipse.rse.services.Mutex;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-
-/**
- * This is a base class to make it easier to create connector services.
- * <p>
- * An {@link org.eclipse.rse.core.subsystems.IConnectorService} object
- * is returned from a subsystem object via getConnectorService(), and
- * it is used to maintain the connection to a particular set of subsystems.
- * <p>
- * This class implements the protocol for much of the
- * standard bookkeeping for connector services including
- * server launchers (if none are required), event handling,
- * hosts, ports, addresses, descriptions, and registered subsystems.
- * Subclasses must concern themselves with actually authenticating and connecting.
- */
-public abstract class AbstractConnectorService extends RSEModelObject implements IConnectorService {
-
-	private Vector commListeners = new Vector(5);
-	private ISubSystem _primarySubSystem = null;
-	private List _registeredSubSystems = new ArrayList();
-	private IHost _host;
-	private String _description;
-	private String _name;
-	private int _port;
-	private boolean _usingSSL;
-
-	/**
-	 * Construct a new connector service. This should be called during the construction
-	 * of any subclasses.
-	 * @param name The name of the connector service.
-	 * @param description A description of the connector service.
-	 * @param host The host associated with this connector service. A host may have multiple
-	 * connector services.
-	 * @param port The port associated with this connector service if this connector service
-	 * is IP based. If not IP based this can be used for some other purpose.
-	 */
-	public AbstractConnectorService(String name, String description, IHost host, int port) {
-		_name = name;
-		_description = description;
-		_host = host;
-		_port = port;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#isServerLaunchTypeEnabled(org.eclipse.rse.core.subsystems.ISubSystem, org.eclipse.rse.core.subsystems.ServerLaunchType)
-	 */
-	public final boolean isServerLaunchTypeEnabled(ISubSystem subsystem, ServerLaunchType serverLaunchType) {
-		IServerLauncher sl = getRemoteServerLauncher();
-		if (sl instanceof RemoteServerLauncher) {
-			RemoteServerLauncher isl = (RemoteServerLauncher) sl;
-			return isl.isEnabledServerLaunchType(serverLaunchType);
-		} else
-			return subsystem.getSubSystemConfiguration().supportsServerLaunchType(serverLaunchType);
-	}
-
-	/**
-	 * @return null, may be overriden
-	 * @see IConnectorService#getRemoteServerLauncher()
-	 */
-	public IServerLauncher getRemoteServerLauncher() {
-		return null;
-	}
-
-	/**
-	 * @return false, may be overridden
-	 * @see IConnectorService#supportsRemoteServerLaunching()
-	 */
-	public boolean supportsRemoteServerLaunching() {
-		return false;
-	}
-
-	/**
-	 * @return false, may be overridden
-	 * @see IConnectorService#supportsServerLaunchProperties()
-	 */
-	public boolean supportsServerLaunchProperties() {
-		return false;
-	}
-
-	/**
-	 * @return null, may be overridden
-	 * @see IConnectorService#getRemoteServerLauncherProperties()
-	 */
-	public IServerLauncherProperties getRemoteServerLauncherProperties() {
-		return null;
-	}
-
-	/**
-	 * Do nothing, may be overridden
-	 * @param newRemoteServerLauncher the server launcher properties
-	 * @see IConnectorService#setRemoteServerLauncherProperties(IServerLauncherProperties)
-	 */
-	public void setRemoteServerLauncherProperties(IServerLauncherProperties newRemoteServerLauncher) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#hasRemoteServerLauncherProperties()
-	 */
-	public final boolean hasRemoteServerLauncherProperties() {
-		return getRemoteServerLauncherProperties() != null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#addCommunicationsListener(org.eclipse.rse.core.subsystems.ICommunicationsListener)
-	 */
-	public final void addCommunicationsListener(ICommunicationsListener listener) {
-		if (!commListeners.contains(listener)) {
-			commListeners.add(listener);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#removeCommunicationsListener(org.eclipse.rse.core.subsystems.ICommunicationsListener)
-	 */
-	public final void removeCommunicationsListener(ICommunicationsListener listener) {
-		commListeners.remove(listener);
-	}
-
-	/**
-	 * Fires the communication event mentioned in the eventType.
-	 * @param eventType the communications event to fire.
-	 */
-	final protected void fireCommunicationsEvent(int eventType) {
-		CommunicationsEvent e = new CommunicationsEvent(this, eventType);
-		Object[] items = commListeners.toArray();
-		for (int loop=0; loop < items.length; loop++) {
-			((ICommunicationsListener) items[loop]).communicationsStateChange(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#getHost()
-	 */
-	public final IHost getHost() {
-		return _host;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#setHost(org.eclipse.rse.core.model.IHost)
-	 */
-	public final void setHost(IHost host) {
-		_host = host;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.RSEModelObject#getDescription()
-	 */
-	public final String getDescription() {
-		return _description;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IRSEModelObject#getName()
-	 */
-	public final String getName() {
-		return _name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#setPort(int)
-	 */
-	public final void setPort(int port) {
-		if (port != _port)
-		{
-			_port = port;
-			setDirty(true);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#getPort()
-	 */
-	public final int getPort() {
-		return _port;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#getPrimarySubSystem()
-	 */
-	public final ISubSystem getPrimarySubSystem() {
-		if (_primarySubSystem == null)
-		{
-			if (_registeredSubSystems.size() == 0)
-			{
-
-			}
-			else
-			{
-				ISubSystem ss = (ISubSystem)_registeredSubSystems.get(0);
-				_primarySubSystem = ss.getPrimarySubSystem();
-			}
-		}
-		return _primarySubSystem;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#registerSubSystem(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public final void registerSubSystem(ISubSystem ss) {
-		if (!_registeredSubSystems.contains(ss))
-		{
-			_registeredSubSystems.add(ss);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#deregisterSubSystem(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public final void deregisterSubSystem(ISubSystem ss) {
-		_registeredSubSystems.remove(ss);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IRSEPersistableContainer#commit()
-	 */
-	public final boolean commit() {
-		return getHost().commit();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.model.IRSEPersistableContainer#getPersistableParent()
-	 */
-	public final IRSEPersistableContainer getPersistableParent() {
-		return _host;
-	}
-
-	public IRSEPersistableContainer[] getPersistableChildren() {
-		List children = new ArrayList(20);
-		IServerLauncherProperties launcherProperties = getRemoteServerLauncherProperties();
-		if (launcherProperties != null) {
-			children.add(getRemoteServerLauncherProperties());
-		}
-		children.addAll(_registeredSubSystems);
-		children.addAll(Arrays.asList(getPropertySets()));
-		IRSEPersistableContainer[] result = new IRSEPersistableContainer[children.size()];
-		children.toArray(result);
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#getHostName()
-	 */
-	public final String getHostName() {
-		return getHost().getHostName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#getVersionReleaseModification()
-	 */
-	public String getVersionReleaseModification() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#getSubSystems()
-	 */
-	public final ISubSystem[] getSubSystems() {
-		return (ISubSystem[])_registeredSubSystems.toArray(new ISubSystem[_registeredSubSystems.size()]);
-	}
-
-	/**
-	 * Initialize any subsystems just after connecting to the host.
-	 * @param monitor a progress monitor to report progress of initialization.
-	 */
-	protected final void initializeSubSystems(IProgressMonitor monitor) throws SystemMessageException {
-		for (int i = 0; i < _registeredSubSystems.size(); i++)
-		{
-			ISubSystem ss = (ISubSystem)_registeredSubSystems.get(i);
-			ss.initializeSubSystem(monitor);
-		}
-	}
-
-	/**
-	 * Uninitialize any subsystem just after disconnecting from the host.
-	 * @param monitor a progress monitor used to track uninitialization progress.
-	 */
-	protected final void uninitializeSubSystems(IProgressMonitor monitor) {
-		for (int i = 0; i < _registeredSubSystems.size(); i++)
-		{
-			ISubSystem ss = (ISubSystem)_registeredSubSystems.get(i);
-			ss.uninitializeSubSystem(monitor);
-		}
-	}
-
-	/**
-	 * Send the event to notify listeners of a disconnection.
-	 * Used by the framework and should
-	 * usually not be invoked by concrete subclasses.
-	 */
-	protected final void notifyDisconnection() {
-		 // Fire comm event to signal state changed
-		if (!isConnected()) fireCommunicationsEvent(CommunicationsEvent.AFTER_DISCONNECT);
-	}
-
-	/**
-	 * Send the event to notify listeners of a connection.
-	 * Used by the framework and should
-	 * usually not be invoked by concrete subclasses.
-	 */
-	protected final void notifyConnection() {
-		if (isConnected()) fireCommunicationsEvent(CommunicationsEvent.AFTER_CONNECT);
-	}
-
-	/**
-	 * Send the event to notify listeners of a connection establishment error.
-	 * Used by the framework and should
-	 * usually not be invoked by concrete subclasses.
-	 */
-	protected final void notifyError() {
-		fireCommunicationsEvent(CommunicationsEvent.CONNECTION_ERROR);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#isUsingSSL()
-	 */
-	public final boolean isUsingSSL() {
-		return _usingSSL;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#setIsUsingSSL(boolean)
-	 */
-	public final void setIsUsingSSL(boolean flag) {
-		if (_usingSSL != flag)
-		{
-			_usingSSL = flag;
-			setDirty(true);
-		}
-	}
-
-	/**
-	 * Returns the temp directory of the remote system for the current user,
-	 * if available. This implementation returns the empty string.
-	 * @return an empty string
-	 * @see IConnectorService#getTempDirectory()
-	 */
-	public String getTempDirectory() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the home directory of the remote system for the current user,
-	 * if available. This implementation returns the empty string.
-	 * @return an empty string
-	 * @see IConnectorService#getHomeDirectory()
-	 */
-	public String getHomeDirectory() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Reset the connector service state if a connector service is redefined
-	 * or disconnected.
-	 * Each subsystem needs to be informed so it can clear out any expansions.
-	 * This implementation does nothing.
-	 * Implementations should override and call {@link #reset()}
-	 * if there is internal state to reset.
-	 * @see IConnectorService#reset()
-	 */
-	public void reset() {
-	}
author	kmoore	2010-01-04 21:04:26 +0000
committer	kmoore	2010-01-04 21:04:26 +0000
commit	28096602a832fbf503892b83054abcdb951e65d6 (patch)
tree	62b1b56c3ca3a018920799cfd541e7eea3b0ed73 /jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt
parent	5e04fff96fe69684507728dcf1732523572b6470 (diff)
download	webtools.dali-28096602a832fbf503892b83054abcdb951e65d6.tar.gz webtools.dali-28096602a832fbf503892b83054abcdb951e65d6.tar.xz webtools.dali-28096602a832fbf503892b83054abcdb951e65d6.zip